Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

776 files changed, 18038 insertions, 18038 deletions

diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
index 4b54556f..db50c7d9 100644
--- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
@@ -132,7 +132,7 @@ void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst,
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
@@ -148,7 +148,7 @@ void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst,
         return;
     switch (op.op()) {
     case COMPOSITE_COPY:
-        compositeCopy(dst, dststride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dststride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
         return;
     case COMPOSITE_CLEAR:
         linesize = sizeof(TQ_UINT8) * cols;
diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
index dd4f3916..173a809e 100644
--- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
+++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
@@ -80,7 +80,7 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
index 829b4f27..e8476d75 100644
--- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
@@ -262,12 +262,12 @@ void KisLabColorSpace::getSingleChannelPixel(TQ_UINT8 *dst, const TQ_UINT8 *src,
     }
 }
 
-void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     while (rows > 0) {
         const Pixel *src = reinterpret_cast<const Pixel *>(srcRowStart);
         Pixel *dst = reinterpret_cast<Pixel *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -331,8 +331,8 @@ printf("%d %d %d\n", dst->lightness, dst->a, dst->b);
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -342,7 +342,7 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             TQ_UINT16 /*opacity*/)
@@ -372,7 +372,7 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -382,7 +382,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -395,7 +395,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        //compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        //compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        //compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        //compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        //compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        //compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        //compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        //compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                    dst, dstRowStride, src, srcRowStride, tqmask, 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 eeab55cf..e85408f8 100644
--- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
+++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
@@ -81,28 +81,28 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 *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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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);
 
 private:
     struct Pixel {
diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
index 98ccead0..7e765d7a 100644
--- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
@@ -119,13 +119,13 @@ TQ_UINT8 KisXyzColorSpace::intensity8(const TQ_UINT8 * src) const
     return 0;
 }
 
-void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -186,8 +186,8 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -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 = tqmaskRowStart; \
+        const TQ_UINT8 *tqmask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -248,12 +248,12 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
         rows--; \
         srcRowStart += srcRowStride; \
         dstRowStart += dstRowStride; \
-        if(tqmaskRowStart) { \
-            tqmaskRowStart += tqmaskRowStride; \
+        if(maskRowStart) { \
+            maskRowStart += maskRowStride; \
         } \
     }
 
-void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -273,7 +273,7 @@ void KisXyzColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -294,7 +294,7 @@ void KisXyzColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -315,7 +315,7 @@ void KisXyzColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -336,7 +336,7 @@ void KisXyzColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -357,7 +357,7 @@ void KisXyzColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -379,7 +379,7 @@ void KisXyzColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -400,7 +400,7 @@ void KisXyzColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisXyzColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisXyzColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -428,7 +428,7 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             TQ_UINT16 /*opacity*/)
@@ -458,7 +458,7 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -468,7 +468,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -481,7 +481,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                    dst, dstRowStride, src, srcRowStride, tqmask, 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 2f7c3efd..4a785825 100644
--- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h
+++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h
@@ -78,7 +78,7 @@ public:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
@@ -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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
 
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cc
index a19b9d69..66b8e1ad 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.cc
+++ b/chalk/chalkcolor/kis_abstract_colorspace.cc
@@ -638,7 +638,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst,
                    const TQ_UINT8 *src,
                    TQ_INT32 srcRowStride,
                    const TQ_UINT8 *srcAlphaMask,
-                   TQ_INT32 tqmaskRowStride,
+                   TQ_INT32 maskRowStride,
                    TQ_UINT8 opacity,
                    TQ_INT32 rows,
                    TQ_INT32 cols,
@@ -671,7 +671,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst,
                m_conversionCache.data(),
                srcRowStride,
                srcAlphaMask,
-               tqmaskRowStride,
+               maskRowStride,
                opacity,
                rows,
                cols,
@@ -684,7 +684,7 @@ void KisAbstractColorSpace::bitBlt(TQ_UINT8 *dst,
                src,
                srcRowStride,
                srcAlphaMask,
-               tqmaskRowStride,
+               maskRowStride,
                opacity,
                rows,
                cols,
@@ -741,7 +741,7 @@ cmsHTRANSFORM KisAbstractColorSpace::createTransform(KisColorSpace * dstColorSpa
     return 0;
 }
 
-void KisAbstractColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 * /*tqmaskRowStart*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisAbstractColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 * /*maskRowStart*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     TQ_UINT8 *dst = dstRowStart;
     const TQ_UINT8 *src = srcRowStart;
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.h b/chalk/chalkcolor/kis_abstract_colorspace.h
index 75dfd1ef..732918d4 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.h
+++ b/chalk/chalkcolor/kis_abstract_colorspace.h
@@ -181,7 +181,7 @@ public:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
@@ -201,7 +201,7 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
@@ -212,7 +212,7 @@ protected:
                           KisProfile *  dstProfile,
                           TQ_INT32 renderingIntent);
 
-    virtual void compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity);
+    virtual void compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity);
 
 
     // So I don't need to re-implement it everywhere.
@@ -221,7 +221,7 @@ protected:
               int AlphaPos, int NonAlphaSize, int TotalSize>
     void abstractCompositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
                                       const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
-                                      const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
+                                      const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
                                       TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity,
                                       NativeMult nativeMult, Uint8ToNative uint8ToNative,
                                       NativeOpacityTest nativeOpacityTest) {
@@ -229,7 +229,7 @@ protected:
 
             const ColorType *src = reinterpret_cast<const ColorType*>(srcRowStart);
             ColorType *dst = reinterpret_cast<ColorType*>(dstRowStart);
-            const TQ_UINT8 *tqmask = tqmaskRowStart;
+            const TQ_UINT8 *tqmask = maskRowStart;
             TQ_INT32 columns = numColumns;
 
             while (columns > 0) {
@@ -263,8 +263,8 @@ protected:
             rows--;
             srcRowStart += srcRowStride;
             dstRowStart += dstRowStride;
-            if(tqmaskRowStart)
-                tqmaskRowStart += tqmaskRowStride;
+            if(maskRowStart)
+                maskRowStart += maskRowStride;
         }
     }
 
diff --git a/chalk/chalkcolor/kis_colorspace.h b/chalk/chalkcolor/kis_colorspace.h
index 6071909c..1ce2ac6a 100644
--- a/chalk/chalkcolor/kis_colorspace.h
+++ b/chalk/chalkcolor/kis_colorspace.h
@@ -401,7 +401,7 @@ public:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
index 3f2ccc80..58ed3857 100644
--- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
@@ -210,13 +210,13 @@ void KisCmykU16ColorSpace::getSingleChannelPixel(TQ_UINT8 *dstPixel, const TQ_UI
     }
 }
 
-void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -278,8 +278,8 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -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 = tqmaskRowStart; \
+        const TQ_UINT8 *tqmask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -340,12 +340,12 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--; \
         srcRowStart += srcRowStride; \
         dstRowStart += dstRowStride; \
-        if(tqmaskRowStart) { \
-            tqmaskRowStart += tqmaskRowStride; \
+        if(maskRowStart) { \
+            maskRowStart += maskRowStride; \
         } \
     }
 
-void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -366,7 +366,7 @@ void KisCmykU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dst
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -387,7 +387,7 @@ void KisCmykU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -408,7 +408,7 @@ void KisCmykU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -429,7 +429,7 @@ void KisCmykU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -450,7 +450,7 @@ void KisCmykU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -472,7 +472,7 @@ void KisCmykU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -493,7 +493,7 @@ void KisCmykU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisCmykU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -519,7 +519,7 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             TQ_UINT16 /*opacity*/)
@@ -549,7 +549,7 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -560,7 +560,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -573,7 +573,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                dst, dstRowStride, src, srcRowStride, tqmask, 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 8e43cd1c..c617607c 100644
--- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h
+++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h
@@ -72,22 +72,22 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
     friend class KisCmykU16ColorSpaceTester;
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
index 49256c26..bfe85f0d 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
@@ -208,13 +208,13 @@ void KisCmykColorSpace::getSingleChannelPixel(TQ_UINT8 *dstPixel, const TQ_UINT8
     }
 }
 
-void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -276,8 +276,8 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -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 = tqmaskRowStart; \
+        const TQ_UINT8 *tqmask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -338,12 +338,12 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         rows--; \
         srcRowStart += srcRowStride; \
         dstRowStart += dstRowStride; \
-        if(tqmaskRowStart) { \
-            tqmaskRowStart += tqmaskRowStride; \
+        if(maskRowStart) { \
+            maskRowStart += maskRowStride; \
 } \
 }
 
-void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -364,7 +364,7 @@ void KisCmykColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -385,7 +385,7 @@ void KisCmykColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -406,7 +406,7 @@ void KisCmykColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -427,7 +427,7 @@ void KisCmykColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -448,7 +448,7 @@ void KisCmykColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -470,7 +470,7 @@ void KisCmykColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -491,7 +491,7 @@ void KisCmykColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisCmykColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisCmykColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -517,7 +517,7 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst,
                                           const TQ_UINT8 *src,
                                           TQ_INT32 srcRowSize,
                                           const TQ_UINT8 *srcAlphaMask,
-                                          TQ_INT32 tqmaskRowStride,
+                                          TQ_INT32 maskRowStride,
                                           TQ_INT32 rows,
                                           TQ_INT32 cols,
                                           TQ_UINT8 /*opacity*/)
@@ -547,7 +547,7 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -557,7 +557,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
                                   const TQ_UINT8 *src,
                                   TQ_INT32 srcRowStride,
                                   const TQ_UINT8 *tqmask,
-                                  TQ_INT32 tqmaskRowStride,
+                                  TQ_INT32 maskRowStride,
                                   TQ_UINT8 opacity,
                                   TQ_INT32 rows,
                                   TQ_INT32 cols,
@@ -569,7 +569,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
             break;
         case COMPOSITE_OVER:
-            compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+            compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+            compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_DIVIDE:
-            compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+            compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+            compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+            compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_LIGHTEN:
-            compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+            compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+            compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_OVERLAY:
-            compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+            compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_ERASE:
-            compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+            compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_DODGE:
-            compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+            compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_BURN:
-            compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+            compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                    dst, dstRowStride, src, srcRowStride, tqmask, 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 69ef80e4..a7723915 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
@@ -74,22 +74,22 @@ protected:
                         const TQ_UINT8 *src,
                         TQ_INT32 srcRowStride,
                         const TQ_UINT8 *srcAlphaMask,
-                        TQ_INT32 tqmaskRowStride,
+                        TQ_INT32 maskRowStride,
                         TQ_UINT8 opacity,
                         TQ_INT32 rows,
                         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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
 
diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
index 00f3440c..4e50b1c2 100644
--- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
+++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
@@ -161,13 +161,13 @@ TQ_UINT32 KisGrayU16ColorSpace::pixelSize() const
     return MAX_CHANNEL_GRAYA * sizeof(TQ_UINT16);
 }
 
-void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -226,8 +226,8 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -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 = tqmaskRowStart; \
+        const TQ_UINT8 *tqmask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -288,12 +288,12 @@ void KisGrayU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--; \
         srcRowStart += srcRowStride; \
         dstRowStart += dstRowStride; \
-        if(tqmaskRowStart) { \
-            tqmaskRowStart += tqmaskRowStride; \
+        if(maskRowStart) { \
+            maskRowStart += maskRowStride; \
         } \
     }
 
-void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -310,7 +310,7 @@ void KisGrayU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dst
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -331,7 +331,7 @@ void KisGrayU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -352,7 +352,7 @@ void KisGrayU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -373,7 +373,7 @@ void KisGrayU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -394,7 +394,7 @@ void KisGrayU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -416,7 +416,7 @@ void KisGrayU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -437,7 +437,7 @@ void KisGrayU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisGrayU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisGrayU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -464,7 +464,7 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             TQ_UINT16 /*opacity*/)
@@ -494,7 +494,7 @@ void KisGrayU16ColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -504,7 +504,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -517,7 +517,7 @@ void KisGrayU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                    dst, dstRowStride, src, srcRowStride, tqmask, 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 5c2351da..eeec10a7 100644
--- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h
+++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h
@@ -70,22 +70,22 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
     friend class KisGrayU16ColorSpaceTester;
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
index dbd475df..59b70f77 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
@@ -200,7 +200,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -208,37 +208,37 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
 {
     switch (op.op()) {
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
 
     default:
@@ -278,14 +278,14 @@ KisCompositeOpList KisGrayColorSpace::userVisiblecompositeOps() const
     return list;
 }
 
-void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -341,19 +341,19 @@ void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -407,19 +407,19 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -478,19 +478,19 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -549,19 +549,19 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -620,19 +620,19 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -691,19 +691,19 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -763,19 +763,19 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -834,19 +834,19 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -905,8 +905,8 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
@@ -915,7 +915,7 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             TQ_UINT8 /*opacity*/)
@@ -944,21 +944,21 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst,
 
         dst += dstRowSize;
         if(srcAlphaMask)
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         src += srcRowSize;
     }
 }
 
 void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
                                      const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
-                                     const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
+                                     const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
                                      TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -991,7 +991,7 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
index 8a3bc34b..a46adcc0 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
@@ -61,7 +61,7 @@ public:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
@@ -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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 
 private:
diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
index 57475a03..55054bc6 100644
--- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
+++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
@@ -220,13 +220,13 @@ TQImage KisLmsF32ColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT32 w
 }
 
 
-void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     while (rows > 0) {
 
         const float *src = reinterpret_cast<const float *>(srcRowStart);
         float *dst = reinterpret_cast<float *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -287,8 +287,8 @@ void KisLmsF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -298,7 +298,7 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             float /*opacity*/)
@@ -328,13 +328,13 @@ void KisLmsF32ColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
 
 void KisLmsF32ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
-                        const TQ_UINT8 */*tqmaskRowStart*/, TQ_INT32 /*tqmaskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, float /*opacity*/)
+                        const TQ_UINT8 */*maskRowStart*/, TQ_INT32 /*maskRowStride*/, TQ_INT32 rows, TQ_INT32 numColumns, float /*opacity*/)
 {
     while (rows > 0) {
         memcpy(dstRowStart, srcRowStart, numColumns * sizeof(Pixel));
@@ -349,7 +349,7 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -362,13 +362,13 @@ void KisLmsF32ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, 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 36e9a01c..468ac5e4 100644
--- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
+++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
@@ -81,15 +81,15 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
     inline TQ_UINT8 computeRed(float l, float m, float s) const
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
index fb2df8c1..4ae8004b 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
@@ -299,13 +299,13 @@ TQImage KisRgbF16HalfColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT
 }
 
 
-void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     while (rows > 0) {
 
         const half *src = reinterpret_cast<const half *>(srcRowStart);
         half *dst = reinterpret_cast<half *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -366,8 +366,8 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -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 = tqmaskRowStart; \
+        const TQ_UINT8 *tqmask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -428,12 +428,12 @@ void KisRgbF16HalfColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
         rows--; \
         srcRowStart += srcRowStride; \
         dstRowStart += dstRowStride; \
-        if(tqmaskRowStart) { \
-            tqmaskRowStart += tqmaskRowStride; \
+        if(maskRowStart) { \
+            maskRowStart += maskRowStride; \
         } \
     }
 
-void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -463,7 +463,7 @@ void KisRgbF16HalfColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -484,7 +484,7 @@ void KisRgbF16HalfColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 ds
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -505,7 +505,7 @@ void KisRgbF16HalfColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 ds
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -526,7 +526,7 @@ void KisRgbF16HalfColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 d
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -547,7 +547,7 @@ void KisRgbF16HalfColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dst
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -569,7 +569,7 @@ void KisRgbF16HalfColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -590,7 +590,7 @@ void KisRgbF16HalfColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 ds
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -611,7 +611,7 @@ void KisRgbF16HalfColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 d
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -645,7 +645,7 @@ void KisRgbF16HalfColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -679,7 +679,7 @@ void KisRgbF16HalfColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT3
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -713,7 +713,7 @@ void KisRgbF16HalfColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dst
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF16HalfColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
+void KisRgbF16HalfColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, half opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -752,7 +752,7 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             half /*opacity*/)
@@ -782,7 +782,7 @@ void KisRgbF16HalfColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -792,7 +792,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -805,7 +805,7 @@ void KisRgbF16HalfColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                    dst, dstRowStride, src, srcRowStride, tqmask, 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 a148a8f9..f965a766 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
@@ -79,26 +79,26 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
     friend class KisRgbF16HalfColorSpaceTester;
diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
index 98e0b28b..1edd63f9 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
@@ -298,13 +298,13 @@ TQImage KisRgbF32ColorSpace::convertToTQImage(const TQ_UINT8 *dataU8, TQ_INT32 w
 }
 
 
-void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     while (rows > 0) {
 
         const float *src = reinterpret_cast<const float *>(srcRowStart);
         float *dst = reinterpret_cast<float *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -365,8 +365,8 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -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 = tqmaskRowStart; \
+        const TQ_UINT8 *tqmask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -427,12 +427,12 @@ void KisRgbF32ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--; \
         srcRowStart += srcRowStride; \
         dstRowStart += dstRowStride; \
-        if(tqmaskRowStart) { \
-            tqmaskRowStart += tqmaskRowStride; \
+        if(maskRowStart) { \
+            maskRowStart += maskRowStride; \
         } \
     }
 
-void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -462,7 +462,7 @@ void KisRgbF32ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -483,7 +483,7 @@ void KisRgbF32ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -504,7 +504,7 @@ void KisRgbF32ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -525,7 +525,7 @@ void KisRgbF32ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -546,7 +546,7 @@ void KisRgbF32ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -568,7 +568,7 @@ void KisRgbF32ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -589,7 +589,7 @@ void KisRgbF32ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -610,7 +610,7 @@ void KisRgbF32ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -644,7 +644,7 @@ void KisRgbF32ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -678,7 +678,7 @@ void KisRgbF32ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 ds
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -712,7 +712,7 @@ void KisRgbF32ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbF32ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
+void KisRgbF32ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, float opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -751,7 +751,7 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             float /*opacity*/)
@@ -781,7 +781,7 @@ void KisRgbF32ColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -791,7 +791,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -804,7 +804,7 @@ void KisRgbF32ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                    dst, dstRowStride, src, srcRowStride, tqmask, 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 6f2ff3ae..cfd93010 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
@@ -83,26 +83,26 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
     friend class KisRgbF32ColorSpaceTester;
diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
index c61433d2..f792e875 100644
--- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
+++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
@@ -196,13 +196,13 @@ TQ_UINT32 KisRgbU16ColorSpace::pixelSize() const
 }
 
 
-void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -263,8 +263,8 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
@@ -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 = tqmaskRowStart; \
+        const TQ_UINT8 *tqmask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -325,12 +325,12 @@ void KisRgbU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--; \
         srcRowStart += srcRowStride; \
         dstRowStart += dstRowStride; \
-        if(tqmaskRowStart) { \
-            tqmaskRowStart += tqmaskRowStride; \
+        if(maskRowStart) { \
+            maskRowStart += maskRowStride; \
         } \
     }
 
-void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -350,7 +350,7 @@ void KisRgbU16ColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -371,7 +371,7 @@ void KisRgbU16ColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -392,7 +392,7 @@ void KisRgbU16ColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -413,7 +413,7 @@ void KisRgbU16ColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -434,7 +434,7 @@ void KisRgbU16ColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -456,7 +456,7 @@ void KisRgbU16ColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -477,7 +477,7 @@ void KisRgbU16ColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -498,7 +498,7 @@ void KisRgbU16ColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -540,7 +540,7 @@ void KisRgbU16ColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -582,7 +582,7 @@ void KisRgbU16ColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 ds
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -624,7 +624,7 @@ void KisRgbU16ColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
     COMMON_COMPOSITE_OP_EPILOG();
 }
 
-void KisRgbU16ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
+void KisRgbU16ColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT16 opacity)
 {
     COMMON_COMPOSITE_OP_PROLOG();
 
@@ -671,7 +671,7 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             TQ_UINT16 /*opacity*/)
@@ -701,7 +701,7 @@ void KisRgbU16ColorSpace::compositeErase(TQ_UINT8 *dst,
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
@@ -711,7 +711,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 U8_opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -724,7 +724,7 @@ void KisRgbU16ColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, U8_opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride,
+                    dst, dstRowStride, src, srcRowStride, tqmask, 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 a4edbffa..5994921a 100644
--- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
+++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
@@ -74,26 +74,26 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 private:
     friend class KisRgbU16ColorSpaceTester;
diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
index 34ab79fc..e4e181ca 100644
--- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
+++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
@@ -265,14 +265,14 @@ TQImage KisRgbColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 width,
 
 void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
                                      const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
-                                     const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
+                                     const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
                                      TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -331,22 +331,22 @@ void KisRgbColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
 
 void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride,
                                      const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride,
-                                     const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride,
+                                     const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride,
                                      TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -379,20 +379,20 @@ void KisRgbColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstR
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
 
-void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -461,19 +461,19 @@ void KisRgbColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -532,19 +532,19 @@ void KisRgbColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -603,19 +603,19 @@ void KisRgbColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -675,19 +675,19 @@ void KisRgbColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -747,19 +747,19 @@ void KisRgbColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -819,19 +819,19 @@ void KisRgbColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -890,19 +890,19 @@ void KisRgbColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -961,19 +961,19 @@ void KisRgbColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -1044,19 +1044,19 @@ void KisRgbColorSpace::compositeHue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -1127,19 +1127,19 @@ void KisRgbColorSpace::compositeSaturation(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -1210,19 +1210,19 @@ void KisRgbColorSpace::compositeValue(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
-void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         while (columns > 0) {
 
@@ -1293,8 +1293,8 @@ void KisRgbColorSpace::compositeColor(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 }
 
@@ -1303,7 +1303,7 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst,
             const TQ_UINT8 *src,
             TQ_INT32 srcRowSize,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_INT32 rows,
             TQ_INT32 cols,
             TQ_UINT8 /*opacity*/)
@@ -1332,7 +1332,7 @@ void KisRgbColorSpace::compositeErase(TQ_UINT8 *dst,
 
         dst += dstRowSize;
         if(srcAlphaMask)
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         src += srcRowSize;
     }
 }
@@ -1342,7 +1342,7 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -1354,10 +1354,10 @@ void KisRgbColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ALPHA_DARKEN:
-        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_HUE:
-        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SATURATION:
-        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_VALUE:
-        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COLOR:
-        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, 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, tqmaskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, 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 53281faf..77628c31 100644
--- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
+++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
@@ -69,27 +69,27 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 };
 
 class KisRgbColorSpaceFactory : public KisColorSpaceFactory
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc
index 7d6f0d67..edb09289 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.cc
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc
@@ -350,7 +350,7 @@ void KisWetColorSpace::bitBlt( TQ_UINT8 *dst,
                   const TQ_UINT8 *src,
                   TQ_INT32 srcRowStride,
                   const TQ_UINT8 */*srcAlphaMask*/,
-                  TQ_INT32 /*tqmaskRowStride*/,
+                  TQ_INT32 /*maskRowStride*/,
                   TQ_UINT8 /*opacity*/,
                   TQ_INT32 rows,
                   TQ_INT32 cols,
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.h b/chalk/colorspaces/wet/kis_wet_colorspace.h
index 0523bf97..25af68fd 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.h
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.h
@@ -167,7 +167,7 @@ protected:
             const TQ_UINT8 *src,
             TQ_INT32 srcRowStride,
             const TQ_UINT8 *srcAlphaMask,
-            TQ_INT32 tqmaskRowStride,
+            TQ_INT32 maskRowStride,
             TQ_UINT8 opacity,
             TQ_INT32 rows,
             TQ_INT32 cols,
diff --git a/chalk/colorspaces/wet/kis_wetop.cc b/chalk/colorspaces/wet/kis_wetop.cc
index 70e07280..55f466fa 100644
--- a/chalk/colorspaces/wet/kis_wetop.cc
+++ b/chalk/colorspaces/wet/kis_wetop.cc
@@ -164,15 +164,15 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     double eff_height;
     double press, contact;
 
-    int tqmaskW = brush->tqmaskWidth(inf);
-    int tqmaskH = brush->tqmaskHeight(inf);
+    int maskW = brush->maskWidth(inf);
+    int maskH = brush->maskHeight(inf);
     KoPoint dest = (pos - (brush->hotSpot(inf)));
     int xStart = (int)dest.x();
     int yStart = (int)dest.y();
 
-    for (int y = 0; y < tqmaskH; y++) {
-        KisHLineIteratorPixel dabIt = dab->createHLineIterator(0, y, tqmaskW, false);
-        KisHLineIteratorPixel it = device->createHLineIterator(xStart, yStart+y, tqmaskW, true);
+    for (int y = 0; y < maskH; y++) {
+        KisHLineIteratorPixel dabIt = dab->createHLineIterator(0, y, maskW, false);
+        KisHLineIteratorPixel it = device->createHLineIterator(xStart, yStart+y, maskW, true);
 
         while (!dabIt.isDone()) {
             // This only does something with .paint, and not with adsorb.
@@ -226,5 +226,5 @@ void KisWetOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
         }
     }
 
-    m_painter->addDirtyRect(TQRect(xStart, yStart, tqmaskW, tqmaskH));
+    m_painter->addDirtyRect(TQRect(xStart, yStart, maskW, maskH));
 }
diff --git a/chalk/colorspaces/wet/wdgpressure.ui b/chalk/colorspaces/wet/wdgpressure.ui
index 96727ff1..e6a78445 100644
--- a/chalk/colorspaces/wet/wdgpressure.ui
+++ b/chalk/colorspaces/wet/wdgpressure.ui
@@ -56,5 +56,5 @@
         </widget>
     </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc
index d63574fd..11aaeb04 100644
--- a/chalk/colorspaces/wet/wetphysicsfilter.cc
+++ b/chalk/colorspaces/wet/wetphysicsfilter.cc
@@ -88,7 +88,7 @@ void WetPhysicsFilter::flow(KisPaintDeviceSP src, KisPaintDeviceSP /*dst*/, cons
     kdDebug() << "Flowing: " << r << endl;
 
     /* width of a line in a layer in pixel units, not in bytes -- used to move to the next
-       line in the fluid tqmasks below */
+       line in the fluid masks below */
     int rs = width; // rowstride
 
     double * flow_t  = new double[width * height];
diff --git a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
index 8b182e08..abcf2cec 100644
--- a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
+++ b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
@@ -96,7 +96,7 @@ void KisWSBrushOp::paintAt(const KisPoint &pos,
     }
     m_painter -> setPressure(pressure);
 
-    TQRect dabRect = TQRect(0, 0, brush -> tqmaskWidth(pressure), brush -> tqmaskHeight(pressure));
+    TQRect dabRect = TQRect(0, 0, brush -> maskWidth(pressure), brush -> maskHeight(pressure));
     TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
 
     KisImage * image = device -> image();
diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
index 44426382..b1e1ec82 100644
--- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
+++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
@@ -357,7 +357,7 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
                       const TQ_UINT8 *tqmask,
-                      TQ_INT32 tqmaskRowStride,
+                      TQ_INT32 maskRowStride,
                       TQ_UINT8 opacity,
                       TQ_INT32 rows,
                       TQ_INT32 cols,
@@ -368,18 +368,18 @@ void KisWetStickyColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
         break;
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
     default:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, tqmaskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
         break;
     }
 
 }
 
 
-void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     // XXX: This is basically the same as with rgb and used to composite layers for  Composition for
     //      painting works differently
@@ -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 = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
 
         TQ_INT32 columns = numColumns;
 
@@ -461,13 +461,13 @@ void KisWetStickyColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRo
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
 
-        if(tqmaskRowStart)
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart)
+            maskRowStart += maskRowStride;
     }
 
 }
 
-void KisWetStickyColorSpace::compositeCopy(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 tqmaskRowStride, 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 *tqmask, 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 57f3ac70..9ff6452b 100644
--- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h
+++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h
@@ -124,7 +124,7 @@ protected:
                 const TQ_UINT8 *src,
                 TQ_INT32 srcRowStride,
                 const TQ_UINT8 *srcAlphaMask,
-                TQ_INT32 tqmaskRowStride,
+                TQ_INT32 maskRowStride,
                 TQ_UINT8 opacity,
                 TQ_INT32 rows,
                 TQ_INT32 cols,
@@ -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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
 };
 
diff --git a/chalk/colorspaces/wetsticky/wstool.ui b/chalk/colorspaces/wetsticky/wstool.ui
index 2f95d18b..3824b626 100644
--- a/chalk/colorspaces/wetsticky/wstool.ui
+++ b/chalk/colorspaces/wetsticky/wstool.ui
@@ -250,7 +250,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
index d8ea896b..b19845b2 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
@@ -204,33 +204,33 @@ TQImage KisYCbCrU16ColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 w
 }
 
 
-void KisYCbCrU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
+void KisYCbCrU16ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
 {
     switch (op.op()) {
         case COMPOSITE_UNDEF:
         // Undefined == no composition
             break;
         case COMPOSITE_OVER:
-            compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
+            compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COPY:
-            compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
+            compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_ERASE:
-            compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
+            compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
             break;
         default:
             break;
     }
 }
 
-void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -291,13 +291,13 @@ void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
 
-void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
+void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
 {
     while (rows-- > 0)
     {
@@ -324,7 +324,7 @@ void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, c
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
index 69c499f2..d6ca157d 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
@@ -69,14 +69,14 @@ class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace
                             const TQ_UINT8 *src,
                             TQ_INT32 srcRowStride,
                             const TQ_UINT8 *srcAlphaMask,
-                            TQ_INT32 tqmaskRowStride,
+                            TQ_INT32 maskRowStride,
                             TQ_UINT8 opacity,
                             TQ_INT32 rows,
                             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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
     private:
 #define CLAMP_TO_16BITCHANNEL(a) CLAMP(a, 0, TQ_UINT16_MAX)
diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
index 9c7548bf..389a91b9 100644
--- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
+++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
@@ -204,33 +204,33 @@ TQImage KisYCbCrU8ColorSpace::convertToTQImage(const TQ_UINT8 *data, TQ_INT32 wi
 }
 
 
-void KisYCbCrU8ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
+void KisYCbCrU8ColorSpace::bitBlt(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_UINT8 opacity, TQ_INT32 rows, TQ_INT32 cols, const KisCompositeOp& op)
 {
     switch (op.op()) {
         case COMPOSITE_UNDEF:
         // Undefined == no composition
             break;
         case COMPOSITE_OVER:
-            compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
+            compositeOver(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COPY:
-            compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
+            compositeCopy(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_ERASE:
-            compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, tqmaskRowStride, rows, cols, opacity);
+            compositeErase(dst, dstRowStride, src, srcRowStride, srcAlphaMask, maskRowStride, rows, cols, opacity);
             break;
         default:
             break;
     }
 }
 
-void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmaskRowStart, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
+void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 *maskRowStart, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 numColumns, TQ_UINT8 opacity)
 {
     while (rows > 0) {
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = tqmaskRowStart;
+        const TQ_UINT8 *tqmask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -289,13 +289,13 @@ void KisYCbCrU8ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         rows--;
         srcRowStart += srcRowStride;
         dstRowStart += dstRowStride;
-        if(tqmaskRowStart) {
-            tqmaskRowStart += tqmaskRowStride;
+        if(maskRowStart) {
+            maskRowStart += maskRowStride;
         }
     }
 }
 
-void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 tqmaskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
+void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, const TQ_UINT8 *src, TQ_INT32 srcRowSize, const TQ_UINT8 *srcAlphaMask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 cols, TQ_UINT8 /*opacity*/)
 {
     while (rows-- > 0)
     {
@@ -320,12 +320,12 @@ void KisYCbCrU8ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, co
         dst += dstRowSize;
         src += srcRowSize;
         if(srcAlphaMask) {
-            srcAlphaMask += tqmaskRowStride;
+            srcAlphaMask += maskRowStride;
         }
     }
 }
 
-void KisYCbCrU8ColorSpace::compositeCopy(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStride, const TQ_UINT8 *srcRowStart, TQ_INT32 srcRowStride, const TQ_UINT8 */*tqmask*/, TQ_INT32 /*tqmaskRowStride*/, 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 */*tqmask*/, 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 a0308881..6c2b21c7 100644
--- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
+++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
@@ -69,15 +69,15 @@ class KisYCbCrU8ColorSpace : public KisU8BaseColorSpace
                             const TQ_UINT8 *src,
                             TQ_INT32 srcRowStride,
                             const TQ_UINT8 *srcAlphaMask,
-                            TQ_INT32 tqmaskRowStride,
+                            TQ_INT32 maskRowStride,
                             TQ_UINT8 opacity,
                             TQ_INT32 rows,
                             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 tqmaskRowStride, 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 tqmaskRowStride, 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 tqmaskRowStride, 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 *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);
 
     private:
 #define CLAMP_TO_8BITCHANNEL(a) CLAMP(a, 0, TQ_UINT8_MAX)
diff --git a/chalk/core/kis_alpha_mask.h b/chalk/core/kis_alpha_mask.h
index 4665857e..5573f5e6 100644
--- a/chalk/core/kis_alpha_mask.h
+++ b/chalk/core/kis_alpha_mask.h
@@ -70,7 +70,7 @@ class KisAlphaMask : public KShared {
        Returns TQ_UINT8 OPACITY_TRANSPARENT if the value is
        outside the bounds of the tqmask.
 
-       XXX: this is, of course, not the best way of tqmasking.
+       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,
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 9720a3e1..60f475f0 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -392,7 +392,7 @@ KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixel
     KisAlphaMaskSP outputMask = 0;
 
     if (belowBrush != 0) {
-        // We're in between two tqmasks. Interpolate between them.
+        // We're in between two masks. Interpolate between them.
 
         KisAlphaMaskSP scaledAboveMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY);
         KisAlphaMaskSP scaledBelowMask = scaleMask(belowBrush, scale, subPixelX, subPixelY);
@@ -608,13 +608,13 @@ double KisBrush::scaleForPressure(double pressure)
     return scale;
 }
 
-TQ_INT32 KisBrush::tqmaskWidth(const KisPaintInformation& info) const
+TQ_INT32 KisBrush::maskWidth(const KisPaintInformation& info) const
 {
     // Add one for sub-pixel shift
     return static_cast<TQ_INT32>(ceil(width() * scaleForPressure(info.pressure)) + 1);
 }
 
-TQ_INT32 KisBrush::tqmaskHeight(const KisPaintInformation& info) const
+TQ_INT32 KisBrush::maskHeight(const KisPaintInformation& info) const
 {
     // Add one for sub-pixel shift
     return static_cast<TQ_INT32>(ceil(height() * scaleForPressure(info.pressure)) + 1);
@@ -971,7 +971,7 @@ void KisBrush::findScaledBrushes(double scale, const ScaledBrush **aboveBrush, c
     }
 }
 
-KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY)
+KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY)
 {
     int srcWidth = 1;
     int srcHeight = 1;
@@ -986,10 +986,10 @@ KisAlphaMaskSP KisBrush::scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue
     for (int y = 0; y < dstHeight; y++) {
         for (int x = 0; x < dstWidth; x++) {
 
-            TQ_UINT8 topLeft = (x > 0 && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT;
-            TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT;
-            TQ_UINT8 topRight = (x < srcWidth && y > 0) ? tqmaskValue : OPACITY_TRANSPARENT;
-            TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? tqmaskValue : OPACITY_TRANSPARENT;
+            TQ_UINT8 topLeft = (x > 0 && y > 0) ? maskValue : OPACITY_TRANSPARENT;
+            TQ_UINT8 bottomLeft = (x > 0 && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT;
+            TQ_UINT8 topRight = (x < srcWidth && y > 0) ? maskValue : OPACITY_TRANSPARENT;
+            TQ_UINT8 bottomRight = (x < srcWidth && y < srcHeight) ? maskValue : OPACITY_TRANSPARENT;
 
             // Bi-linear interpolation
             int d = static_cast<int>(a * b * topLeft
@@ -1244,8 +1244,8 @@ void KisBrush::setHeight(TQ_INT32 h)
     KisLayerSP layer = image(KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),""),
                              KisPaintInformation(pressure));
     KisBoundary bounds(layer.data());
-    int w = tqmaskWidth(pressure);
-    int h = tqmaskHeight(pressure);
+    int w = maskWidth(pressure);
+    int h = maskHeight(pressure);
 
     bounds.generateBoundary(w, h);
     TQPixmap pix(bounds.pixmap(w, h));
@@ -1256,8 +1256,8 @@ void KisBrush::setHeight(TQ_INT32 h)
 
 void KisBrush::generateBoundary() {
     KisPaintDeviceSP dev;
-    int w = tqmaskWidth(KisPaintInformation());
-    int h = tqmaskHeight(KisPaintInformation());
+    int w = maskWidth(KisPaintInformation());
+    int h = maskHeight(KisPaintInformation());
 
     if (brushType() == IMAGE || brushType() == PIPE_IMAGE) {
         dev = image(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("RGBA",""),""), KisPaintInformation());
diff --git a/chalk/core/kis_brush.h b/chalk/core/kis_brush.h
index 091cebde..57dd9d9e 100644
--- a/chalk/core/kis_brush.h
+++ b/chalk/core/kis_brush.h
@@ -95,8 +95,8 @@ public:
     double ySpacing(double pressure = PRESSURE_DEFAULT) const;
 
     // Dimensions in pixels of the tqmask/image at a given pressure.
-    TQ_INT32 tqmaskWidth(const KisPaintInformation& info) const;
-    TQ_INT32 tqmaskHeight(const KisPaintInformation& info) const;
+    TQ_INT32 maskWidth(const KisPaintInformation& info) const;
+    TQ_INT32 maskHeight(const KisPaintInformation& info) const;
 
     virtual void setUseColorAsMask(bool useColorAsMask) { m_useColorAsMask = useColorAsMask; }
     virtual bool useColorAsMask() const { return m_useColorAsMask; }
@@ -157,7 +157,7 @@ private:
     static TQImage scaleImage(const TQImage& srcImage, int width, int height);
     static TQImage interpolate(const TQImage& image1, const TQImage& image2, double t);
 
-    static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 tqmaskValue, double subPixelX, double subPixelY);
+    static KisAlphaMaskSP scaleSinglePixelMask(double scale, TQ_UINT8 maskValue, double subPixelX, double subPixelY);
     static TQImage scaleSinglePixelImage(double scale, TQRgb pixel, double subPixelX, double subPixelY);
 
     // Find the scaled brush(es) nearest to the given scale.
diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h
index 68053384..721ce827 100644
--- a/chalk/core/kis_merge_visitor.h
+++ b/chalk/core/kis_merge_visitor.h
@@ -153,9 +153,9 @@ public:
                 KisSelectionSP tqmask = layer->getMaskAsSelection();
                 // The indirect painting happens on the tqmask
                 if (tempTarget && layer->editMask()) {
-                    KisPaintDeviceSP tqmaskSrc = layer->getMask();
-                    KisPaintDeviceSP temp = new KisPaintDevice(tqmaskSrc->colorSpace());
-                    temp = paintIndirect(tqmaskSrc, temp, layer, sx, sy, dx, dy, w, h);
+                    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);
diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc
index 1ce2e98f..59665829 100644
--- a/chalk/core/kis_paint_device.cc
+++ b/chalk/core/kis_paint_device.cc
@@ -343,14 +343,14 @@ DCOPObject *KisPaintDevice::dcopObject()
     return m_dcop;
 }
 
-KisLayer *KisPaintDevice::tqparentLayer() const
+KisLayer *KisPaintDevice::parentLayer() const
 {
     return m_parentLayer;
 }
 
-void KisPaintDevice::setParentLayer(KisLayer *tqparentLayer)
+void KisPaintDevice::setParentLayer(KisLayer *parentLayer)
 {
-    m_parentLayer = tqparentLayer;
+    m_parentLayer = parentLayer;
 }
 
 void KisPaintDevice::setDirty(const TQRect & rc)
@@ -1115,15 +1115,15 @@ void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask)
     for (TQ_INT32 y = r.top(); y <= r.bottom(); ++y) {
 
         KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true);
-        KisHLineIterator tqmaskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false);
+        KisHLineIterator maskIt = tqmask->createHLineIterator(r.x(), y, r.width(), false);
 
         while (!pixelIt.isDone()) {
             // XXX: Optimize by using stretches
 
-            m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), tqmaskIt.rawData(), 1);
+            m_colorSpace->applyAlphaU8Mask( pixelIt.rawData(), maskIt.rawData(), 1);
 
             ++pixelIt;
-            ++tqmaskIt;
+            ++maskIt;
         }
     }
 }
diff --git a/chalk/core/kis_paint_device.h b/chalk/core/kis_paint_device.h
index 6e804afe..6c8d7331 100644
--- a/chalk/core/kis_paint_device.h
+++ b/chalk/core/kis_paint_device.h
@@ -90,13 +90,13 @@ public:
 
     /**
      * Create a new paint device with the specified colorspace. The
-     * tqparentLayer will be notified of changes to this paint device.
+     * parentLayer will be notified of changes to this paint device.
      *
-     * @param tqparentLayer the layer that contains this paint device.
+     * @param parentLayer the layer that contains this paint device.
      * @param colorSpace the colorspace of this paint device
      * @param name for debugging purposes
      */
-    KisPaintDevice(KisLayer *tqparentLayer, KisColorSpace * colorSpace, const char * name = 0);
+    KisPaintDevice(KisLayer *parentLayer, KisColorSpace * colorSpace, const char * name = 0);
 
     KisPaintDevice(const KisPaintDevice& rhs);
     virtual ~KisPaintDevice();
@@ -386,7 +386,7 @@ public:
 
     /**
      * Return the image that contains this paint device, or 0 if it is not
-     * part of an image. This is the same as calling tqparentLayer()->image().
+     * part of an image. This is the same as calling parentLayer()->image().
      */
     KisImage *image() const;
 
@@ -394,13 +394,13 @@ public:
      * Returns the KisLayer that contains this paint device, or 0 if this is not
      * part of a layer.
      */
-    KisLayer *tqparentLayer() const;
+    KisLayer *parentLayer() const;
 
     /**
      * Set the KisLayer that contains this paint device, or 0 if this is not
      * part of a layer.
      */
-    void setParentLayer(KisLayer *tqparentLayer);
+    void setParentLayer(KisLayer *parentLayer);
 
     /**
      * Add the specified rect top the tqparent layer (if present)
diff --git a/chalk/core/kis_paint_layer.cc b/chalk/core/kis_paint_layer.cc
index 63663067..2df12e01 100644
--- a/chalk/core/kis_paint_layer.cc
+++ b/chalk/core/kis_paint_layer.cc
@@ -40,7 +40,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
     Q_ASSERT(dev);
     m_paintdev = dev;
     m_tqmask = 0;
-    m_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     m_paintdev->setParentLayer(this);
     m_renderMask = false;
     m_editMask = true;
@@ -53,7 +53,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_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     m_renderMask = false;
     m_editMask = true;
 }
@@ -65,7 +65,7 @@ KisPaintLayer::KisPaintLayer(KisImage *img, const TQString& name, TQ_UINT8 opaci
     Q_ASSERT(colorSpace);
     m_paintdev = new KisPaintDevice(this, colorSpace,  name.latin1());
     m_tqmask = 0;
-    m_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     m_renderMask = false;
     m_editMask = true;
 }
@@ -193,7 +193,7 @@ void KisPaintLayer::removeMask() {
 
     m_tqmask->setParentLayer(0);
     m_tqmask = 0;
-    m_tqmaskAsSelection = 0;
+    m_maskAsSelection = 0;
     setDirty();
 
     emit sigMaskInfoChanged();
@@ -210,7 +210,7 @@ void KisPaintLayer::applyMask() {
     // A bit slow; but it works
     KisPaintDeviceSP temp = new KisPaintDevice(m_paintdev->colorSpace());
     KisPainter gc(temp);
-    gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_tqmaskAsSelection, OPACITY_OPAQUE, x, y, w, h);
+    gc.bltSelection(x, y, COMPOSITE_OVER, m_paintdev, m_maskAsSelection, OPACITY_OPAQUE, x, y, w, h);
     gc.end();
     gc.begin(m_paintdev);
     gc.bitBlt(x, y, COMPOSITE_COPY, temp, OPACITY_OPAQUE, x, y, w, h);
@@ -252,7 +252,7 @@ void KisPaintLayer::createMaskFromSelection(KisSelectionSP from) {
             ->getColorSpace(KisID("GRAYA"), 0));
     m_tqmask->setParentLayer(this);
 
-    m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
+    m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
 
     // Default pixel is opaque white == don't tqmask?
     TQ_UINT8 const defPixel[] = { 255, 255 };
@@ -292,7 +292,7 @@ KisPaintDeviceSP KisPaintLayer::getMask() {
 KisSelectionSP KisPaintLayer::getMaskAsSelection() {
     createMask();
     kdDebug() << k_funcinfo << endl;
-    return m_tqmaskAsSelection;
+    return m_maskAsSelection;
 }
 
 void KisPaintLayer::setEditMask(bool b) {
@@ -312,7 +312,7 @@ void KisPaintLayer::setRenderMask(bool b) {
 void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
     KisRectIteratorPixel srcIt = m_tqmask->createRectIterator(r.x(), r.y(),
             r.width(), r.height(), false);
-    KisRectIteratorPixel dstIt = m_tqmaskAsSelection->createRectIterator(r.x(), r.y(),
+    KisRectIteratorPixel dstIt = m_maskAsSelection->createRectIterator(r.x(), r.y(),
             r.width(), r.height(), true);
 
     while(!dstIt.isDone()) {
@@ -328,7 +328,7 @@ void KisPaintLayer::convertMaskToSelection(const TQRect& r) {
 void KisPaintLayer::genericMaskCreationHelper() {
     m_tqmask->setParentLayer(this);
 
-    m_tqmaskAsSelection = new KisSelection(); // Anonymous selection is good enough
+    m_maskAsSelection = new KisSelection(); // Anonymous selection is good enough
 
     // Default pixel is opaque white == don't tqmask?
     TQ_UINT8 const defPixel[] = { 255, 255 };
@@ -374,35 +374,35 @@ namespace {
     class KisMaskFromSelectionCommand : public KNamedCommand {
         typedef KNamedCommand super;
         KisPaintLayerSP m_layer;
-        KisPaintDeviceSP m_tqmaskBefore;
-        KisPaintDeviceSP m_tqmaskAfter;
+        KisPaintDeviceSP m_maskBefore;
+        KisPaintDeviceSP m_maskAfter;
         KisSelectionSP m_selection;
     public:
         KisMaskFromSelectionCommand(const TQString& name, KisPaintLayer* layer)
             : super(name), m_layer(layer) {
             if (m_layer->hasMask())
-                m_tqmaskBefore = m_layer->getMask();
+                m_maskBefore = m_layer->getMask();
             else
-                m_tqmaskBefore = 0;
-            m_tqmaskAfter = 0;
+                m_maskBefore = 0;
+            m_maskAfter = 0;
             if (m_layer->paintDevice()->hasSelection())
                 m_selection = m_layer->paintDevice()->selection();
             else
                 m_selection = 0;
         }
         virtual void execute() {
-            if (!m_tqmaskAfter) {
+            if (!m_maskAfter) {
                 m_layer->createMaskFromSelection(m_selection);
-                m_tqmaskAfter = m_layer->getMask();
+                m_maskAfter = m_layer->getMask();
             } else {
                 m_layer->paintDevice()->deselect();
-                m_layer->createMaskFromPaintDevice(m_tqmaskAfter);
+                m_layer->createMaskFromPaintDevice(m_maskAfter);
             }
         }
         virtual void unexecute() {
             m_layer->paintDevice()->setSelection(m_selection);
-            if (m_tqmaskBefore)
-                m_layer->createMaskFromPaintDevice(m_tqmaskBefore);
+            if (m_maskBefore)
+                m_layer->createMaskFromPaintDevice(m_maskBefore);
             else
                 m_layer->removeMask();
         }
@@ -488,11 +488,11 @@ KNamedCommand* KisPaintLayer::createMaskCommand() {
     return new KisCreateMaskCommand(i18n("Create Layer Mask"), this);
 }
 
-KNamedCommand* KisPaintLayer::tqmaskFromSelectionCommand() {
+KNamedCommand* KisPaintLayer::maskFromSelectionCommand() {
     return new KisMaskFromSelectionCommand(i18n("Mask From Selection"), this);
 }
 
-KNamedCommand* KisPaintLayer::tqmaskToSelectionCommand() {
+KNamedCommand* KisPaintLayer::maskToSelectionCommand() {
     return new KisMaskToSelectionCommand(i18n("Mask to Selection"), this);
 }
 
diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h
index 9e598e7a..6319f981 100644
--- a/chalk/core/kis_paint_layer.h
+++ b/chalk/core/kis_paint_layer.h
@@ -106,15 +106,15 @@ public:
     /// Undoable version of createMask
     KNamedCommand* createMaskCommand();
     /// Undoable version of createMaskFromSelection
-    KNamedCommand* tqmaskFromSelectionCommand();
+    KNamedCommand* maskFromSelectionCommand();
     /// Undoable, removes the current tqmask, but converts it to the current selection
-    KNamedCommand* tqmaskToSelectionCommand();
+    KNamedCommand* maskToSelectionCommand();
     /// Undoable version of removeMask
     KNamedCommand* removeMaskCommand();
     /// Undoable version of applyMask
     KNamedCommand* applyMaskCommand();
 
-    /// Returns true if the tqmasked part of the tqmask will be rendered instead of being transparent
+    /// Returns true if the masked part of the tqmask will be rendered instead of being transparent
     bool renderMask() const { return m_renderMask; }
     /// Set the renderMask property
     void setRenderMask(bool b);
@@ -146,7 +146,7 @@ private:
     // Layer tqmask 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_tqmaskAsSelection; // The tqmask as selection, to apply and render easily
+    KisSelectionSP m_maskAsSelection; // The tqmask as selection, to apply and render easily
     bool m_renderMask;
     bool m_editMask;
 };
diff --git a/chalk/core/kis_paintop.cc b/chalk/core/kis_paintop.cc
index 71989bd9..bff50cf5 100644
--- a/chalk/core/kis_paintop.cc
+++ b/chalk/core/kis_paintop.cc
@@ -65,14 +65,14 @@ KisPaintDeviceSP KisPaintOp::computeDab(KisAlphaMaskSP tqmask, KisColorSpace *cs
 
     TQ_INT32 pixelSize = colorSpace->pixelSize();
 
-    TQ_INT32 tqmaskWidth = tqmask->width();
-    TQ_INT32 tqmaskHeight = tqmask->height();
+    TQ_INT32 maskWidth = tqmask->width();
+    TQ_INT32 maskHeight = tqmask->height();
 
     // Convert the kiscolor to the right colorspace.
     kc.convertTo(colorSpace);
 
-    KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, tqmaskWidth, true);
-    for (int y = 0; y < tqmaskHeight; y++)
+    KisHLineIteratorPixel hiter = m_dab->createHLineIterator(0, 0, maskWidth, true);
+    for (int y = 0; y < maskHeight; y++)
     {
         int x=0;
         while(! hiter.isDone())
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index e988eff0..10e96a05 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -35,7 +35,7 @@
 #include "kis_selection.h"
 
 KisSelection::KisSelection(KisPaintDeviceSP dev)
-    : super(dev->tqparentLayer()
+    : super(dev->parentLayer()
             , KisMetaRegistry::instance()->csRegistry()->getAlpha8()
             , (TQString("selection for ") + dev->name()).latin1())
     , m_parentPaintDevice(dev)
@@ -79,7 +79,7 @@ void KisSelection::setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s)
     *pix = s;
 }
 
-TQImage KisSelection::tqmaskImage()
+TQImage KisSelection::maskImage()
 {
     // If part of a KisAdjustmentLayer, there may be no tqparent device.
     TQImage img;
diff --git a/chalk/core/kis_selection.h b/chalk/core/kis_selection.h
index f41915da..d5323337 100644
--- a/chalk/core/kis_selection.h
+++ b/chalk/core/kis_selection.h
@@ -69,7 +69,7 @@ public:
 
     void setSelected(TQ_INT32 x, TQ_INT32 y, TQ_UINT8 s);
 
-    TQImage tqmaskImage();
+    TQImage maskImage();
 
     void select(TQRect r);
 
@@ -115,7 +115,7 @@ public:
 
     virtual void setDirty(const TQRect & rc);
     virtual void setDirty();
-    inline KisPaintDeviceSP tqparentPaintDevice() { return m_parentPaintDevice; }
+    inline KisPaintDeviceSP parentPaintDevice() { return m_parentPaintDevice; }
 private:
     void paintUniformSelectionRegion(TQImage img, const TQRect& imageRect, const TQRegion& uniformRegion);
 
diff --git a/chalk/core/kis_transaction.cc b/chalk/core/kis_transaction.cc
index b755c597..d0a10acc 100644
--- a/chalk/core/kis_transaction.cc
+++ b/chalk/core/kis_transaction.cc
@@ -62,7 +62,7 @@ void KisTransaction::execute()
     m_private->m_memento->extent(x,y,width,height);
     rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height);
 
-    KisLayerSP l = m_private->m_device->tqparentLayer();
+    KisLayerSP l = m_private->m_device->parentLayer();
     if (l) l->setDirty(rc);
 }
 
@@ -76,7 +76,7 @@ void KisTransaction::unexecute()
     m_private->m_memento->extent(x,y,width,height);
     rc.setRect(x + m_private->m_device->getX(), y + m_private->m_device->getY(), width, height);
 
-    KisLayerSP l = m_private->m_device->tqparentLayer();
+    KisLayerSP l = m_private->m_device->parentLayer();
     if (l) l->setDirty(rc);
 
 }
diff --git a/chalk/core/kis_transform_worker.cc b/chalk/core/kis_transform_worker.cc
index fbc952ea..ae4f4e24 100644
--- a/chalk/core/kis_transform_worker.cc
+++ b/chalk/core/kis_transform_worker.cc
@@ -665,8 +665,8 @@ bool KisTransformWorker::run()
         rotateNone(tmpdev3, m_dev);
     }
 
-    if (m_dev->tqparentLayer()) {
-        m_dev->tqparentLayer()->setDirty();
+    if (m_dev->parentLayer()) {
+        m_dev->parentLayer()->setDirty();
     }
     //progress info
     emit notifyProgressDone();
diff --git a/chalk/core/tiles/kis_tilemanager.h b/chalk/core/tiles/kis_tilemanager.h
index d6886abe..5d388136 100644
--- a/chalk/core/tiles/kis_tilemanager.h
+++ b/chalk/core/tiles/kis_tilemanager.h
@@ -114,7 +114,7 @@ private:
     TQMutex * m_swapMutex;
 
     // This is the constant that we will use to see if we want to add a new tempfile
-    // We use 1<<30 (one gigabyte) because aptqparently 32bit systems don't really like very
+    // We use 1<<30 (one gigabyte) because apparently 32bit systems don't really like very
     // large files.
     static const long MaxSwapFileSize = 1<<30; // For debugging purposes: 1<<20 is a megabyte
 
diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete
index 51cadc58..520d4058 100644
--- a/chalk/doc/DESIGN.obsolete
+++ b/chalk/doc/DESIGN.obsolete
@@ -26,7 +26,7 @@ Design Patterns
               here.
 
             * The composite pattern is used in paint devices, layers, channels,
-              etc. (What about tqmasks?)
+              etc. (What about masks?)
 
             * Change colourspace handling to a Strategy pattern
               (strategy/kis_strategy_color)
diff --git a/chalk/doc/background_paper.txt b/chalk/doc/background_paper.txt
index 96226fe2..aa3bf87b 100644
--- a/chalk/doc/background_paper.txt
+++ b/chalk/doc/background_paper.txt
@@ -68,7 +68,7 @@ trying to use a pencil on a watercolor layer causes a nasty flow-impeding
 useless error box to popup.
 
 Media and ordinary layers can be grouped and mixed at will, together with adjustment
-layers. Adjustment layers can also be attached to selection tqmasks, per layer.
+layers. Adjustment layers can also be attached to selection masks, per layer.
 
 The composited layers is either scaled and color corrected, or color corrected and
 then scaled, depending on whether the zoom > 100% or < 100%.
diff --git a/chalk/doc/brush.txt b/chalk/doc/brush.txt
index bb932eee..17df4b48 100644
--- a/chalk/doc/brush.txt
+++ b/chalk/doc/brush.txt
@@ -16,17 +16,17 @@ 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
 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 tqmasked -- i.e., these are coloured images placed
+image brushes should be masked -- i.e., these are coloured images placed
 on a white background. The white background should be made transparent,
 and then the brush image can be composited onto our image.
 
-This is currently only half supported: I make tqmasks of everything,
+This is currently only half supported: I make masks of everything,
 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
-problem is painting with those tqmasks.
+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 
diff --git a/chalk/doc/chalk-features b/chalk/doc/chalk-features
index 77f79dcb..1c737ce6 100644
--- a/chalk/doc/chalk-features
+++ b/chalk/doc/chalk-features
@@ -206,7 +206,7 @@ of a tablet. Tilt and rotation is not yet supported.
 ** custom brush tqshapes
 ** text brush tqshapes
 ** brushes created from layers or images. These brushes can be saved
-** colored brushes can also be used as tqmasks
+** colored brushes can also be used as masks
 
 * Fills
 
diff --git a/chalk/doc/chalk.xmi b/chalk/doc/chalk.xmi
index 913db577..c16828cf 100644
--- a/chalk/doc/chalk.xmi
+++ b/chalk/doc/chalk.xmi
@@ -485,11 +485,11 @@ tiles." visibility="public" xmi.id="362" type="bool" name="empty" />
      <UML:Parameter visibility="private" xmi.id="371" value="" type="Q_INT32" name="xpix" />
      <UML:Parameter visibility="private" xmi.id="372" value="" type="Q_INT32" name="ypix" />
     </UML:Operation>
-    <UML:Operation visibility="protected" xmi.id="373" type="KisTileSP" name="tqinvalidateTile" >
+    <UML:Operation visibility="protected" xmi.id="373" type="KisTileSP" name="invalidateTile" >
      <UML:Parameter visibility="private" xmi.id="374" value="" type="KisTileSP" name="tile" />
      <UML:Parameter visibility="private" xmi.id="375" value="" type="Q_INT32" name="tilenum" />
     </UML:Operation>
-    <UML:Operation comment="XXX" visibility="public" xmi.id="376" type="void" name="tqinvalidateTiles" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="376" type="void" name="invalidateTiles" >
      <UML:Parameter visibility="private" xmi.id="377" value="" type="KisTileSP" name="tile" />
     </UML:Operation>
     <UML:Operation comment="Total size in memory the data managed by this KisTileMgr " visibility="public" xmi.id="378" type="Q_UINT32" name="memSize" />
@@ -843,7 +843,7 @@ percentage." visibility="public" xmi.id="631" type="" name="KisAlphaMask" >
     <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.
-XXX: this is, of course, not the best way of tqmasking.
+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,
@@ -942,7 +942,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Attribute visibility="private" xmi.id="687" value="" type=TQPOINT_OBJECT_NAME_STRING name="m_hotSpot" />
     <UML:Attribute visibility="private" xmi.id="688" value="" type="QImage" name="m_img" />
     <UML:Attribute visibility="private" xmi.id="689" value="" type="Q_UINT32" name="m_magic_number" />
-    <UML:Attribute visibility="private" xmi.id="690" value="" type="QPtrList" name="m_tqmasks" />
+    <UML:Attribute visibility="private" xmi.id="690" value="" type="QPtrList" name="m_masks" />
     <UML:Attribute visibility="private" xmi.id="691" value="" type="Q_UINT32" name="m_version" />
     <UML:Attribute visibility="private" xmi.id="692" value="" type="Q_UINT32" name="m_width" />
    </UML:Class>
@@ -1186,7 +1186,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
    </UML:Class>
    <UML:Class stereotype="class" visibility="public" xmi.id="902" name="KisDoc" >
     <UML:Operation visibility="public" xmi.id="914" type="" name="KisDoc" >
-     <UML:Parameter visibility="private" xmi.id="915" value="" type="QWidget *" name="tqparentWidget" />
+     <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="918" value="" type="const char *" name="name" />
@@ -1449,7 +1449,7 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     </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="tqparentWidget" />
+     <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="1123" value="" type="const char *" name="name" />
@@ -1839,9 +1839,9 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
     <UML:Attribute visibility="private" xmi.id="1271" value="" type="Q_INT32" name="m_height" />
     <UML:Attribute visibility="private" xmi.id="1272" value="" type="vKisLayerSP" name="m_layerStack" />
     <UML:Attribute visibility="private" xmi.id="1273" value="" type="vKisLayerSP" name="m_layers" />
-    <UML:Attribute visibility="private" xmi.id="1274" value="" type="KoColor" name="m_tqmaskClr" />
-    <UML:Attribute visibility="private" xmi.id="1275" value="" type="bool" name="m_tqmaskEnabled" />
-    <UML:Attribute visibility="private" xmi.id="1276" value="" type="bool" name="m_tqmaskInverted" />
+    <UML:Attribute visibility="private" xmi.id="1274" value="" type="KoColor" name="m_maskClr" />
+    <UML:Attribute visibility="private" xmi.id="1275" value="" type="bool" name="m_maskEnabled" />
+    <UML:Attribute visibility="private" xmi.id="1276" value="" type="bool" name="m_maskInverted" />
     <UML:Attribute visibility="private" xmi.id="1277" value="" type=TQSTRING_OBJECT_NAME_STRING name="m_name" />
     <UML:Attribute visibility="private" xmi.id="1278" value="" type="KisNameServer *" name="m_nserver" />
     <UML:Attribute visibility="private" xmi.id="1279" value="" type="Q_INT32" name="m_ntileCols" />
@@ -1943,10 +1943,10 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="1540" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1541" type="void" name="tqmaskBounds" >
+    <UML:Operation visibility="public" xmi.id="1541" type="void" name="maskBounds" >
      <UML:Parameter visibility="private" xmi.id="1542" value="" type="QRect *" name="rc" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1543" type="void" name="tqmaskBounds" >
+    <UML:Operation visibility="public" xmi.id="1543" type="void" name="maskBounds" >
      <UML:Parameter visibility="private" xmi.id="1544" value="" type="Q_INT32 *" name="x1" />
      <UML:Parameter visibility="private" xmi.id="1545" value="" type="Q_INT32 *" name="y1" />
      <UML:Parameter visibility="private" xmi.id="1546" value="" type="Q_INT32 *" name="x2" />
@@ -2094,7 +2094,7 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
      <UML:Parameter visibility="private" xmi.id="1650" value="" type="Q_INT32" name="mode" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1651" type="KisMaskSP" name="createMask" >
-     <UML:Parameter visibility="private" xmi.id="1652" value="" type="Q_INT32" name="tqmaskType" />
+     <UML:Parameter visibility="private" xmi.id="1652" value="" type="Q_INT32" name="maskType" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1653" type="bool" name="linked" />
     <UML:Operation visibility="public" xmi.id="1654" type="void" name="linked" >
@@ -2436,8 +2436,8 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1930" type="KisPaintDeviceSP" name="tqparent" />
     <UML:Operation visibility="public" xmi.id="1931" type="void" name="setBounds" >
-     <UML:Parameter visibility="private" xmi.id="1932" value="" type="Q_INT32" name="tqparentX" />
-     <UML:Parameter visibility="private" xmi.id="1933" value="" type="Q_INT32" name="tqparentY" />
+     <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" />
      <UML:Parameter visibility="private" xmi.id="1934" value="" type="Q_INT32" name="width" />
      <UML:Parameter visibility="private" xmi.id="1935" value="" type="Q_INT32" name="height" />
     </UML:Operation>
@@ -3526,7 +3526,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="814" id="687" label="m_hotSpot" />
       <listitem open="0" type="814" id="688" label="m_img" />
       <listitem open="0" type="814" id="689" label="m_magic_number" />
-      <listitem open="0" type="814" id="690" label="m_tqmasks" />
+      <listitem open="0" type="814" id="690" label="m_masks" />
       <listitem open="0" type="814" id="691" label="m_version" />
       <listitem open="0" type="814" id="692" label="m_width" />
       <listitem open="0" type="815" id="695" label="KisBrush" />
@@ -3873,9 +3873,9 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="814" id="1271" label="m_height" />
       <listitem open="0" type="814" id="1272" label="m_layerStack" />
       <listitem open="0" type="814" id="1273" label="m_layers" />
-      <listitem open="0" type="814" id="1274" label="m_tqmaskClr" />
-      <listitem open="0" type="814" id="1275" label="m_tqmaskEnabled" />
-      <listitem open="0" type="814" id="1276" label="m_tqmaskInverted" />
+      <listitem open="0" type="814" id="1274" label="m_maskClr" />
+      <listitem open="0" type="814" id="1275" label="m_maskEnabled" />
+      <listitem open="0" type="814" id="1276" label="m_maskInverted" />
       <listitem open="0" type="814" id="1277" label="m_name" />
       <listitem open="0" type="814" id="1278" label="m_nserver" />
       <listitem open="0" type="814" id="1279" label="m_ntileCols" />
@@ -4130,8 +4130,8 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1531" label="tqinvalidate" />
       <listitem open="0" type="815" id="1539" label="tqinvalidate" />
       <listitem open="0" type="815" id="1534" label="tqinvalidate" />
-      <listitem open="0" type="815" id="1541" label="tqmaskBounds" />
-      <listitem open="0" type="815" id="1543" label="tqmaskBounds" />
+      <listitem open="0" type="815" id="1541" label="maskBounds" />
+      <listitem open="0" type="815" id="1543" label="maskBounds" />
       <listitem open="0" type="815" id="1548" label="move" />
       <listitem open="0" type="815" id="1551" label="move" />
       <listitem open="0" type="815" id="1553" label="name" />
@@ -4538,8 +4538,8 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="364" label="tqinvalidate" />
       <listitem open="0" type="815" id="370" label="tqinvalidate" />
       <listitem open="0" type="815" id="368" label="tqinvalidate" />
-      <listitem open="0" type="815" id="373" label="tqinvalidateTile" />
-      <listitem open="0" type="815" id="376" label="tqinvalidateTiles" />
+      <listitem open="0" type="815" id="373" label="invalidateTile" />
+      <listitem open="0" type="815" id="376" label="invalidateTiles" />
       <listitem open="0" type="815" id="378" label="memSize" />
       <listitem open="0" type="815" id="379" label="ncols" />
       <listitem open="0" type="815" id="380" label="nrows" />
@@ -4929,7 +4929,7 @@ in the constructor, you have to call loadAsync.
   <codegeneration>
    <codegenerator language="Perl" />
    <codegenerator language="Cpp" >
-    <classifiercodedocument writeOutCode="true" package="" id="9" tqparent_class="9" fileExt=".cpp" fileName="kisbuildersubject" >
+    <classifiercodedocument writeOutCode="true" package="" id="9" parent_class="9" fileExt=".cpp" fileName="kisbuildersubject" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -4947,12 +4947,12 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="10" tag="operation_10" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="10" tag="operation_10" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="11" tag="operation_11" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="11" tag="operation_11" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -4965,7 +4965,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="12" tqparent_class="12" fileExt=".cpp" fileName="kisimagemagickconverter" >
+    <classifiercodedocument writeOutCode="true" package="" id="12" parent_class="12" fileExt=".cpp" fileName="kisimagemagickconverter" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisimagebuilder_result.h&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -4983,117 +4983,117 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="13" tag="hblock_tag_0" canDelete="false" classfield_id="13" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="13" tag="hblock_tag_0" canDelete="false" classfield_id="13" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="13" tag="hblock_tag_1" canDelete="false" classfield_id="13" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="13" tag="hblock_tag_1" canDelete="false" classfield_id="13" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="14" tag="hblock_tag_2" canDelete="false" classfield_id="14" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="14" tag="hblock_tag_2" canDelete="false" classfield_id="14" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="14" tag="hblock_tag_3" canDelete="false" classfield_id="14" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="14" tag="hblock_tag_3" canDelete="false" classfield_id="14" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="15" tag="hblock_tag_4" canDelete="false" classfield_id="15" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="15" tag="hblock_tag_4" canDelete="false" classfield_id="15" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="15" tag="hblock_tag_5" canDelete="false" classfield_id="15" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="15" tag="hblock_tag_5" canDelete="false" classfield_id="15" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="16" tag="hblock_tag_6" canDelete="false" classfield_id="16" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="16" tag="hblock_tag_6" canDelete="false" classfield_id="16" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="16" tag="hblock_tag_7" canDelete="false" classfield_id="16" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="16" tag="hblock_tag_7" canDelete="false" classfield_id="16" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="17" tag="hblock_tag_8" canDelete="false" classfield_id="17" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="17" tag="hblock_tag_8" canDelete="false" classfield_id="17" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="17" tag="hblock_tag_9" canDelete="false" classfield_id="17" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="17" tag="hblock_tag_9" canDelete="false" classfield_id="17" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="18" tag="operation_18" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="18" tag="operation_18" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="20" tag="operation_20" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="20" tag="operation_20" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="23" tag="operation_23" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="23" tag="operation_23" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="25" tag="operation_25" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="25" tag="operation_25" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="28" tag="operation_28" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="28" tag="operation_28" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="31" tag="operation_31" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="31" tag="operation_31" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="33" tag="operation_33" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="33" tag="operation_33" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="36" tag="operation_36" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="36" tag="operation_36" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="37" tag="operation_37" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="37" tag="operation_37" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="40" tag="operation_40" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="40" tag="operation_40" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="41" tag="operation_41" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="41" tag="operation_41" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="42" tag="operation_42" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="42" tag="operation_42" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="43" tag="operation_43" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="43" tag="operation_43" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -5105,101 +5105,101 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimagemagickconverter.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="13" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="13" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="13" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="13" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="13" tag="hblock_tag_0" canDelete="false" classfield_id="13" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="13" tag="hblock_tag_0" canDelete="false" classfield_id="13" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="13" tag="hblock_tag_1" canDelete="false" classfield_id="13" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="13" tag="hblock_tag_1" canDelete="false" classfield_id="13" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="14" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="14" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="14" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="14" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="14" tag="hblock_tag_2" canDelete="false" classfield_id="14" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="14" tag="hblock_tag_2" canDelete="false" classfield_id="14" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="14" tag="hblock_tag_3" canDelete="false" classfield_id="14" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="14" tag="hblock_tag_3" canDelete="false" classfield_id="14" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="15" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="15" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="15" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="15" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="15" tag="hblock_tag_4" canDelete="false" classfield_id="15" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="15" tag="hblock_tag_4" canDelete="false" classfield_id="15" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="15" tag="hblock_tag_5" canDelete="false" classfield_id="15" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="15" tag="hblock_tag_5" canDelete="false" classfield_id="15" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="16" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="16" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="16" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="16" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="16" tag="hblock_tag_6" canDelete="false" classfield_id="16" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="16" tag="hblock_tag_6" canDelete="false" classfield_id="16" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="16" tag="hblock_tag_7" canDelete="false" classfield_id="16" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="16" tag="hblock_tag_7" canDelete="false" classfield_id="16" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="17" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="17" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="17" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="17" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="17" tag="hblock_tag_8" canDelete="false" classfield_id="17" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="17" tag="hblock_tag_8" canDelete="false" classfield_id="17" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="17" tag="hblock_tag_9" canDelete="false" classfield_id="17" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="17" tag="hblock_tag_9" canDelete="false" classfield_id="17" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -5207,7 +5207,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="44" tqparent_class="44" fileExt=".cpp" fileName="kisbuildermonitor" >
+    <classifiercodedocument writeOutCode="true" package="" id="44" parent_class="44" fileExt=".cpp" fileName="kisbuildermonitor" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;vkisbuildersubject.h&quot;&amp;#010;" >
        <header>
@@ -5225,57 +5225,57 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="45" tag="hblock_tag_0" canDelete="false" classfield_id="45" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="45" tag="hblock_tag_0" canDelete="false" classfield_id="45" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="45" tag="hblock_tag_1" canDelete="false" classfield_id="45" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="45" tag="hblock_tag_1" canDelete="false" classfield_id="45" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="46" tag="operation_46" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="46" tag="operation_46" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="49" tag="operation_49" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="49" tag="operation_49" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="51" tag="operation_51" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="51" tag="operation_51" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="53" tag="operation_53" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="53" tag="operation_53" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -5287,56 +5287,56 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisbuildermonitor.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="45" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="45" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="45" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="45" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="45" tag="hblock_tag_0" canDelete="false" classfield_id="45" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="45" tag="hblock_tag_0" canDelete="false" classfield_id="45" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="45" tag="hblock_tag_1" canDelete="false" classfield_id="45" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="45" tag="hblock_tag_1" canDelete="false" classfield_id="45" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2390" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2390" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2390" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2390" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -5344,7 +5344,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="55" tqparent_class="55" fileExt=".cpp" fileName="kisimagebuilder_result" >
+    <classifiercodedocument writeOutCode="true" package="" id="55" parent_class="55" fileExt=".cpp" fileName="kisimagebuilder_result" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -5369,7 +5369,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="69" tqparent_class="69" fileExt=".cpp" fileName="kisimagebuilder_step" >
+    <classifiercodedocument writeOutCode="true" package="" id="69" parent_class="69" fileExt=".cpp" fileName="kisimagebuilder_step" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -5394,7 +5394,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="81" tqparent_class="81" fileExt=".cpp" fileName="kisstrategycolorspacecmyk" >
+    <classifiercodedocument writeOutCode="true" package="" id="81" parent_class="81" fileExt=".cpp" fileName="kisstrategycolorspacecmyk" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;compositeop.h&quot;&amp;#010;#include &quot;colorlut.h&quot;&amp;#010;" >
        <header>
@@ -5412,97 +5412,97 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="82" tag="hblock_tag_0" canDelete="false" classfield_id="82" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="82" tag="hblock_tag_0" canDelete="false" classfield_id="82" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="82" tag="hblock_tag_1" canDelete="false" classfield_id="82" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="82" tag="hblock_tag_1" canDelete="false" classfield_id="82" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="83" tag="hblock_tag_2" canDelete="false" classfield_id="83" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="83" tag="hblock_tag_2" canDelete="false" classfield_id="83" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="83" tag="hblock_tag_3" canDelete="false" classfield_id="83" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="83" tag="hblock_tag_3" canDelete="false" classfield_id="83" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="84" tag="hblock_tag_4" canDelete="false" classfield_id="84" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="84" tag="hblock_tag_4" canDelete="false" classfield_id="84" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="84" tag="hblock_tag_5" canDelete="false" classfield_id="84" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="84" tag="hblock_tag_5" canDelete="false" classfield_id="84" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="85" tag="hblock_tag_6" canDelete="false" classfield_id="85" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="85" tag="hblock_tag_6" canDelete="false" classfield_id="85" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="85" tag="hblock_tag_7" canDelete="false" classfield_id="85" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="85" tag="hblock_tag_7" canDelete="false" classfield_id="85" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="86" tag="operation_86" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="86" tag="operation_86" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="87" tag="operation_87" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="87" tag="operation_87" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="90" tag="operation_90" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="90" tag="operation_90" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="94" tag="operation_94" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="94" tag="operation_94" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="97" tag="operation_97" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="97" tag="operation_97" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="101" tag="operation_101" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="101" tag="operation_101" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="104" tag="operation_104" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="104" tag="operation_104" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="108" tag="operation_108" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="108" tag="operation_108" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="115" tag="operation_115" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="115" tag="operation_115" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="125" tag="operation_125" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="125" tag="operation_125" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="134" tag="operation_134" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="134" tag="operation_134" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -5514,81 +5514,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisstrategycolorspacecmyk.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="82" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="82" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="82" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="82" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="82" tag="hblock_tag_0" canDelete="false" classfield_id="82" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="82" tag="hblock_tag_0" canDelete="false" classfield_id="82" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="82" tag="hblock_tag_1" canDelete="false" classfield_id="82" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="82" tag="hblock_tag_1" canDelete="false" classfield_id="82" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="83" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="83" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="83" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="83" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="83" tag="hblock_tag_2" canDelete="false" classfield_id="83" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="83" tag="hblock_tag_2" canDelete="false" classfield_id="83" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="83" tag="hblock_tag_3" canDelete="false" classfield_id="83" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="83" tag="hblock_tag_3" canDelete="false" classfield_id="83" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="84" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="84" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="84" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="84" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="84" tag="hblock_tag_4" canDelete="false" classfield_id="84" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="84" tag="hblock_tag_4" canDelete="false" classfield_id="84" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="84" tag="hblock_tag_5" canDelete="false" classfield_id="84" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="84" tag="hblock_tag_5" canDelete="false" classfield_id="84" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="85" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="85" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="85" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="85" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="85" tag="hblock_tag_6" canDelete="false" classfield_id="85" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="85" tag="hblock_tag_6" canDelete="false" classfield_id="85" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="85" tag="hblock_tag_7" canDelete="false" classfield_id="85" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="85" tag="hblock_tag_7" canDelete="false" classfield_id="85" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -5596,7 +5596,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="135" tqparent_class="135" fileExt=".cpp" fileName="rgb" >
+    <classifiercodedocument writeOutCode="true" package="" id="135" parent_class="135" fileExt=".cpp" fileName="rgb" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;" >
        <header>
@@ -5614,32 +5614,32 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="136" tag="hblock_tag_0" canDelete="false" classfield_id="136" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="136" tag="hblock_tag_0" canDelete="false" classfield_id="136" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="136" tag="hblock_tag_1" canDelete="false" classfield_id="136" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="136" tag="hblock_tag_1" canDelete="false" classfield_id="136" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="137" tag="hblock_tag_2" canDelete="false" classfield_id="137" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="137" tag="hblock_tag_2" canDelete="false" classfield_id="137" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="137" tag="hblock_tag_3" canDelete="false" classfield_id="137" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="137" tag="hblock_tag_3" canDelete="false" classfield_id="137" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="138" tag="hblock_tag_4" canDelete="false" classfield_id="138" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="138" tag="hblock_tag_4" canDelete="false" classfield_id="138" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="138" tag="hblock_tag_5" canDelete="false" classfield_id="138" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="138" tag="hblock_tag_5" canDelete="false" classfield_id="138" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -5651,61 +5651,61 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			rgb.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="136" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="136" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="136" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="136" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="136" tag="hblock_tag_0" canDelete="false" classfield_id="136" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="136" tag="hblock_tag_0" canDelete="false" classfield_id="136" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="136" tag="hblock_tag_1" canDelete="false" classfield_id="136" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="136" tag="hblock_tag_1" canDelete="false" classfield_id="136" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="137" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="137" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="137" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="137" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="137" tag="hblock_tag_2" canDelete="false" classfield_id="137" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="137" tag="hblock_tag_2" canDelete="false" classfield_id="137" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="137" tag="hblock_tag_3" canDelete="false" classfield_id="137" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="137" tag="hblock_tag_3" canDelete="false" classfield_id="137" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="138" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="138" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="138" tag="hblock_tag_4" canDelete="false" classfield_id="138" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="138" tag="hblock_tag_4" canDelete="false" classfield_id="138" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="138" tag="hblock_tag_5" canDelete="false" classfield_id="138" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="138" tag="hblock_tag_5" canDelete="false" classfield_id="138" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -5713,7 +5713,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="139" tqparent_class="139" fileExt=".cpp" fileName="kisstrategycolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="139" parent_class="139" fileExt=".cpp" fileName="kisstrategycolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;compositeop.h&quot;&amp;#010;" >
        <header>
@@ -5731,67 +5731,67 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="140" tag="operation_140" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="140" tag="operation_140" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="142" tag="operation_142" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="142" tag="operation_142" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="143" tag="operation_143" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="143" tag="operation_143" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="145" tag="operation_145" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="145" tag="operation_145" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="148" tag="operation_148" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="148" tag="operation_148" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="152" tag="operation_152" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="152" tag="operation_152" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="155" tag="operation_155" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="155" tag="operation_155" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="159" tag="operation_159" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="159" tag="operation_159" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="162" tag="operation_162" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="162" tag="operation_162" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="166" tag="operation_166" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="166" tag="operation_166" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="173" tag="operation_173" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="173" tag="operation_173" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="183" tag="operation_183" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="183" tag="operation_183" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="192" tag="operation_192" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="192" tag="operation_192" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -5804,7 +5804,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="193" tqparent_class="193" fileExt=".cpp" fileName="kiscolorspacefactoryinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="193" parent_class="193" fileExt=".cpp" fileName="kiscolorspacefactoryinterface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kiscolorspacefactoryinterface.h&quot;&amp;#010;#include &quot;enumimgtype.h&quot;&amp;#010;" >
        <header>
@@ -5822,62 +5822,62 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="194" tag="hblock_tag_5" canDelete="false" classfield_id="194" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="194" tag="hblock_tag_5" canDelete="false" classfield_id="194" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="194" tag="hblock_tag_6" canDelete="false" classfield_id="194" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="194" tag="hblock_tag_6" canDelete="false" classfield_id="194" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="195" tag="operation_195" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="195" tag="operation_195" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="197" tag="operation_197" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="197" tag="operation_197" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="198" tag="operation_198" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="198" tag="operation_198" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="200" tag="operation_200" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="200" tag="operation_200" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="202" tag="operation_202" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="202" tag="operation_202" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="204" tag="operation_204" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="204" tag="operation_204" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="205" tag="operation_205" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="205" tag="operation_205" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -5889,71 +5889,71 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kiscolorspacefactoryinterface.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:49:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="194" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="194" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="194" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="194" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="194" tag="hblock_tag_5" canDelete="false" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="194" tag="hblock_tag_5" canDelete="false" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="194" tag="hblock_tag_6" canDelete="false" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="194" tag="hblock_tag_6" canDelete="false" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="194" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="194" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="194" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="194" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="194" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="194" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="194" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="194" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -5961,7 +5961,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="206" tqparent_class="206" fileExt=".cpp" fileName="kisstrategycolorspacergb" >
+    <classifiercodedocument writeOutCode="true" package="" id="206" parent_class="206" fileExt=".cpp" fileName="kisstrategycolorspacergb" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;compositeop.h&quot;&amp;#010;" >
        <header>
@@ -5979,87 +5979,87 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="207" tag="hblock_tag_0" canDelete="false" classfield_id="207" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="207" tag="hblock_tag_0" canDelete="false" classfield_id="207" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="207" tag="hblock_tag_1" canDelete="false" classfield_id="207" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="207" tag="hblock_tag_1" canDelete="false" classfield_id="207" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="208" tag="hblock_tag_2" canDelete="false" classfield_id="208" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="208" tag="hblock_tag_2" canDelete="false" classfield_id="208" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="208" tag="hblock_tag_3" canDelete="false" classfield_id="208" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="208" tag="hblock_tag_3" canDelete="false" classfield_id="208" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="209" tag="hblock_tag_4" canDelete="false" classfield_id="209" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="209" tag="hblock_tag_4" canDelete="false" classfield_id="209" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="209" tag="hblock_tag_5" canDelete="false" classfield_id="209" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="209" tag="hblock_tag_5" canDelete="false" classfield_id="209" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="210" tag="operation_210" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="210" tag="operation_210" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="211" tag="operation_211" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="211" tag="operation_211" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="214" tag="operation_214" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="214" tag="operation_214" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="218" tag="operation_218" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="218" tag="operation_218" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="221" tag="operation_221" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="221" tag="operation_221" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="225" tag="operation_225" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="225" tag="operation_225" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="228" tag="operation_228" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="228" tag="operation_228" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="232" tag="operation_232" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="232" tag="operation_232" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="239" tag="operation_239" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="239" tag="operation_239" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="249" tag="operation_249" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="249" tag="operation_249" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="258" tag="operation_258" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="258" tag="operation_258" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -6071,61 +6071,61 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisstrategycolorspacergb.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="207" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="207" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="207" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="207" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="207" tag="hblock_tag_0" canDelete="false" classfield_id="207" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="207" tag="hblock_tag_0" canDelete="false" classfield_id="207" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="207" tag="hblock_tag_1" canDelete="false" classfield_id="207" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="207" tag="hblock_tag_1" canDelete="false" classfield_id="207" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="208" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="208" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="208" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="208" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="208" tag="hblock_tag_2" canDelete="false" classfield_id="208" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="208" tag="hblock_tag_2" canDelete="false" classfield_id="208" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="208" tag="hblock_tag_3" canDelete="false" classfield_id="208" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="208" tag="hblock_tag_3" canDelete="false" classfield_id="208" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="209" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="209" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="209" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="209" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="209" tag="hblock_tag_4" canDelete="false" classfield_id="209" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="209" tag="hblock_tag_4" canDelete="false" classfield_id="209" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="209" tag="hblock_tag_5" canDelete="false" classfield_id="209" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="209" tag="hblock_tag_5" canDelete="false" classfield_id="209" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -6133,7 +6133,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="259" tqparent_class="259" fileExt=".cpp" fileName="cmyk" >
+    <classifiercodedocument writeOutCode="true" package="" id="259" parent_class="259" fileExt=".cpp" fileName="cmyk" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;" >
        <header>
@@ -6151,47 +6151,47 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="260" tag="hblock_tag_0" canDelete="false" classfield_id="260" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="260" tag="hblock_tag_0" canDelete="false" classfield_id="260" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="260" tag="hblock_tag_1" canDelete="false" classfield_id="260" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="260" tag="hblock_tag_1" canDelete="false" classfield_id="260" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="261" tag="hblock_tag_2" canDelete="false" classfield_id="261" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="261" tag="hblock_tag_2" canDelete="false" classfield_id="261" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="261" tag="hblock_tag_3" canDelete="false" classfield_id="261" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="261" tag="hblock_tag_3" canDelete="false" classfield_id="261" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="262" tag="hblock_tag_4" canDelete="false" classfield_id="262" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="262" tag="hblock_tag_4" canDelete="false" classfield_id="262" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="262" tag="hblock_tag_5" canDelete="false" classfield_id="262" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="262" tag="hblock_tag_5" canDelete="false" classfield_id="262" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="263" tag="hblock_tag_6" canDelete="false" classfield_id="263" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="263" tag="hblock_tag_6" canDelete="false" classfield_id="263" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="263" tag="hblock_tag_7" canDelete="false" classfield_id="263" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="263" tag="hblock_tag_7" canDelete="false" classfield_id="263" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="264" tag="operation_264" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="264" tag="operation_264" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -6203,81 +6203,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			cmyk.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="260" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="260" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="260" tag="hblock_tag_0" canDelete="false" classfield_id="260" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="260" tag="hblock_tag_0" canDelete="false" classfield_id="260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="260" tag="hblock_tag_1" canDelete="false" classfield_id="260" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="260" tag="hblock_tag_1" canDelete="false" classfield_id="260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="261" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="261" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="261" tag="hblock_tag_2" canDelete="false" classfield_id="261" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="261" tag="hblock_tag_2" canDelete="false" classfield_id="261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="261" tag="hblock_tag_3" canDelete="false" classfield_id="261" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="261" tag="hblock_tag_3" canDelete="false" classfield_id="261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="262" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="262" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="262" tag="hblock_tag_4" canDelete="false" classfield_id="262" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="262" tag="hblock_tag_4" canDelete="false" classfield_id="262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="262" tag="hblock_tag_5" canDelete="false" classfield_id="262" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="262" tag="hblock_tag_5" canDelete="false" classfield_id="262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="263" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="263" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="263" tag="hblock_tag_6" canDelete="false" classfield_id="263" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="263" tag="hblock_tag_6" canDelete="false" classfield_id="263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="263" tag="hblock_tag_7" canDelete="false" classfield_id="263" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="263" tag="hblock_tag_7" canDelete="false" classfield_id="263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -6285,7 +6285,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="266" tqparent_class="266" fileExt=".cpp" fileName="kiscolorspacefactoryflyweight" >
+    <classifiercodedocument writeOutCode="true" package="" id="266" parent_class="266" fileExt=".cpp" fileName="kiscolorspacefactoryflyweight" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;enumimgtype.h&quot;&amp;#010;#include &quot;kisstrategycolorspacesp.h&quot;&amp;#010;#include &quot;acflyweights.h&quot;&amp;#010;" >
        <header>
@@ -6303,37 +6303,37 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="267" tag="hblock_tag_0" canDelete="false" classfield_id="267" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="267" tag="hblock_tag_0" canDelete="false" classfield_id="267" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="267" tag="hblock_tag_1" canDelete="false" classfield_id="267" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="267" tag="hblock_tag_1" canDelete="false" classfield_id="267" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="268" tag="operation_268" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="268" tag="operation_268" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="269" tag="operation_269" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="269" tag="operation_269" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="271" tag="operation_271" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="271" tag="operation_271" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="273" tag="operation_273" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="273" tag="operation_273" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="275" tag="operation_275" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="275" tag="operation_275" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -6345,21 +6345,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kiscolorspacefactoryflyweight.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="267" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="267" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="267" tag="hblock_tag_0" canDelete="false" classfield_id="267" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="267" tag="hblock_tag_0" canDelete="false" classfield_id="267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="267" tag="hblock_tag_1" canDelete="false" classfield_id="267" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="267" tag="hblock_tag_1" canDelete="false" classfield_id="267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -6367,7 +6367,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="283" tqparent_class="283" fileExt=".cpp" fileName="kisscopedlock" >
+    <classifiercodedocument writeOutCode="true" package="" id="283" parent_class="283" fileExt=".cpp" fileName="kisscopedlock" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -6385,37 +6385,37 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="284" tag="hblock_tag_0" canDelete="false" classfield_id="284" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="284" tag="hblock_tag_0" canDelete="false" classfield_id="284" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="284" tag="hblock_tag_1" canDelete="false" classfield_id="284" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="284" tag="hblock_tag_1" canDelete="false" classfield_id="284" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="285" tag="operation_285" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="285" tag="operation_285" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="288" tag="operation_288" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="288" tag="operation_288" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="289" tag="operation_289" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="289" tag="operation_289" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="290" tag="operation_290" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="290" tag="operation_290" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="291" tag="operation_291" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="291" tag="operation_291" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -6427,21 +6427,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisscopedlock.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:49:09&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="284" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="284" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="284" tag="hblock_tag_0" canDelete="false" classfield_id="284" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="284" tag="hblock_tag_0" canDelete="false" classfield_id="284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="284" tag="hblock_tag_1" canDelete="false" classfield_id="284" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="284" tag="hblock_tag_1" canDelete="false" classfield_id="284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -6449,7 +6449,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="292" tqparent_class="292" fileExt=".cpp" fileName="kisstrategymove" >
+    <classifiercodedocument writeOutCode="true" package="" id="292" parent_class="292" fileExt=".cpp" fileName="kisstrategymove" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -6467,127 +6467,127 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="293" tag="hblock_tag_0" canDelete="false" classfield_id="293" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="293" tag="hblock_tag_0" canDelete="false" classfield_id="293" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="293" tag="hblock_tag_1" canDelete="false" classfield_id="293" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="293" tag="hblock_tag_1" canDelete="false" classfield_id="293" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="294" tag="hblock_tag_2" canDelete="false" classfield_id="294" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="294" tag="hblock_tag_2" canDelete="false" classfield_id="294" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="294" tag="hblock_tag_3" canDelete="false" classfield_id="294" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="294" tag="hblock_tag_3" canDelete="false" classfield_id="294" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="295" tag="hblock_tag_4" canDelete="false" classfield_id="295" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="295" tag="hblock_tag_4" canDelete="false" classfield_id="295" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="295" tag="hblock_tag_5" canDelete="false" classfield_id="295" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="295" tag="hblock_tag_5" canDelete="false" classfield_id="295" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="296" tag="hblock_tag_6" canDelete="false" classfield_id="296" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="296" tag="hblock_tag_6" canDelete="false" classfield_id="296" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="296" tag="hblock_tag_7" canDelete="false" classfield_id="296" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="296" tag="hblock_tag_7" canDelete="false" classfield_id="296" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="297" tag="hblock_tag_8" canDelete="false" classfield_id="297" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="297" tag="hblock_tag_8" canDelete="false" classfield_id="297" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="297" tag="hblock_tag_9" canDelete="false" classfield_id="297" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="297" tag="hblock_tag_9" canDelete="false" classfield_id="297" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="298" tag="hblock_tag_10" canDelete="false" classfield_id="298" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="298" tag="hblock_tag_10" canDelete="false" classfield_id="298" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="298" tag="hblock_tag_11" canDelete="false" classfield_id="298" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="298" tag="hblock_tag_11" canDelete="false" classfield_id="298" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="299" tag="hblock_tag_12" canDelete="false" classfield_id="299" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="299" tag="hblock_tag_12" canDelete="false" classfield_id="299" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="299" tag="hblock_tag_13" canDelete="false" classfield_id="299" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="299" tag="hblock_tag_13" canDelete="false" classfield_id="299" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="300" tag="operation_300" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="300" tag="operation_300" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="302" tag="operation_302" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="302" tag="operation_302" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="303" tag="operation_303" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="303" tag="operation_303" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="305" tag="operation_305" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="305" tag="operation_305" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="307" tag="operation_307" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="307" tag="operation_307" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="309" tag="operation_309" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="309" tag="operation_309" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="312" tag="operation_312" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="312" tag="operation_312" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="314" tag="operation_314" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="314" tag="operation_314" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="319" tag="operation_319" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="319" tag="operation_319" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="322" tag="operation_322" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="322" tag="operation_322" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="324" tag="operation_324" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="324" tag="operation_324" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -6599,141 +6599,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisstrategymove.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:47:15&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="293" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="293" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="293" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="293" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="293" tag="hblock_tag_0" canDelete="false" classfield_id="293" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="293" tag="hblock_tag_0" canDelete="false" classfield_id="293" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="293" tag="hblock_tag_1" canDelete="false" classfield_id="293" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="293" tag="hblock_tag_1" canDelete="false" classfield_id="293" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="294" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="294" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="294" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="294" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="294" tag="hblock_tag_2" canDelete="false" classfield_id="294" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="294" tag="hblock_tag_2" canDelete="false" classfield_id="294" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="294" tag="hblock_tag_3" canDelete="false" classfield_id="294" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="294" tag="hblock_tag_3" canDelete="false" classfield_id="294" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="295" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="295" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="295" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="295" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="295" tag="hblock_tag_4" canDelete="false" classfield_id="295" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="295" tag="hblock_tag_4" canDelete="false" classfield_id="295" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="295" tag="hblock_tag_5" canDelete="false" classfield_id="295" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="295" tag="hblock_tag_5" canDelete="false" classfield_id="295" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="296" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="296" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="296" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="296" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="296" tag="hblock_tag_6" canDelete="false" classfield_id="296" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="296" tag="hblock_tag_6" canDelete="false" classfield_id="296" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="296" tag="hblock_tag_7" canDelete="false" classfield_id="296" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="296" tag="hblock_tag_7" canDelete="false" classfield_id="296" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="297" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="297" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="297" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="297" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="297" tag="hblock_tag_8" canDelete="false" classfield_id="297" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="297" tag="hblock_tag_8" canDelete="false" classfield_id="297" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="297" tag="hblock_tag_9" canDelete="false" classfield_id="297" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="297" tag="hblock_tag_9" canDelete="false" classfield_id="297" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="298" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="298" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="298" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="298" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="298" tag="hblock_tag_10" canDelete="false" classfield_id="298" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="298" tag="hblock_tag_10" canDelete="false" classfield_id="298" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="298" tag="hblock_tag_11" canDelete="false" classfield_id="298" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="298" tag="hblock_tag_11" canDelete="false" classfield_id="298" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="299" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="299" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="299" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="299" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="299" tag="hblock_tag_12" canDelete="false" classfield_id="299" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="299" tag="hblock_tag_12" canDelete="false" classfield_id="299" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="299" tag="hblock_tag_13" canDelete="false" classfield_id="299" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="299" tag="hblock_tag_13" canDelete="false" classfield_id="299" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -6741,7 +6741,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="325" tqparent_class="325" fileExt=".cpp" fileName="kistilemgr" >
+    <classifiercodedocument writeOutCode="true" package="" id="325" parent_class="325" fileExt=".cpp" fileName="kistilemgr" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kistilesp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;kispixeldatasp.h&quot;&amp;#010;#include &quot;vkistilesp.h&quot;&amp;#010;" >
        <header>
@@ -6759,267 +6759,267 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="326" tag="hblock_tag_0" canDelete="false" classfield_id="326" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="326" tag="hblock_tag_0" canDelete="false" classfield_id="326" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="326" tag="hblock_tag_1" canDelete="false" classfield_id="326" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="326" tag="hblock_tag_1" canDelete="false" classfield_id="326" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="327" tag="hblock_tag_2" canDelete="false" classfield_id="327" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="327" tag="hblock_tag_2" canDelete="false" classfield_id="327" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="327" tag="hblock_tag_3" canDelete="false" classfield_id="327" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="327" tag="hblock_tag_3" canDelete="false" classfield_id="327" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="330" tag="hblock_tag_4" canDelete="false" classfield_id="330" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="330" tag="hblock_tag_4" canDelete="false" classfield_id="330" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="330" tag="hblock_tag_5" canDelete="false" classfield_id="330" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="330" tag="hblock_tag_5" canDelete="false" classfield_id="330" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="331" tag="hblock_tag_6" canDelete="false" classfield_id="331" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="331" tag="hblock_tag_6" canDelete="false" classfield_id="331" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="331" tag="hblock_tag_7" canDelete="false" classfield_id="331" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="331" tag="hblock_tag_7" canDelete="false" classfield_id="331" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="332" tag="hblock_tag_8" canDelete="false" classfield_id="332" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="332" tag="hblock_tag_8" canDelete="false" classfield_id="332" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="332" tag="hblock_tag_9" canDelete="false" classfield_id="332" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="332" tag="hblock_tag_9" canDelete="false" classfield_id="332" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="333" tag="hblock_tag_10" canDelete="false" classfield_id="333" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="333" tag="hblock_tag_10" canDelete="false" classfield_id="333" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="333" tag="hblock_tag_11" canDelete="false" classfield_id="333" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="333" tag="hblock_tag_11" canDelete="false" classfield_id="333" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="334" tag="hblock_tag_12" canDelete="false" classfield_id="334" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="334" tag="hblock_tag_12" canDelete="false" classfield_id="334" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="334" tag="hblock_tag_13" canDelete="false" classfield_id="334" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="334" tag="hblock_tag_13" canDelete="false" classfield_id="334" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_14" canDelete="false" classfield_id="329" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_14" canDelete="false" classfield_id="329" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_15" canDelete="false" classfield_id="329" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_15" canDelete="false" classfield_id="329" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="335" tag="operation_335" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="335" tag="operation_335" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="337" tag="operation_337" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="337" tag="operation_337" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Create a new KisTileMgr of width and height with the&amp;#010;specified colour depth. Deep copies the tiles of tm to the&amp;#010;new KisTileMgr.&amp;#010;&amp;#010;XXX: I am not sure what happens when tm is bigger or smaller&amp;#010;than width and height, nor what happens when tm has a&amp;#010;different depth." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="342" tag="operation_342" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="342" tag="operation_342" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Create a KisTileMgr of width and height with the specified&amp;#010;colour depth." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="346" tag="operation_346" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="346" tag="operation_346" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Creates a new KisTileMgr based on rhs, shares a reference&amp;#010;to the tiles of rhs." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="348" tag="operation_348" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="348" tag="operation_348" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="350" tag="operation_350" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="350" tag="operation_350" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX?" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="354" tag="operation_354" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="354" tag="operation_354" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Color-depth of the KisRenderInterface implementation&amp;#010;managed by this KisTileMgr" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="355" tag="operation_355" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="355" tag="operation_355" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX?" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="359" tag="operation_359" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="359" tag="operation_359" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="362" tag="operation_362" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="362" tag="operation_362" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Returns true if this KisTileMgr does not manage any&amp;#010;tiles." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="363" tag="operation_363" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="363" tag="operation_363" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Height in pixels of the total area managed by this KisTileMgr" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="364" tag="operation_364" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="364" tag="operation_364" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="368" tag="operation_368" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="368" tag="operation_368" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="370" tag="operation_370" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="370" tag="operation_370" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="373" tag="operation_373" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="373" tag="operation_373" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="376" tag="operation_376" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="376" tag="operation_376" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="378" tag="operation_378" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="378" tag="operation_378" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Total size in memory the data managed by this KisTileMgr " />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="379" tag="operation_379" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="379" tag="operation_379" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Number of columns of tiles managed by this KisTileMgr" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="380" tag="operation_380" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="380" tag="operation_380" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Number of rows of tiles managed by this KisTileMgr" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="381" tag="operation_381" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="381" tag="operation_381" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Returns the KisPixelData defined by the rectangle x1, y1,&amp;#010;x2, y2. Depending on mode, this data is readable, writable&amp;#010;or both." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="387" tag="operation_387" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="387" tag="operation_387" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="389" tag="operation_389" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="389" tag="operation_389" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Read the area defined by x1, y2, x2, y2 into the buffer. Stride is number of bytes&amp;#010;that a pixel takes in the buffer." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="396" tag="operation_396" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="396" tag="operation_396" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Not sure what this does... Perhaps write changed data if&amp;#010;owner, else mark something invalid. XXX" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="398" tag="operation_398" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="398" tag="operation_398" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Create or duplicate a tile with identity tilenum; tilenum&amp;#010;is computed from the x/y coordinates of the tile in the&amp;#010;image&amp;#010;&amp;#010;XXX: Not sure what 'mode' is. Presumbly related to the&amp;#010;TILEMODE constants." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="401" tag="operation_401" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="401" tag="operation_401" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Create or duplicate a tile at location xpix/ypix.&amp;#010;&amp;#010;XXX: Not sure what 'mode' is. Presumbly related to the&amp;#010;TILEMODE constants." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="405" tag="operation_405" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="405" tag="operation_405" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Puts the x/y coordinates of the top left (?) corner&amp;#010;of tile in coord." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="408" tag="operation_408" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="408" tag="operation_408" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Puts the x/y coordinates of the top left (?) corner&amp;#010;of tile in x and y." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="412" tag="operation_412" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="412" tag="operation_412" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="415" tag="operation_415" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="415" tag="operation_415" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="XXX" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="419" tag="operation_419" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="419" tag="operation_419" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="422" tag="operation_422" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="422" tag="operation_422" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Width in pixels of the total area managed by this KisTileMgr" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="423" tag="operation_423" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="423" tag="operation_423" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="425" tag="operation_425" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="425" tag="operation_425" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Commit the pixel data in buffer." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="432" tag="operation_432" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="432" tag="operation_432" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -7031,176 +7031,176 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilemgr.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="326" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="326" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="326" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="326" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="326" tag="hblock_tag_0" canDelete="false" classfield_id="326" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="326" tag="hblock_tag_0" canDelete="false" classfield_id="326" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="326" tag="hblock_tag_1" canDelete="false" classfield_id="326" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="326" tag="hblock_tag_1" canDelete="false" classfield_id="326" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="327" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="327" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="327" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="327" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="327" tag="hblock_tag_2" canDelete="false" classfield_id="327" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="327" tag="hblock_tag_2" canDelete="false" classfield_id="327" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="327" tag="hblock_tag_3" canDelete="false" classfield_id="327" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="327" tag="hblock_tag_3" canDelete="false" classfield_id="327" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="330" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="330" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="330" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="330" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="330" tag="hblock_tag_4" canDelete="false" classfield_id="330" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="330" tag="hblock_tag_4" canDelete="false" classfield_id="330" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="330" tag="hblock_tag_5" canDelete="false" classfield_id="330" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="330" tag="hblock_tag_5" canDelete="false" classfield_id="330" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="331" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="331" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="331" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="331" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="331" tag="hblock_tag_6" canDelete="false" classfield_id="331" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="331" tag="hblock_tag_6" canDelete="false" classfield_id="331" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="331" tag="hblock_tag_7" canDelete="false" classfield_id="331" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="331" tag="hblock_tag_7" canDelete="false" classfield_id="331" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="332" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="332" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="332" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="332" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="332" tag="hblock_tag_8" canDelete="false" classfield_id="332" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="332" tag="hblock_tag_8" canDelete="false" classfield_id="332" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="332" tag="hblock_tag_9" canDelete="false" classfield_id="332" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="332" tag="hblock_tag_9" canDelete="false" classfield_id="332" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="333" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="333" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="333" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="333" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="333" tag="hblock_tag_10" canDelete="false" classfield_id="333" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="333" tag="hblock_tag_10" canDelete="false" classfield_id="333" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="333" tag="hblock_tag_11" canDelete="false" classfield_id="333" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="333" tag="hblock_tag_11" canDelete="false" classfield_id="333" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="334" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="334" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="334" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="334" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="334" tag="hblock_tag_12" canDelete="false" classfield_id="334" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="334" tag="hblock_tag_12" canDelete="false" classfield_id="334" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="334" tag="hblock_tag_13" canDelete="false" classfield_id="334" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="334" tag="hblock_tag_13" canDelete="false" classfield_id="334" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="329" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="329" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="329" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="329" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_14" canDelete="false" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_14" canDelete="false" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_15" canDelete="false" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_15" canDelete="false" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -7208,7 +7208,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="328" tqparent_class="328" fileExt=".cpp" fileName="kistilemediator" >
+    <classifiercodedocument writeOutCode="true" package="" id="328" parent_class="328" fileExt=".cpp" fileName="kistilemediator" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kistilesp.h&quot;&amp;#010;#include &quot;kistilemgrsp.h&quot;&amp;#010;" >
        <header>
@@ -7226,97 +7226,97 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="433" tag="hblock_tag_0" canDelete="false" classfield_id="433" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="433" tag="hblock_tag_0" canDelete="false" classfield_id="433" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="433" tag="hblock_tag_1" canDelete="false" classfield_id="433" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="433" tag="hblock_tag_1" canDelete="false" classfield_id="433" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="434" tag="hblock_tag_2" canDelete="false" classfield_id="434" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="434" tag="hblock_tag_2" canDelete="false" classfield_id="434" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="434" tag="hblock_tag_3" canDelete="false" classfield_id="434" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="434" tag="hblock_tag_3" canDelete="false" classfield_id="434" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="435" tag="hblock_tag_4" canDelete="false" classfield_id="435" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="435" tag="hblock_tag_4" canDelete="false" classfield_id="435" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="435" tag="hblock_tag_5" canDelete="false" classfield_id="435" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="435" tag="hblock_tag_5" canDelete="false" classfield_id="435" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="436" tag="operation_436" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="436" tag="operation_436" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="438" tag="operation_438" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="438" tag="operation_438" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="439" tag="operation_439" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="439" tag="operation_439" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="441" tag="operation_441" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="441" tag="operation_441" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="445" tag="operation_445" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="445" tag="operation_445" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="449" tag="operation_449" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="449" tag="operation_449" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="451" tag="operation_451" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="451" tag="operation_451" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="454" tag="operation_454" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="454" tag="operation_454" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -7328,96 +7328,96 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilemediator.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="433" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="433" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="433" tag="hblock_tag_0" canDelete="false" classfield_id="433" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="433" tag="hblock_tag_0" canDelete="false" classfield_id="433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="433" tag="hblock_tag_1" canDelete="false" classfield_id="433" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="433" tag="hblock_tag_1" canDelete="false" classfield_id="433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="434" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="434" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="434" tag="hblock_tag_2" canDelete="false" classfield_id="434" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="434" tag="hblock_tag_2" canDelete="false" classfield_id="434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="434" tag="hblock_tag_3" canDelete="false" classfield_id="434" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="434" tag="hblock_tag_3" canDelete="false" classfield_id="434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="435" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="435" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="435" tag="hblock_tag_4" canDelete="false" classfield_id="435" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="435" tag="hblock_tag_4" canDelete="false" classfield_id="435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="435" tag="hblock_tag_5" canDelete="false" classfield_id="435" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="435" tag="hblock_tag_5" canDelete="false" classfield_id="435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="329" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="329" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="329" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="329" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -7425,7 +7425,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="455" tqparent_class="455" fileExt=".cpp" fileName="kistileswapinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="455" parent_class="455" fileExt=".cpp" fileName="kistileswapinterface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kistilesp.h&quot;&amp;#010;" >
        <header>
@@ -7443,72 +7443,72 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="456" tag="operation_456" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="456" tag="operation_456" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="457" tag="operation_457" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="457" tag="operation_457" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="459" tag="operation_459" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="459" tag="operation_459" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="461" tag="operation_461" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="461" tag="operation_461" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="463" tag="operation_463" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="463" tag="operation_463" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="465" tag="operation_465" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="465" tag="operation_465" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="467" tag="operation_467" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="467" tag="operation_467" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="469" tag="operation_469" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="469" tag="operation_469" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="471" tag="operation_471" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="471" tag="operation_471" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -7520,36 +7520,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistileswapinterface.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="492" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="492" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="492" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="492" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -7557,7 +7557,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="472" tqparent_class="472" fileExt=".cpp" fileName="kistilecacheinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="472" parent_class="472" fileExt=".cpp" fileName="kistilecacheinterface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kistilesp.h&quot;&amp;#010;" >
        <header>
@@ -7575,52 +7575,52 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="473" tag="operation_473" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="473" tag="operation_473" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="474" tag="operation_474" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="474" tag="operation_474" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="476" tag="operation_476" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="476" tag="operation_476" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="478" tag="operation_478" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="478" tag="operation_478" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="480" tag="operation_480" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="480" tag="operation_480" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -7632,36 +7632,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilecacheinterface.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:47:01&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="482" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="482" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="482" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="482" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -7669,7 +7669,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="481" tqparent_class="481" fileExt=".cpp" fileName="kistile" >
+    <classifiercodedocument writeOutCode="true" package="" id="481" parent_class="481" fileExt=".cpp" fileName="kistile" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;drawinghints.h&quot;&amp;#010;" >
        <header>
@@ -7687,332 +7687,332 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="483" tag="hblock_tag_0" canDelete="false" classfield_id="483" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="483" tag="hblock_tag_0" canDelete="false" classfield_id="483" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="483" tag="hblock_tag_1" canDelete="false" classfield_id="483" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="483" tag="hblock_tag_1" canDelete="false" classfield_id="483" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="484" tag="hblock_tag_2" canDelete="false" classfield_id="484" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="484" tag="hblock_tag_2" canDelete="false" classfield_id="484" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="484" tag="hblock_tag_3" canDelete="false" classfield_id="484" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="484" tag="hblock_tag_3" canDelete="false" classfield_id="484" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="485" tag="hblock_tag_4" canDelete="false" classfield_id="485" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="485" tag="hblock_tag_4" canDelete="false" classfield_id="485" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="485" tag="hblock_tag_5" canDelete="false" classfield_id="485" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="485" tag="hblock_tag_5" canDelete="false" classfield_id="485" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="486" tag="hblock_tag_6" canDelete="false" classfield_id="486" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="486" tag="hblock_tag_6" canDelete="false" classfield_id="486" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="486" tag="hblock_tag_7" canDelete="false" classfield_id="486" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="486" tag="hblock_tag_7" canDelete="false" classfield_id="486" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="487" tag="hblock_tag_8" canDelete="false" classfield_id="487" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="487" tag="hblock_tag_8" canDelete="false" classfield_id="487" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="487" tag="hblock_tag_9" canDelete="false" classfield_id="487" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="487" tag="hblock_tag_9" canDelete="false" classfield_id="487" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="488" tag="hblock_tag_10" canDelete="false" classfield_id="488" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="488" tag="hblock_tag_10" canDelete="false" classfield_id="488" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="488" tag="hblock_tag_11" canDelete="false" classfield_id="488" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="488" tag="hblock_tag_11" canDelete="false" classfield_id="488" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="489" tag="hblock_tag_12" canDelete="false" classfield_id="489" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="489" tag="hblock_tag_12" canDelete="false" classfield_id="489" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="489" tag="hblock_tag_13" canDelete="false" classfield_id="489" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="489" tag="hblock_tag_13" canDelete="false" classfield_id="489" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="490" tag="hblock_tag_14" canDelete="false" classfield_id="490" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="490" tag="hblock_tag_14" canDelete="false" classfield_id="490" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="490" tag="hblock_tag_15" canDelete="false" classfield_id="490" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="490" tag="hblock_tag_15" canDelete="false" classfield_id="490" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="491" tag="hblock_tag_16" canDelete="false" classfield_id="491" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="491" tag="hblock_tag_16" canDelete="false" classfield_id="491" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="491" tag="hblock_tag_17" canDelete="false" classfield_id="491" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="491" tag="hblock_tag_17" canDelete="false" classfield_id="491" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="493" tag="hblock_tag_18" canDelete="false" classfield_id="493" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="493" tag="hblock_tag_18" canDelete="false" classfield_id="493" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="493" tag="hblock_tag_19" canDelete="false" classfield_id="493" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="493" tag="hblock_tag_19" canDelete="false" classfield_id="493" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="494" tag="hblock_tag_20" canDelete="false" classfield_id="494" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="494" tag="hblock_tag_20" canDelete="false" classfield_id="494" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="494" tag="hblock_tag_21" canDelete="false" classfield_id="494" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="494" tag="hblock_tag_21" canDelete="false" classfield_id="494" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="495" tag="hblock_tag_22" canDelete="false" classfield_id="495" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="495" tag="hblock_tag_22" canDelete="false" classfield_id="495" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="495" tag="hblock_tag_23" canDelete="false" classfield_id="495" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="495" tag="hblock_tag_23" canDelete="false" classfield_id="495" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_24" canDelete="false" classfield_id="482" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_24" canDelete="false" classfield_id="482" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_25" canDelete="false" classfield_id="482" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_25" canDelete="false" classfield_id="482" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_29" canDelete="false" classfield_id="492" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_29" canDelete="false" classfield_id="492" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_30" canDelete="false" classfield_id="492" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_30" canDelete="false" classfield_id="492" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_33" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_33" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="496" tag="operation_496" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="496" tag="operation_496" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="498" tag="operation_498" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="498" tag="operation_498" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="500" tag="operation_500" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="500" tag="operation_500" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="504" tag="operation_504" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="504" tag="operation_504" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="505" tag="operation_505" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="505" tag="operation_505" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="508" tag="operation_508" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="508" tag="operation_508" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="509" tag="operation_509" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="509" tag="operation_509" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="510" tag="operation_510" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="510" tag="operation_510" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="512" tag="operation_512" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="512" tag="operation_512" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="514" tag="operation_514" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="514" tag="operation_514" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="515" tag="operation_515" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="515" tag="operation_515" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="517" tag="operation_517" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="517" tag="operation_517" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="521" tag="operation_521" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="521" tag="operation_521" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="522" tag="operation_522" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="522" tag="operation_522" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="523" tag="operation_523" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="523" tag="operation_523" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="524" tag="operation_524" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="524" tag="operation_524" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="525" tag="operation_525" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="525" tag="operation_525" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="526" tag="operation_526" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="526" tag="operation_526" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="527" tag="operation_527" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="527" tag="operation_527" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="528" tag="operation_528" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="528" tag="operation_528" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="530" tag="operation_530" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="530" tag="operation_530" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="533" tag="operation_533" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="533" tag="operation_533" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="534" tag="operation_534" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="534" tag="operation_534" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="535" tag="operation_535" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="535" tag="operation_535" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="536" tag="operation_536" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="536" tag="operation_536" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="537" tag="operation_537" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="537" tag="operation_537" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="538" tag="operation_538" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="538" tag="operation_538" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="540" tag="operation_540" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="540" tag="operation_540" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="541" tag="operation_541" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="541" tag="operation_541" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="543" tag="operation_543" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="543" tag="operation_543" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="544" tag="operation_544" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="544" tag="operation_544" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="545" tag="operation_545" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="545" tag="operation_545" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -8024,311 +8024,311 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistile.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:47:10&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="483" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="483" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="483" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="483" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="483" tag="hblock_tag_0" canDelete="false" classfield_id="483" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="483" tag="hblock_tag_0" canDelete="false" classfield_id="483" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="483" tag="hblock_tag_1" canDelete="false" classfield_id="483" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="483" tag="hblock_tag_1" canDelete="false" classfield_id="483" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="484" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="484" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="484" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="484" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="484" tag="hblock_tag_2" canDelete="false" classfield_id="484" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="484" tag="hblock_tag_2" canDelete="false" classfield_id="484" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="484" tag="hblock_tag_3" canDelete="false" classfield_id="484" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="484" tag="hblock_tag_3" canDelete="false" classfield_id="484" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="485" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="485" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="485" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="485" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="485" tag="hblock_tag_4" canDelete="false" classfield_id="485" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="485" tag="hblock_tag_4" canDelete="false" classfield_id="485" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="485" tag="hblock_tag_5" canDelete="false" classfield_id="485" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="485" tag="hblock_tag_5" canDelete="false" classfield_id="485" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="486" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="486" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="486" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="486" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="486" tag="hblock_tag_6" canDelete="false" classfield_id="486" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="486" tag="hblock_tag_6" canDelete="false" classfield_id="486" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="486" tag="hblock_tag_7" canDelete="false" classfield_id="486" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="486" tag="hblock_tag_7" canDelete="false" classfield_id="486" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="487" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="487" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="487" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="487" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="487" tag="hblock_tag_8" canDelete="false" classfield_id="487" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="487" tag="hblock_tag_8" canDelete="false" classfield_id="487" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="487" tag="hblock_tag_9" canDelete="false" classfield_id="487" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="487" tag="hblock_tag_9" canDelete="false" classfield_id="487" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="488" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="488" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="488" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="488" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="488" tag="hblock_tag_10" canDelete="false" classfield_id="488" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="488" tag="hblock_tag_10" canDelete="false" classfield_id="488" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="488" tag="hblock_tag_11" canDelete="false" classfield_id="488" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="488" tag="hblock_tag_11" canDelete="false" classfield_id="488" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="489" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="489" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="489" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="489" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="489" tag="hblock_tag_12" canDelete="false" classfield_id="489" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="489" tag="hblock_tag_12" canDelete="false" classfield_id="489" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="489" tag="hblock_tag_13" canDelete="false" classfield_id="489" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="489" tag="hblock_tag_13" canDelete="false" classfield_id="489" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="490" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="490" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="490" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="490" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="490" tag="hblock_tag_14" canDelete="false" classfield_id="490" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="490" tag="hblock_tag_14" canDelete="false" classfield_id="490" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="490" tag="hblock_tag_15" canDelete="false" classfield_id="490" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="490" tag="hblock_tag_15" canDelete="false" classfield_id="490" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="491" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="491" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="491" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="491" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="491" tag="hblock_tag_16" canDelete="false" classfield_id="491" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="491" tag="hblock_tag_16" canDelete="false" classfield_id="491" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="491" tag="hblock_tag_17" canDelete="false" classfield_id="491" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="491" tag="hblock_tag_17" canDelete="false" classfield_id="491" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="493" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="493" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="493" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="493" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="493" tag="hblock_tag_18" canDelete="false" classfield_id="493" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="493" tag="hblock_tag_18" canDelete="false" classfield_id="493" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="493" tag="hblock_tag_19" canDelete="false" classfield_id="493" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="493" tag="hblock_tag_19" canDelete="false" classfield_id="493" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="494" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="494" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="494" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="494" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="494" tag="hblock_tag_20" canDelete="false" classfield_id="494" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="494" tag="hblock_tag_20" canDelete="false" classfield_id="494" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="494" tag="hblock_tag_21" canDelete="false" classfield_id="494" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="494" tag="hblock_tag_21" canDelete="false" classfield_id="494" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="495" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="495" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="495" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="495" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="495" tag="hblock_tag_22" canDelete="false" classfield_id="495" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="495" tag="hblock_tag_22" canDelete="false" classfield_id="495" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="495" tag="hblock_tag_23" canDelete="false" classfield_id="495" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="495" tag="hblock_tag_23" canDelete="false" classfield_id="495" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="482" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="482" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="482" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="482" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_24" canDelete="false" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_24" canDelete="false" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_25" canDelete="false" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_25" canDelete="false" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="492" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="492" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="492" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="492" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_29" canDelete="false" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_29" canDelete="false" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_30" canDelete="false" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_30" canDelete="false" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_33" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_33" canDelete="false" writeOutText="false" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -8336,7 +8336,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="546" tqparent_class="546" fileExt=".cpp" fileName="drawinghints" >
+    <classifiercodedocument writeOutCode="true" package="" id="546" parent_class="546" fileExt=".cpp" fileName="drawinghints" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -8361,7 +8361,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="560" tqparent_class="560" fileExt=".cpp" fileName="kismerge" >
+    <classifiercodedocument writeOutCode="true" package="" id="560" parent_class="560" fileExt=".cpp" fileName="kismerge" >
      <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;kispaintdevicesp.h&quot;&amp;#010;#include &quot;kisselectionsp.h&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;" >
        <header>
@@ -8379,72 +8379,72 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="561" tag="hblock_tag_0" canDelete="false" classfield_id="561" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="561" tag="hblock_tag_0" canDelete="false" classfield_id="561" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="561" tag="hblock_tag_1" canDelete="false" classfield_id="561" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="561" tag="hblock_tag_1" canDelete="false" classfield_id="561" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="562" tag="hblock_tag_2" canDelete="false" classfield_id="562" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="562" tag="hblock_tag_2" canDelete="false" classfield_id="562" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="562" tag="hblock_tag_3" canDelete="false" classfield_id="562" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="562" tag="hblock_tag_3" canDelete="false" classfield_id="562" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="563" tag="hblock_tag_4" canDelete="false" classfield_id="563" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="563" tag="hblock_tag_4" canDelete="false" classfield_id="563" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="563" tag="hblock_tag_5" canDelete="false" classfield_id="563" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="563" tag="hblock_tag_5" canDelete="false" classfield_id="563" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="564" tag="hblock_tag_6" canDelete="false" classfield_id="564" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="564" tag="hblock_tag_6" canDelete="false" classfield_id="564" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="564" tag="hblock_tag_7" canDelete="false" classfield_id="564" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="564" tag="hblock_tag_7" canDelete="false" classfield_id="564" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="565" tag="operation_565" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="565" tag="operation_565" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="568" tag="operation_568" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="568" tag="operation_568" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="571" tag="operation_571" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="571" tag="operation_571" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="574" tag="operation_574" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="574" tag="operation_574" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="577" tag="operation_577" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="577" tag="operation_577" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="580" tag="operation_580" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="580" tag="operation_580" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -8456,81 +8456,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kismerge.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="561" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="561" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="561" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="561" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="561" tag="hblock_tag_0" canDelete="false" classfield_id="561" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="561" tag="hblock_tag_0" canDelete="false" classfield_id="561" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="561" tag="hblock_tag_1" canDelete="false" classfield_id="561" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="561" tag="hblock_tag_1" canDelete="false" classfield_id="561" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="562" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="562" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="562" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="562" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="562" tag="hblock_tag_2" canDelete="false" classfield_id="562" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="562" tag="hblock_tag_2" canDelete="false" classfield_id="562" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="562" tag="hblock_tag_3" canDelete="false" classfield_id="562" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="562" tag="hblock_tag_3" canDelete="false" classfield_id="562" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="563" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="563" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="563" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="563" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="563" tag="hblock_tag_4" canDelete="false" classfield_id="563" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="563" tag="hblock_tag_4" canDelete="false" classfield_id="563" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="563" tag="hblock_tag_5" canDelete="false" classfield_id="563" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="563" tag="hblock_tag_5" canDelete="false" classfield_id="563" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="564" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="564" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="564" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="564" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="564" tag="hblock_tag_6" canDelete="false" classfield_id="564" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="564" tag="hblock_tag_6" canDelete="false" classfield_id="564" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="564" tag="hblock_tag_7" canDelete="false" classfield_id="564" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="564" tag="hblock_tag_7" canDelete="false" classfield_id="564" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -8538,7 +8538,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="583" tqparent_class="583" fileExt=".cpp" fileName="kisflatten" >
+    <classifiercodedocument writeOutCode="true" package="" id="583" parent_class="583" fileExt=".cpp" fileName="kisflatten" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;#include &quot;kispaintdevicesp.h&quot;&amp;#010;#include &quot;kisselectionsp.h&quot;&amp;#010;" >
        <header>
@@ -8556,67 +8556,67 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="584" tag="hblock_tag_0" canDelete="false" classfield_id="584" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="584" tag="hblock_tag_0" canDelete="false" classfield_id="584" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="584" tag="hblock_tag_1" canDelete="false" classfield_id="584" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="584" tag="hblock_tag_1" canDelete="false" classfield_id="584" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="585" tag="hblock_tag_2" canDelete="false" classfield_id="585" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="585" tag="hblock_tag_2" canDelete="false" classfield_id="585" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="585" tag="hblock_tag_3" canDelete="false" classfield_id="585" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="585" tag="hblock_tag_3" canDelete="false" classfield_id="585" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="586" tag="operation_586" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="586" tag="operation_586" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="588" tag="operation_588" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="588" tag="operation_588" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="593" tag="operation_593" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="593" tag="operation_593" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="596" tag="operation_596" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="596" tag="operation_596" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="599" tag="operation_599" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="599" tag="operation_599" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="603" tag="operation_603" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="603" tag="operation_603" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="606" tag="operation_606" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="606" tag="operation_606" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="609" tag="operation_609" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="609" tag="operation_609" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="612" tag="operation_612" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="612" tag="operation_612" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -8628,41 +8628,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisflatten.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="584" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="584" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="584" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="584" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="584" tag="hblock_tag_0" canDelete="false" classfield_id="584" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="584" tag="hblock_tag_0" canDelete="false" classfield_id="584" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="584" tag="hblock_tag_1" canDelete="false" classfield_id="584" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="584" tag="hblock_tag_1" canDelete="false" classfield_id="584" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="585" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="585" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="585" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="585" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="585" tag="hblock_tag_2" canDelete="false" classfield_id="585" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="585" tag="hblock_tag_2" canDelete="false" classfield_id="585" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="585" tag="hblock_tag_3" canDelete="false" classfield_id="585" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="585" tag="hblock_tag_3" canDelete="false" classfield_id="585" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -8670,7 +8670,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="613" tqparent_class="613" fileExt=".cpp" fileName="kisdociface" >
+    <classifiercodedocument writeOutCode="true" package="" id="613" parent_class="613" fileExt=".cpp" fileName="kisdociface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;int.h&quot;&amp;#010;" >
        <header>
@@ -8688,37 +8688,37 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="614" tag="hblock_tag_0" canDelete="false" classfield_id="614" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="614" tag="hblock_tag_0" canDelete="false" classfield_id="614" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="614" tag="hblock_tag_1" canDelete="false" classfield_id="614" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="614" tag="hblock_tag_1" canDelete="false" classfield_id="614" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="615" tag="operation_615" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="615" tag="operation_615" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="616" tag="operation_616" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="616" tag="operation_616" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="619" tag="operation_619" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="619" tag="operation_619" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="621" tag="operation_621" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="621" tag="operation_621" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="623" tag="operation_623" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="623" tag="operation_623" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -8730,21 +8730,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisdociface.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:49:51&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="614" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="614" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="614" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="614" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="614" tag="hblock_tag_0" canDelete="false" classfield_id="614" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="614" tag="hblock_tag_0" canDelete="false" classfield_id="614" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="614" tag="hblock_tag_1" canDelete="false" classfield_id="614" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="614" tag="hblock_tag_1" canDelete="false" classfield_id="614" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -8752,7 +8752,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="624" tqparent_class="624" fileExt=".cpp" fileName="kisalphatqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="624" parent_class="624" fileExt=".cpp" fileName="kisalphatqmask" >
      <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>
@@ -8770,87 +8770,87 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="625" tag="hblock_tag_0" canDelete="false" classfield_id="625" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="625" tag="hblock_tag_0" canDelete="false" classfield_id="625" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="625" tag="hblock_tag_1" canDelete="false" classfield_id="625" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="625" tag="hblock_tag_1" canDelete="false" classfield_id="625" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="626" tag="hblock_tag_2" canDelete="false" classfield_id="626" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="626" tag="hblock_tag_2" canDelete="false" classfield_id="626" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="626" tag="hblock_tag_3" canDelete="false" classfield_id="626" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="626" tag="hblock_tag_3" canDelete="false" classfield_id="626" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="627" tag="hblock_tag_4" canDelete="false" classfield_id="627" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="627" tag="hblock_tag_4" canDelete="false" classfield_id="627" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="627" tag="hblock_tag_5" canDelete="false" classfield_id="627" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="627" tag="hblock_tag_5" canDelete="false" classfield_id="627" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="628" tag="hblock_tag_6" canDelete="false" classfield_id="628" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="628" tag="hblock_tag_6" canDelete="false" classfield_id="628" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="628" tag="hblock_tag_7" canDelete="false" classfield_id="628" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="628" tag="hblock_tag_7" canDelete="false" classfield_id="628" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="629" tag="operation_629" canDelete="false" role_id="-1" >
+        <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." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="631" tag="operation_631" canDelete="false" role_id="-1" >
+        <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." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="634" tag="operation_634" canDelete="false" role_id="-1" >
+        <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 tqmasking.&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 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." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="637" tag="operation_637" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="637" tag="operation_637" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="639" tag="operation_639" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="639" tag="operation_639" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="641" tag="operation_641" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="641" tag="operation_641" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="@return the number of alpha values in a scanline." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="642" tag="operation_642" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="642" tag="operation_642" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="@return the scale factor." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="643" tag="operation_643" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="643" tag="operation_643" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="@return the number of lines in the tqmask." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="644" tag="operation_644" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="644" tag="operation_644" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -8862,81 +8862,81 @@ in the constructor, you have to call loadAsync.
       <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;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="625" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="625" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="625" tag="hblock_tag_0" canDelete="false" classfield_id="625" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="625" tag="hblock_tag_0" canDelete="false" classfield_id="625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="625" tag="hblock_tag_1" canDelete="false" classfield_id="625" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="625" tag="hblock_tag_1" canDelete="false" classfield_id="625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="626" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="626" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="626" tag="hblock_tag_2" canDelete="false" classfield_id="626" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="626" tag="hblock_tag_2" canDelete="false" classfield_id="626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="626" tag="hblock_tag_3" canDelete="false" classfield_id="626" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="626" tag="hblock_tag_3" canDelete="false" classfield_id="626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="627" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="627" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="627" tag="hblock_tag_4" canDelete="false" classfield_id="627" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="627" tag="hblock_tag_4" canDelete="false" classfield_id="627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="627" tag="hblock_tag_5" canDelete="false" classfield_id="627" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="627" tag="hblock_tag_5" canDelete="false" classfield_id="627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="628" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="628" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="628" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="628" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="628" tag="hblock_tag_6" canDelete="false" classfield_id="628" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="628" tag="hblock_tag_6" canDelete="false" classfield_id="628" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="628" tag="hblock_tag_7" canDelete="false" classfield_id="628" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="628" tag="hblock_tag_7" canDelete="false" classfield_id="628" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -8944,7 +8944,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="645" tqparent_class="645" fileExt=".cpp" fileName="krayonviewiface" >
+    <classifiercodedocument writeOutCode="true" package="" id="645" parent_class="645" fileExt=".cpp" fileName="krayonviewiface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -8962,122 +8962,122 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="646" tag="hblock_tag_0" canDelete="false" classfield_id="646" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="646" tag="hblock_tag_0" canDelete="false" classfield_id="646" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="646" tag="hblock_tag_1" canDelete="false" classfield_id="646" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="646" tag="hblock_tag_1" canDelete="false" classfield_id="646" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="647" tag="operation_647" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="647" tag="operation_647" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="649" tag="operation_649" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="649" tag="operation_649" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="650" tag="operation_650" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="650" tag="operation_650" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="651" tag="operation_651" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="651" tag="operation_651" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="652" tag="operation_652" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="652" tag="operation_652" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="653" tag="operation_653" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="653" tag="operation_653" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="654" tag="operation_654" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="654" tag="operation_654" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="655" tag="operation_655" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="655" tag="operation_655" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="656" tag="operation_656" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="656" tag="operation_656" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="657" tag="operation_657" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="657" tag="operation_657" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="658" tag="operation_658" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="658" tag="operation_658" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="659" tag="operation_659" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="659" tag="operation_659" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="660" tag="operation_660" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="660" tag="operation_660" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="661" tag="operation_661" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="661" tag="operation_661" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="662" tag="operation_662" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="662" tag="operation_662" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="663" tag="operation_663" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="663" tag="operation_663" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="664" tag="operation_664" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="664" tag="operation_664" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="665" tag="operation_665" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="665" tag="operation_665" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="666" tag="operation_666" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="666" tag="operation_666" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="667" tag="operation_667" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="667" tag="operation_667" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="668" tag="operation_668" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="668" tag="operation_668" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="669" tag="operation_669" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="669" tag="operation_669" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -9089,21 +9089,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			krayonviewiface.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="646" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="646" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="646" tag="hblock_tag_0" canDelete="false" classfield_id="646" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="646" tag="hblock_tag_0" canDelete="false" classfield_id="646" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="646" tag="hblock_tag_1" canDelete="false" classfield_id="646" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="646" tag="hblock_tag_1" canDelete="false" classfield_id="646" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -9111,7 +9111,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="670" tqparent_class="670" fileExt=".cpp" fileName="kisimageiface" >
+    <classifiercodedocument writeOutCode="true" package="" id="670" parent_class="670" fileExt=".cpp" fileName="kisimageiface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;int.h&quot;&amp;#010;" >
        <header>
@@ -9129,47 +9129,47 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="671" tag="hblock_tag_0" canDelete="false" classfield_id="671" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="671" tag="hblock_tag_0" canDelete="false" classfield_id="671" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="671" tag="hblock_tag_1" canDelete="false" classfield_id="671" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="671" tag="hblock_tag_1" canDelete="false" classfield_id="671" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="672" tag="operation_672" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="672" tag="operation_672" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="674" tag="operation_674" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="674" tag="operation_674" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="675" tag="operation_675" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="675" tag="operation_675" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="676" tag="operation_676" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="676" tag="operation_676" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="677" tag="operation_677" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="677" tag="operation_677" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="678" tag="operation_678" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="678" tag="operation_678" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="680" tag="operation_680" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="680" tag="operation_680" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -9181,21 +9181,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimageiface.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:49:42&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="671" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="671" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="671" tag="hblock_tag_0" canDelete="false" classfield_id="671" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="671" tag="hblock_tag_0" canDelete="false" classfield_id="671" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="671" tag="hblock_tag_1" canDelete="false" classfield_id="671" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="671" tag="hblock_tag_1" canDelete="false" classfield_id="671" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -9203,7 +9203,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="681" tqparent_class="681" fileExt=".cpp" fileName="kisbrush" >
+    <classifiercodedocument writeOutCode="true" package="" id="681" parent_class="681" fileExt=".cpp" fileName="kisbrush" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisresource.h&quot;&amp;#010;#include &quot;enumbrushtype.h&quot;&amp;#010;" >
        <header>
@@ -9221,217 +9221,217 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="682" tag="hblock_tag_0" canDelete="false" classfield_id="682" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="682" tag="hblock_tag_0" canDelete="false" classfield_id="682" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="682" tag="hblock_tag_1" canDelete="false" classfield_id="682" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="682" tag="hblock_tag_1" canDelete="false" classfield_id="682" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="683" tag="hblock_tag_2" canDelete="false" classfield_id="683" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="683" tag="hblock_tag_2" canDelete="false" classfield_id="683" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="683" tag="hblock_tag_3" canDelete="false" classfield_id="683" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="683" tag="hblock_tag_3" canDelete="false" classfield_id="683" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="684" tag="hblock_tag_4" canDelete="false" classfield_id="684" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="684" tag="hblock_tag_4" canDelete="false" classfield_id="684" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="684" tag="hblock_tag_5" canDelete="false" classfield_id="684" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="684" tag="hblock_tag_5" canDelete="false" classfield_id="684" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="685" tag="hblock_tag_6" canDelete="false" classfield_id="685" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="685" tag="hblock_tag_6" canDelete="false" classfield_id="685" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="685" tag="hblock_tag_7" canDelete="false" classfield_id="685" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="685" tag="hblock_tag_7" canDelete="false" classfield_id="685" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="686" tag="hblock_tag_8" canDelete="false" classfield_id="686" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="686" tag="hblock_tag_8" canDelete="false" classfield_id="686" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="686" tag="hblock_tag_9" canDelete="false" classfield_id="686" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="686" tag="hblock_tag_9" canDelete="false" classfield_id="686" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="687" tag="hblock_tag_10" canDelete="false" classfield_id="687" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="687" tag="hblock_tag_10" canDelete="false" classfield_id="687" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="687" tag="hblock_tag_11" canDelete="false" classfield_id="687" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="687" tag="hblock_tag_11" canDelete="false" classfield_id="687" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="688" tag="hblock_tag_12" canDelete="false" classfield_id="688" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="688" tag="hblock_tag_12" canDelete="false" classfield_id="688" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="688" tag="hblock_tag_13" canDelete="false" classfield_id="688" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="688" tag="hblock_tag_13" canDelete="false" classfield_id="688" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="689" tag="hblock_tag_14" canDelete="false" classfield_id="689" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="689" tag="hblock_tag_14" canDelete="false" classfield_id="689" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="689" tag="hblock_tag_15" canDelete="false" classfield_id="689" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="689" tag="hblock_tag_15" canDelete="false" classfield_id="689" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="690" tag="hblock_tag_16" canDelete="false" classfield_id="690" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="690" tag="hblock_tag_16" canDelete="false" classfield_id="690" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="690" tag="hblock_tag_17" canDelete="false" classfield_id="690" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="690" tag="hblock_tag_17" canDelete="false" classfield_id="690" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="691" tag="hblock_tag_18" canDelete="false" classfield_id="691" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="691" tag="hblock_tag_18" canDelete="false" classfield_id="691" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="691" tag="hblock_tag_19" canDelete="false" classfield_id="691" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="691" tag="hblock_tag_19" canDelete="false" classfield_id="691" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="692" tag="hblock_tag_20" canDelete="false" classfield_id="692" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="692" tag="hblock_tag_20" canDelete="false" classfield_id="692" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="692" tag="hblock_tag_21" canDelete="false" classfield_id="692" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="692" tag="hblock_tag_21" canDelete="false" classfield_id="692" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_29" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_29" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="693" tag="operation_693" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="693" tag="operation_693" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="695" tag="operation_695" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="695" tag="operation_695" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="699" tag="operation_699" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="699" tag="operation_699" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="700" tag="operation_700" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="700" tag="operation_700" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="702" tag="operation_702" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="702" tag="operation_702" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="703" tag="operation_703" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="703" tag="operation_703" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="704" tag="operation_704" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="704" tag="operation_704" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="705" tag="operation_705" canDelete="false" role_id="-1" >
+        <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." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="707" tag="operation_707" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="707" tag="operation_707" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="708" tag="operation_708" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="708" tag="operation_708" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="710" tag="operation_710" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="710" tag="operation_710" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -9443,291 +9443,291 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisbrush.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="682" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="682" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="682" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="682" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="682" tag="hblock_tag_0" canDelete="false" classfield_id="682" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="682" tag="hblock_tag_0" canDelete="false" classfield_id="682" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="682" tag="hblock_tag_1" canDelete="false" classfield_id="682" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="682" tag="hblock_tag_1" canDelete="false" classfield_id="682" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="683" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="683" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="683" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="683" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="683" tag="hblock_tag_2" canDelete="false" classfield_id="683" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="683" tag="hblock_tag_2" canDelete="false" classfield_id="683" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="683" tag="hblock_tag_3" canDelete="false" classfield_id="683" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="683" tag="hblock_tag_3" canDelete="false" classfield_id="683" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="684" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="684" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="684" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="684" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="684" tag="hblock_tag_4" canDelete="false" classfield_id="684" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="684" tag="hblock_tag_4" canDelete="false" classfield_id="684" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="684" tag="hblock_tag_5" canDelete="false" classfield_id="684" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="684" tag="hblock_tag_5" canDelete="false" classfield_id="684" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="685" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="685" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="685" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="685" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="685" tag="hblock_tag_6" canDelete="false" classfield_id="685" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="685" tag="hblock_tag_6" canDelete="false" classfield_id="685" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="685" tag="hblock_tag_7" canDelete="false" classfield_id="685" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="685" tag="hblock_tag_7" canDelete="false" classfield_id="685" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="686" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="686" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="686" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="686" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="686" tag="hblock_tag_8" canDelete="false" classfield_id="686" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="686" tag="hblock_tag_8" canDelete="false" classfield_id="686" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="686" tag="hblock_tag_9" canDelete="false" classfield_id="686" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="686" tag="hblock_tag_9" canDelete="false" classfield_id="686" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="687" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="687" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="687" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="687" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="687" tag="hblock_tag_10" canDelete="false" classfield_id="687" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="687" tag="hblock_tag_10" canDelete="false" classfield_id="687" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="687" tag="hblock_tag_11" canDelete="false" classfield_id="687" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="687" tag="hblock_tag_11" canDelete="false" classfield_id="687" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="688" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="688" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="688" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="688" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="688" tag="hblock_tag_12" canDelete="false" classfield_id="688" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="688" tag="hblock_tag_12" canDelete="false" classfield_id="688" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="688" tag="hblock_tag_13" canDelete="false" classfield_id="688" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="688" tag="hblock_tag_13" canDelete="false" classfield_id="688" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="689" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="689" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="689" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="689" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="689" tag="hblock_tag_14" canDelete="false" classfield_id="689" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="689" tag="hblock_tag_14" canDelete="false" classfield_id="689" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="689" tag="hblock_tag_15" canDelete="false" classfield_id="689" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="689" tag="hblock_tag_15" canDelete="false" classfield_id="689" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="690" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="690" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="690" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="690" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="690" tag="hblock_tag_16" canDelete="false" classfield_id="690" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="690" tag="hblock_tag_16" canDelete="false" classfield_id="690" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="690" tag="hblock_tag_17" canDelete="false" classfield_id="690" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="690" tag="hblock_tag_17" canDelete="false" classfield_id="690" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="691" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="691" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="691" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="691" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="691" tag="hblock_tag_18" canDelete="false" classfield_id="691" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="691" tag="hblock_tag_18" canDelete="false" classfield_id="691" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="691" tag="hblock_tag_19" canDelete="false" classfield_id="691" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="691" tag="hblock_tag_19" canDelete="false" classfield_id="691" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="692" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="692" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="692" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="692" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="692" tag="hblock_tag_20" canDelete="false" classfield_id="692" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="692" tag="hblock_tag_20" canDelete="false" classfield_id="692" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="692" tag="hblock_tag_21" canDelete="false" classfield_id="692" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="692" tag="hblock_tag_21" canDelete="false" classfield_id="692" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1769" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1769" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1769" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1769" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2368" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2368" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2368" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2368" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_27" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_28" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_29" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_29" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -9735,7 +9735,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="711" tqparent_class="711" fileExt=".cpp" fileName="kisbackground" >
+    <classifiercodedocument writeOutCode="true" package="" id="711" parent_class="711" fileExt=".cpp" fileName="kisbackground" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;" >
        <header>
@@ -9753,17 +9753,17 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="712" tag="operation_712" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="712" tag="operation_712" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="716" tag="operation_716" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="716" tag="operation_716" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="719" tag="operation_719" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="719" tag="operation_719" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -9776,7 +9776,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="720" tqparent_class="720" fileExt=".cpp" fileName="enumbrushtype" >
+    <classifiercodedocument writeOutCode="true" package="" id="720" parent_class="720" fileExt=".cpp" fileName="enumbrushtype" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -9794,27 +9794,27 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -9826,36 +9826,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			enumbrushtype.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1742" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1742" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1742" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1742" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -9863,7 +9863,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="727" tqparent_class="727" fileExt=".cpp" fileName="kiscommand" >
+    <classifiercodedocument writeOutCode="true" package="" id="727" parent_class="727" fileExt=".cpp" fileName="kiscommand" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -9881,57 +9881,57 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="728" tag="hblock_tag_0" canDelete="false" classfield_id="728" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="728" tag="hblock_tag_0" canDelete="false" classfield_id="728" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="728" tag="hblock_tag_1" canDelete="false" classfield_id="728" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="728" tag="hblock_tag_1" canDelete="false" classfield_id="728" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="729" tag="hblock_tag_2" canDelete="false" classfield_id="729" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="729" tag="hblock_tag_2" canDelete="false" classfield_id="729" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="729" tag="hblock_tag_3" canDelete="false" classfield_id="729" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="729" tag="hblock_tag_3" canDelete="false" classfield_id="729" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="730" tag="operation_730" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="730" tag="operation_730" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="732" tag="operation_732" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="732" tag="operation_732" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="735" tag="operation_735" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="735" tag="operation_735" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="736" tag="operation_736" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="736" tag="operation_736" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="737" tag="operation_737" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="737" tag="operation_737" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="738" tag="operation_738" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="738" tag="operation_738" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="739" tag="operation_739" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="739" tag="operation_739" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -9943,41 +9943,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kiscommand.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="728" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="728" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="728" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="728" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="728" tag="hblock_tag_0" canDelete="false" classfield_id="728" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="728" tag="hblock_tag_0" canDelete="false" classfield_id="728" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="728" tag="hblock_tag_1" canDelete="false" classfield_id="728" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="728" tag="hblock_tag_1" canDelete="false" classfield_id="728" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="729" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="729" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="729" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="729" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="729" tag="hblock_tag_2" canDelete="false" classfield_id="729" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="729" tag="hblock_tag_2" canDelete="false" classfield_id="729" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="729" tag="hblock_tag_3" canDelete="false" classfield_id="729" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="729" tag="hblock_tag_3" canDelete="false" classfield_id="729" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -9985,7 +9985,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="740" tqparent_class="740" fileExt=".cpp" fileName="kisguide" >
+    <classifiercodedocument writeOutCode="true" package="" id="740" parent_class="740" fileExt=".cpp" fileName="kisguide" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;double.h&quot;&amp;#010;" >
        <header>
@@ -10003,62 +10003,62 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="741" tag="hblock_tag_0" canDelete="false" classfield_id="741" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="741" tag="hblock_tag_0" canDelete="false" classfield_id="741" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="741" tag="hblock_tag_1" canDelete="false" classfield_id="741" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="741" tag="hblock_tag_1" canDelete="false" classfield_id="741" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="742" tag="hblock_tag_2" canDelete="false" classfield_id="742" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="742" tag="hblock_tag_2" canDelete="false" classfield_id="742" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="742" tag="hblock_tag_3" canDelete="false" classfield_id="742" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="742" tag="hblock_tag_3" canDelete="false" classfield_id="742" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="743" tag="hblock_tag_4" canDelete="false" classfield_id="743" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="743" tag="hblock_tag_4" canDelete="false" classfield_id="743" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="743" tag="hblock_tag_5" canDelete="false" classfield_id="743" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="743" tag="hblock_tag_5" canDelete="false" classfield_id="743" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="744" tag="hblock_tag_6" canDelete="false" classfield_id="744" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="744" tag="hblock_tag_6" canDelete="false" classfield_id="744" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="744" tag="hblock_tag_7" canDelete="false" classfield_id="744" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="744" tag="hblock_tag_7" canDelete="false" classfield_id="744" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="745" tag="operation_745" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="745" tag="operation_745" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="747" tag="operation_747" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="747" tag="operation_747" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="748" tag="operation_748" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="748" tag="operation_748" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="749" tag="operation_749" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="749" tag="operation_749" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -10070,81 +10070,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisguide.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="741" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="741" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="741" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="741" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="741" tag="hblock_tag_0" canDelete="false" classfield_id="741" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="741" tag="hblock_tag_0" canDelete="false" classfield_id="741" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="741" tag="hblock_tag_1" canDelete="false" classfield_id="741" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="741" tag="hblock_tag_1" canDelete="false" classfield_id="741" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="742" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="742" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="742" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="742" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="742" tag="hblock_tag_2" canDelete="false" classfield_id="742" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="742" tag="hblock_tag_2" canDelete="false" classfield_id="742" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="742" tag="hblock_tag_3" canDelete="false" classfield_id="742" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="742" tag="hblock_tag_3" canDelete="false" classfield_id="742" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="743" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="743" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="743" tag="hblock_tag_4" canDelete="false" classfield_id="743" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="743" tag="hblock_tag_4" canDelete="false" classfield_id="743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="743" tag="hblock_tag_5" canDelete="false" classfield_id="743" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="743" tag="hblock_tag_5" canDelete="false" classfield_id="743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="744" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="744" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="744" tag="hblock_tag_6" canDelete="false" classfield_id="744" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="744" tag="hblock_tag_6" canDelete="false" classfield_id="744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="744" tag="hblock_tag_7" canDelete="false" classfield_id="744" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="744" tag="hblock_tag_7" canDelete="false" classfield_id="744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -10152,7 +10152,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="750" tqparent_class="750" fileExt=".cpp" fileName="kiscanvascontrollerinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="750" parent_class="750" fileExt=".cpp" fileName="kiscanvascontrollerinterface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -10170,102 +10170,102 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="751" tag="operation_751" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="751" tag="operation_751" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="753" tag="operation_753" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="753" tag="operation_753" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="754" tag="operation_754" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="754" tag="operation_754" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="756" tag="operation_756" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="756" tag="operation_756" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="757" tag="operation_757" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="757" tag="operation_757" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="758" tag="operation_758" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="758" tag="operation_758" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="759" tag="operation_759" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="759" tag="operation_759" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="764" tag="operation_764" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="764" tag="operation_764" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="766" tag="operation_766" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="766" tag="operation_766" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="767" tag="operation_767" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="767" tag="operation_767" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="770" tag="operation_770" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="770" tag="operation_770" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="772" tag="operation_772" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="772" tag="operation_772" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="774" tag="operation_774" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="774" tag="operation_774" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="777" tag="operation_777" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="777" tag="operation_777" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="779" tag="operation_779" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="779" tag="operation_779" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="781" tag="operation_781" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="781" tag="operation_781" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="782" tag="operation_782" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="782" tag="operation_782" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="785" tag="operation_785" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="785" tag="operation_785" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="786" tag="operation_786" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="786" tag="operation_786" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="789" tag="operation_789" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="789" tag="operation_789" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -10278,7 +10278,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="790" tqparent_class="790" fileExt=".cpp" fileName="kisguidemgr" >
+    <classifiercodedocument writeOutCode="true" package="" id="790" parent_class="790" fileExt=".cpp" fileName="kisguidemgr" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisguidesp.h&quot;&amp;#010;#include &quot;double.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;vkisguidesp.h&quot;&amp;#010;" >
        <header>
@@ -10296,252 +10296,252 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="791" tag="hblock_tag_0" canDelete="false" classfield_id="791" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="791" tag="hblock_tag_0" canDelete="false" classfield_id="791" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="791" tag="hblock_tag_1" canDelete="false" classfield_id="791" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="791" tag="hblock_tag_1" canDelete="false" classfield_id="791" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="792" tag="hblock_tag_2" canDelete="false" classfield_id="792" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="792" tag="hblock_tag_2" canDelete="false" classfield_id="792" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="792" tag="hblock_tag_3" canDelete="false" classfield_id="792" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="792" tag="hblock_tag_3" canDelete="false" classfield_id="792" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="793" tag="hblock_tag_4" canDelete="false" classfield_id="793" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="793" tag="hblock_tag_4" canDelete="false" classfield_id="793" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="793" tag="hblock_tag_5" canDelete="false" classfield_id="793" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="793" tag="hblock_tag_5" canDelete="false" classfield_id="793" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="794" tag="hblock_tag_6" canDelete="false" classfield_id="794" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="794" tag="hblock_tag_6" canDelete="false" classfield_id="794" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="794" tag="hblock_tag_7" canDelete="false" classfield_id="794" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="794" tag="hblock_tag_7" canDelete="false" classfield_id="794" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="795" tag="hblock_tag_8" canDelete="false" classfield_id="795" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="795" tag="hblock_tag_8" canDelete="false" classfield_id="795" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="795" tag="hblock_tag_9" canDelete="false" classfield_id="795" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="795" tag="hblock_tag_9" canDelete="false" classfield_id="795" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="796" tag="hblock_tag_10" canDelete="false" classfield_id="796" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="796" tag="hblock_tag_10" canDelete="false" classfield_id="796" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="796" tag="hblock_tag_11" canDelete="false" classfield_id="796" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="796" tag="hblock_tag_11" canDelete="false" classfield_id="796" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="797" tag="hblock_tag_12" canDelete="false" classfield_id="797" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="797" tag="hblock_tag_12" canDelete="false" classfield_id="797" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="797" tag="hblock_tag_13" canDelete="false" classfield_id="797" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="797" tag="hblock_tag_13" canDelete="false" classfield_id="797" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="798" tag="hblock_tag_14" canDelete="false" classfield_id="798" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="798" tag="hblock_tag_14" canDelete="false" classfield_id="798" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="798" tag="hblock_tag_15" canDelete="false" classfield_id="798" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="798" tag="hblock_tag_15" canDelete="false" classfield_id="798" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="799" tag="hblock_tag_16" canDelete="false" classfield_id="799" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="799" tag="hblock_tag_16" canDelete="false" classfield_id="799" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="799" tag="hblock_tag_17" canDelete="false" classfield_id="799" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="799" tag="hblock_tag_17" canDelete="false" classfield_id="799" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="800" tag="hblock_tag_18" canDelete="false" classfield_id="800" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="800" tag="hblock_tag_18" canDelete="false" classfield_id="800" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="800" tag="hblock_tag_19" canDelete="false" classfield_id="800" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="800" tag="hblock_tag_19" canDelete="false" classfield_id="800" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="801" tag="hblock_tag_20" canDelete="false" classfield_id="801" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="801" tag="hblock_tag_20" canDelete="false" classfield_id="801" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="801" tag="hblock_tag_21" canDelete="false" classfield_id="801" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="801" tag="hblock_tag_21" canDelete="false" classfield_id="801" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="802" tag="operation_802" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="802" tag="operation_802" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="803" tag="operation_803" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="803" tag="operation_803" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="806" tag="operation_806" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="806" tag="operation_806" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="812" tag="operation_812" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="812" tag="operation_812" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="816" tag="operation_816" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="816" tag="operation_816" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="819" tag="operation_819" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="819" tag="operation_819" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="822" tag="operation_822" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="822" tag="operation_822" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="823" tag="operation_823" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="823" tag="operation_823" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="825" tag="operation_825" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="825" tag="operation_825" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="827" tag="operation_827" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="827" tag="operation_827" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="829" tag="operation_829" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="829" tag="operation_829" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="835" tag="operation_835" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="835" tag="operation_835" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="837" tag="operation_837" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="837" tag="operation_837" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="838" tag="operation_838" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="838" tag="operation_838" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="839" tag="operation_839" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="839" tag="operation_839" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="841" tag="operation_841" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="841" tag="operation_841" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="846" tag="operation_846" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="846" tag="operation_846" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="848" tag="operation_848" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="848" tag="operation_848" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="850" tag="operation_850" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="850" tag="operation_850" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="851" tag="operation_851" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="851" tag="operation_851" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="852" tag="operation_852" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="852" tag="operation_852" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="854" tag="operation_854" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="854" tag="operation_854" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="855" tag="operation_855" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="855" tag="operation_855" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -10553,256 +10553,256 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisguidemgr.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="791" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="791" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="791" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="791" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="791" tag="hblock_tag_0" canDelete="false" classfield_id="791" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="791" tag="hblock_tag_0" canDelete="false" classfield_id="791" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="791" tag="hblock_tag_1" canDelete="false" classfield_id="791" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="791" tag="hblock_tag_1" canDelete="false" classfield_id="791" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="792" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="792" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="792" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="792" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="792" tag="hblock_tag_2" canDelete="false" classfield_id="792" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="792" tag="hblock_tag_2" canDelete="false" classfield_id="792" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="792" tag="hblock_tag_3" canDelete="false" classfield_id="792" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="792" tag="hblock_tag_3" canDelete="false" classfield_id="792" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="793" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="793" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="793" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="793" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="793" tag="hblock_tag_4" canDelete="false" classfield_id="793" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="793" tag="hblock_tag_4" canDelete="false" classfield_id="793" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="793" tag="hblock_tag_5" canDelete="false" classfield_id="793" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="793" tag="hblock_tag_5" canDelete="false" classfield_id="793" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="794" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="794" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="794" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="794" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="794" tag="hblock_tag_6" canDelete="false" classfield_id="794" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="794" tag="hblock_tag_6" canDelete="false" classfield_id="794" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="794" tag="hblock_tag_7" canDelete="false" classfield_id="794" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="794" tag="hblock_tag_7" canDelete="false" classfield_id="794" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="795" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="795" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="795" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="795" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="795" tag="hblock_tag_8" canDelete="false" classfield_id="795" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="795" tag="hblock_tag_8" canDelete="false" classfield_id="795" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="795" tag="hblock_tag_9" canDelete="false" classfield_id="795" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="795" tag="hblock_tag_9" canDelete="false" classfield_id="795" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="796" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="796" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="796" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="796" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="796" tag="hblock_tag_10" canDelete="false" classfield_id="796" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="796" tag="hblock_tag_10" canDelete="false" classfield_id="796" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="796" tag="hblock_tag_11" canDelete="false" classfield_id="796" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="796" tag="hblock_tag_11" canDelete="false" classfield_id="796" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="797" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="797" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="797" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="797" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="797" tag="hblock_tag_12" canDelete="false" classfield_id="797" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="797" tag="hblock_tag_12" canDelete="false" classfield_id="797" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="797" tag="hblock_tag_13" canDelete="false" classfield_id="797" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="797" tag="hblock_tag_13" canDelete="false" classfield_id="797" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="798" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="798" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="798" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="798" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="798" tag="hblock_tag_14" canDelete="false" classfield_id="798" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="798" tag="hblock_tag_14" canDelete="false" classfield_id="798" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="798" tag="hblock_tag_15" canDelete="false" classfield_id="798" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="798" tag="hblock_tag_15" canDelete="false" classfield_id="798" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="799" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="799" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="799" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="799" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="799" tag="hblock_tag_16" canDelete="false" classfield_id="799" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="799" tag="hblock_tag_16" canDelete="false" classfield_id="799" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="799" tag="hblock_tag_17" canDelete="false" classfield_id="799" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="799" tag="hblock_tag_17" canDelete="false" classfield_id="799" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="800" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="800" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="800" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="800" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="800" tag="hblock_tag_18" canDelete="false" classfield_id="800" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="800" tag="hblock_tag_18" canDelete="false" classfield_id="800" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="800" tag="hblock_tag_19" canDelete="false" classfield_id="800" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="800" tag="hblock_tag_19" canDelete="false" classfield_id="800" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="801" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="801" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="801" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="801" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="801" tag="hblock_tag_20" canDelete="false" classfield_id="801" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="801" tag="hblock_tag_20" canDelete="false" classfield_id="801" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="801" tag="hblock_tag_21" canDelete="false" classfield_id="801" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="801" tag="hblock_tag_21" canDelete="false" classfield_id="801" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1270" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1270" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1270" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1270" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -10810,7 +10810,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="856" tqparent_class="856" fileExt=".cpp" fileName="kisgradient" >
+    <classifiercodedocument writeOutCode="true" package="" id="856" parent_class="856" fileExt=".cpp" fileName="kisgradient" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;int.h&quot;&amp;#010;" >
        <header>
@@ -10828,162 +10828,162 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="857" tag="hblock_tag_0" canDelete="false" classfield_id="857" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="857" tag="hblock_tag_0" canDelete="false" classfield_id="857" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="857" tag="hblock_tag_1" canDelete="false" classfield_id="857" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="857" tag="hblock_tag_1" canDelete="false" classfield_id="857" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="858" tag="hblock_tag_2" canDelete="false" classfield_id="858" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="858" tag="hblock_tag_2" canDelete="false" classfield_id="858" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="858" tag="hblock_tag_3" canDelete="false" classfield_id="858" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="858" tag="hblock_tag_3" canDelete="false" classfield_id="858" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="859" tag="hblock_tag_4" canDelete="false" classfield_id="859" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="859" tag="hblock_tag_4" canDelete="false" classfield_id="859" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="859" tag="hblock_tag_5" canDelete="false" classfield_id="859" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="859" tag="hblock_tag_5" canDelete="false" classfield_id="859" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_6" canDelete="false" classfield_id="860" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_6" canDelete="false" classfield_id="860" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_7" canDelete="false" classfield_id="860" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_7" canDelete="false" classfield_id="860" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="861" tag="operation_861" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="861" tag="operation_861" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="862" tag="operation_862" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="862" tag="operation_862" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="865" tag="operation_865" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="865" tag="operation_865" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="869" tag="operation_869" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="869" tag="operation_869" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="875" tag="operation_875" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="875" tag="operation_875" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="876" tag="operation_876" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="876" tag="operation_876" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="879" tag="operation_879" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="879" tag="operation_879" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="883" tag="operation_883" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="883" tag="operation_883" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="887" tag="operation_887" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="887" tag="operation_887" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="891" tag="operation_891" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="891" tag="operation_891" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="897" tag="operation_897" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="897" tag="operation_897" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="899" tag="operation_899" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="899" tag="operation_899" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="900" tag="operation_900" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="900" tag="operation_900" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="901" tag="operation_901" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="901" tag="operation_901" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -10995,151 +10995,151 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisgradient.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="857" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="857" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="857" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="857" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="857" tag="hblock_tag_0" canDelete="false" classfield_id="857" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="857" tag="hblock_tag_0" canDelete="false" classfield_id="857" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="857" tag="hblock_tag_1" canDelete="false" classfield_id="857" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="857" tag="hblock_tag_1" canDelete="false" classfield_id="857" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="858" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="858" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="858" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="858" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="858" tag="hblock_tag_2" canDelete="false" classfield_id="858" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="858" tag="hblock_tag_2" canDelete="false" classfield_id="858" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="858" tag="hblock_tag_3" canDelete="false" classfield_id="858" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="858" tag="hblock_tag_3" canDelete="false" classfield_id="858" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="859" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="859" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="859" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="859" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="859" tag="hblock_tag_4" canDelete="false" classfield_id="859" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="859" tag="hblock_tag_4" canDelete="false" classfield_id="859" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="859" tag="hblock_tag_5" canDelete="false" classfield_id="859" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="859" tag="hblock_tag_5" canDelete="false" classfield_id="859" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="860" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="860" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_6" canDelete="false" classfield_id="860" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_6" canDelete="false" classfield_id="860" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_7" canDelete="false" classfield_id="860" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_7" canDelete="false" classfield_id="860" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1776" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1776" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1776" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1776" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2385" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2385" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2385" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2385" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -11147,7 +11147,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="902" tqparent_class="902" fileExt=".cpp" fileName="kisdoc" >
+    <classifiercodedocument writeOutCode="true" package="" id="902" parent_class="902" fileExt=".cpp" fileName="kisdoc" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;kisselectionsp.h&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;#include &quot;compositeop.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;enumimgtype.h&quot;&amp;#010;#include &quot;kischannelsp.h&quot;&amp;#010;#include &quot;double.h&quot;&amp;#010;#include &quot;kisstrategycolorspacemap.h&quot;&amp;#010;#include &quot;vkisimagesp.h&quot;&amp;#010;" >
        <header>
@@ -11165,432 +11165,432 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="903" tag="hblock_tag_0" canDelete="false" classfield_id="903" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="903" tag="hblock_tag_0" canDelete="false" classfield_id="903" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="903" tag="hblock_tag_1" canDelete="false" classfield_id="903" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="903" tag="hblock_tag_1" canDelete="false" classfield_id="903" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="904" tag="hblock_tag_2" canDelete="false" classfield_id="904" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="904" tag="hblock_tag_2" canDelete="false" classfield_id="904" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="904" tag="hblock_tag_3" canDelete="false" classfield_id="904" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="904" tag="hblock_tag_3" canDelete="false" classfield_id="904" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="905" tag="hblock_tag_4" canDelete="false" classfield_id="905" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="905" tag="hblock_tag_4" canDelete="false" classfield_id="905" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="905" tag="hblock_tag_5" canDelete="false" classfield_id="905" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="905" tag="hblock_tag_5" canDelete="false" classfield_id="905" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="906" tag="hblock_tag_6" canDelete="false" classfield_id="906" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="906" tag="hblock_tag_6" canDelete="false" classfield_id="906" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="906" tag="hblock_tag_7" canDelete="false" classfield_id="906" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="906" tag="hblock_tag_7" canDelete="false" classfield_id="906" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="907" tag="hblock_tag_8" canDelete="false" classfield_id="907" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="907" tag="hblock_tag_8" canDelete="false" classfield_id="907" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="907" tag="hblock_tag_9" canDelete="false" classfield_id="907" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="907" tag="hblock_tag_9" canDelete="false" classfield_id="907" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="908" tag="hblock_tag_10" canDelete="false" classfield_id="908" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="908" tag="hblock_tag_10" canDelete="false" classfield_id="908" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="908" tag="hblock_tag_11" canDelete="false" classfield_id="908" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="908" tag="hblock_tag_11" canDelete="false" classfield_id="908" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="909" tag="hblock_tag_12" canDelete="false" classfield_id="909" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="909" tag="hblock_tag_12" canDelete="false" classfield_id="909" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="909" tag="hblock_tag_13" canDelete="false" classfield_id="909" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="909" tag="hblock_tag_13" canDelete="false" classfield_id="909" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="910" tag="hblock_tag_14" canDelete="false" classfield_id="910" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="910" tag="hblock_tag_14" canDelete="false" classfield_id="910" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="910" tag="hblock_tag_15" canDelete="false" classfield_id="910" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="910" tag="hblock_tag_15" canDelete="false" classfield_id="910" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="911" tag="hblock_tag_16" canDelete="false" classfield_id="911" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="911" tag="hblock_tag_16" canDelete="false" classfield_id="911" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="911" tag="hblock_tag_17" canDelete="false" classfield_id="911" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="911" tag="hblock_tag_17" canDelete="false" classfield_id="911" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="912" tag="hblock_tag_18" canDelete="false" classfield_id="912" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="912" tag="hblock_tag_18" canDelete="false" classfield_id="912" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="912" tag="hblock_tag_19" canDelete="false" classfield_id="912" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="912" tag="hblock_tag_19" canDelete="false" classfield_id="912" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="913" tag="hblock_tag_20" canDelete="false" classfield_id="913" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="913" tag="hblock_tag_20" canDelete="false" classfield_id="913" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="913" tag="hblock_tag_21" canDelete="false" classfield_id="913" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="913" tag="hblock_tag_21" canDelete="false" classfield_id="913" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="914" tag="operation_914" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="914" tag="operation_914" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="920" tag="operation_920" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="920" tag="operation_920" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="922" tag="operation_922" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="922" tag="operation_922" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="924" tag="operation_924" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="924" tag="operation_924" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="926" tag="operation_926" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="926" tag="operation_926" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="927" tag="operation_927" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="927" tag="operation_927" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="929" tag="operation_929" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="929" tag="operation_929" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="931" tag="operation_931" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="931" tag="operation_931" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="933" tag="operation_933" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="933" tag="operation_933" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="936" tag="operation_936" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="936" tag="operation_936" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="937" tag="operation_937" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="937" tag="operation_937" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="938" tag="operation_938" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="938" tag="operation_938" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="939" tag="operation_939" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="939" tag="operation_939" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="941" tag="operation_941" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="941" tag="operation_941" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="943" tag="operation_943" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="943" tag="operation_943" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="945" tag="operation_945" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="945" tag="operation_945" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="946" tag="operation_946" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="946" tag="operation_946" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="948" tag="operation_948" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="948" tag="operation_948" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="949" tag="operation_949" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="949" tag="operation_949" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="950" tag="operation_950" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="950" tag="operation_950" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="951" tag="operation_951" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="951" tag="operation_951" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="952" tag="operation_952" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="952" tag="operation_952" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="956" tag="operation_956" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="956" tag="operation_956" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="965" tag="operation_965" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="965" tag="operation_965" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="971" tag="operation_971" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="971" tag="operation_971" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="975" tag="operation_975" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="975" tag="operation_975" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="978" tag="operation_978" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="978" tag="operation_978" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="981" tag="operation_981" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="981" tag="operation_981" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="984" tag="operation_984" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="984" tag="operation_984" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="987" tag="operation_987" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="987" tag="operation_987" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="990" tag="operation_990" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="990" tag="operation_990" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="993" tag="operation_993" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="993" tag="operation_993" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="995" tag="operation_995" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="995" tag="operation_995" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="998" tag="operation_998" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="998" tag="operation_998" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1001" tag="operation_1001" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1001" tag="operation_1001" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1004" tag="operation_1004" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1005" tag="operation_1005" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1005" tag="operation_1005" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1007" tag="operation_1007" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1007" tag="operation_1007" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1012" tag="operation_1012" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1012" tag="operation_1012" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1013" tag="operation_1013" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1013" tag="operation_1013" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1014" tag="operation_1014" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1014" tag="operation_1014" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1020" tag="operation_1020" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1020" tag="operation_1020" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1021" tag="operation_1021" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1021" tag="operation_1021" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1023" tag="operation_1023" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1023" tag="operation_1023" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1025" tag="operation_1025" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1025" tag="operation_1025" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1028" tag="operation_1028" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1028" tag="operation_1028" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1031" tag="operation_1031" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1031" tag="operation_1031" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1034" tag="operation_1034" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1034" tag="operation_1034" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1037" tag="operation_1037" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1037" tag="operation_1037" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1038" tag="operation_1038" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1038" tag="operation_1038" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1040" tag="operation_1040" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1040" tag="operation_1040" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1046" tag="operation_1046" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1046" tag="operation_1046" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1048" tag="operation_1048" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1048" tag="operation_1048" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1050" tag="operation_1050" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1050" tag="operation_1050" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1052" tag="operation_1052" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1052" tag="operation_1052" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1054" tag="operation_1054" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1055" tag="operation_1055" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1055" tag="operation_1055" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1056" tag="operation_1056" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1056" tag="operation_1056" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1057" tag="operation_1057" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1057" tag="operation_1057" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -11602,256 +11602,256 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisdoc.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="903" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="903" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="903" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="903" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="903" tag="hblock_tag_0" canDelete="false" classfield_id="903" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="903" tag="hblock_tag_0" canDelete="false" classfield_id="903" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="903" tag="hblock_tag_1" canDelete="false" classfield_id="903" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="903" tag="hblock_tag_1" canDelete="false" classfield_id="903" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="904" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="904" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="904" tag="hblock_tag_2" canDelete="false" classfield_id="904" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="904" tag="hblock_tag_2" canDelete="false" classfield_id="904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="904" tag="hblock_tag_3" canDelete="false" classfield_id="904" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="904" tag="hblock_tag_3" canDelete="false" classfield_id="904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="905" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="905" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="905" tag="hblock_tag_4" canDelete="false" classfield_id="905" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="905" tag="hblock_tag_4" canDelete="false" classfield_id="905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="905" tag="hblock_tag_5" canDelete="false" classfield_id="905" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="905" tag="hblock_tag_5" canDelete="false" classfield_id="905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="906" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="906" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="906" tag="hblock_tag_6" canDelete="false" classfield_id="906" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="906" tag="hblock_tag_6" canDelete="false" classfield_id="906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="906" tag="hblock_tag_7" canDelete="false" classfield_id="906" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="906" tag="hblock_tag_7" canDelete="false" classfield_id="906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="907" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="907" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="907" tag="hblock_tag_8" canDelete="false" classfield_id="907" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="907" tag="hblock_tag_8" canDelete="false" classfield_id="907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="907" tag="hblock_tag_9" canDelete="false" classfield_id="907" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="907" tag="hblock_tag_9" canDelete="false" classfield_id="907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="908" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="908" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="908" tag="hblock_tag_10" canDelete="false" classfield_id="908" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="908" tag="hblock_tag_10" canDelete="false" classfield_id="908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="908" tag="hblock_tag_11" canDelete="false" classfield_id="908" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="908" tag="hblock_tag_11" canDelete="false" classfield_id="908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="909" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="909" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="909" tag="hblock_tag_12" canDelete="false" classfield_id="909" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="909" tag="hblock_tag_12" canDelete="false" classfield_id="909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="909" tag="hblock_tag_13" canDelete="false" classfield_id="909" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="909" tag="hblock_tag_13" canDelete="false" classfield_id="909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="910" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="910" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="910" tag="hblock_tag_14" canDelete="false" classfield_id="910" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="910" tag="hblock_tag_14" canDelete="false" classfield_id="910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="910" tag="hblock_tag_15" canDelete="false" classfield_id="910" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="910" tag="hblock_tag_15" canDelete="false" classfield_id="910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="911" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="911" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="911" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="911" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="911" tag="hblock_tag_16" canDelete="false" classfield_id="911" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="911" tag="hblock_tag_16" canDelete="false" classfield_id="911" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="911" tag="hblock_tag_17" canDelete="false" classfield_id="911" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="911" tag="hblock_tag_17" canDelete="false" classfield_id="911" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="912" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="912" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="912" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="912" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="912" tag="hblock_tag_18" canDelete="false" classfield_id="912" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="912" tag="hblock_tag_18" canDelete="false" classfield_id="912" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="912" tag="hblock_tag_19" canDelete="false" classfield_id="912" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="912" tag="hblock_tag_19" canDelete="false" classfield_id="912" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="913" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="913" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="913" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="913" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="913" tag="hblock_tag_20" canDelete="false" classfield_id="913" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="913" tag="hblock_tag_20" canDelete="false" classfield_id="913" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="913" tag="hblock_tag_21" canDelete="false" classfield_id="913" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="913" tag="hblock_tag_21" canDelete="false" classfield_id="913" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2382" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2382" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2382" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2382" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_26" canDelete="false" writeOutText="false" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -11859,7 +11859,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1058" tqparent_class="1058" fileExt=".cpp" fileName="kiscursor" >
+    <classifiercodedocument writeOutCode="true" package="" id="1058" parent_class="1058" fileExt=".cpp" fileName="kiscursor" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -11877,132 +11877,132 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1059" tag="operation_1059" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1059" tag="operation_1059" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1060" tag="operation_1060" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1060" tag="operation_1060" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1061" tag="operation_1061" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1061" tag="operation_1061" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1062" tag="operation_1062" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1062" tag="operation_1062" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1063" tag="operation_1063" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1063" tag="operation_1063" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1064" tag="operation_1064" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1065" tag="operation_1065" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1065" tag="operation_1065" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1066" tag="operation_1066" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1066" tag="operation_1066" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1067" tag="operation_1067" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1067" tag="operation_1067" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1068" tag="operation_1068" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1068" tag="operation_1068" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1069" tag="operation_1069" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1069" tag="operation_1069" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1070" tag="operation_1070" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1070" tag="operation_1070" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1071" tag="operation_1071" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1071" tag="operation_1071" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1072" tag="operation_1072" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1072" tag="operation_1072" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1073" tag="operation_1073" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1073" tag="operation_1073" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1074" tag="operation_1074" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1074" tag="operation_1074" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1075" tag="operation_1075" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1075" tag="operation_1075" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1076" tag="operation_1076" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1076" tag="operation_1076" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1077" tag="operation_1077" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1077" tag="operation_1077" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1078" tag="operation_1078" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1078" tag="operation_1078" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1079" tag="operation_1079" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1079" tag="operation_1079" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1080" tag="operation_1080" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1080" tag="operation_1080" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1081" tag="operation_1081" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1081" tag="operation_1081" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1082" tag="operation_1082" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1082" tag="operation_1082" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1083" tag="operation_1083" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1083" tag="operation_1083" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1084" tag="operation_1084" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12015,7 +12015,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1085" tqparent_class="1085" fileExt=".cpp" fileName="kisconfig" >
+    <classifiercodedocument writeOutCode="true" package="" id="1085" parent_class="1085" fileExt=".cpp" fileName="kisconfig" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -12033,72 +12033,72 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1086" tag="hblock_tag_0" canDelete="false" classfield_id="1086" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1086" tag="hblock_tag_0" canDelete="false" classfield_id="1086" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1086" tag="hblock_tag_1" canDelete="false" classfield_id="1086" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1086" tag="hblock_tag_1" canDelete="false" classfield_id="1086" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1087" tag="operation_1087" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1087" tag="operation_1087" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1089" tag="operation_1089" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1089" tag="operation_1089" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1090" tag="operation_1090" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1090" tag="operation_1090" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1092" tag="operation_1092" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1092" tag="operation_1092" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1093" tag="operation_1093" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1093" tag="operation_1093" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1094" tag="operation_1094" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1095" tag="operation_1095" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1095" tag="operation_1095" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1096" tag="operation_1096" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1096" tag="operation_1096" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1097" tag="operation_1097" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1097" tag="operation_1097" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1098" tag="operation_1098" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1098" tag="operation_1098" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1099" tag="operation_1099" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1099" tag="operation_1099" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1100" tag="operation_1100" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1100" tag="operation_1100" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12110,21 +12110,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisconfig.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1086" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1086" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1086" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1086" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1086" tag="hblock_tag_0" canDelete="false" classfield_id="1086" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1086" tag="hblock_tag_0" canDelete="false" classfield_id="1086" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1086" tag="hblock_tag_1" canDelete="false" classfield_id="1086" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1086" tag="hblock_tag_1" canDelete="false" classfield_id="1086" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -12132,7 +12132,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1101" tqparent_class="1101" fileExt=".cpp" fileName="kiscanvasobserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="1101" parent_class="1101" fileExt=".cpp" fileName="kiscanvasobserver" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -12150,27 +12150,27 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1102" tag="operation_1102" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1102" tag="operation_1102" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1104" tag="operation_1104" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1104" tag="operation_1104" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1105" tag="operation_1105" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1105" tag="operation_1105" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1107" tag="operation_1107" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1107" tag="operation_1107" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1109" tag="operation_1109" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1109" tag="operation_1109" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12183,7 +12183,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1110" tqparent_class="1110" fileExt=".cpp" fileName="kisfactory" >
+    <classifiercodedocument writeOutCode="true" package="" id="1110" parent_class="1110" fileExt=".cpp" fileName="kisfactory" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -12201,77 +12201,77 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1111" tag="hblock_tag_0" canDelete="false" classfield_id="1111" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1111" tag="hblock_tag_0" canDelete="false" classfield_id="1111" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1111" tag="hblock_tag_1" canDelete="false" classfield_id="1111" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1111" tag="hblock_tag_1" canDelete="false" classfield_id="1111" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1112" tag="hblock_tag_2" canDelete="false" classfield_id="1112" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1112" tag="hblock_tag_2" canDelete="false" classfield_id="1112" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1112" tag="hblock_tag_3" canDelete="false" classfield_id="1112" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1112" tag="hblock_tag_3" canDelete="false" classfield_id="1112" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1113" tag="hblock_tag_4" canDelete="false" classfield_id="1113" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1113" tag="hblock_tag_4" canDelete="false" classfield_id="1113" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1113" tag="hblock_tag_5" canDelete="false" classfield_id="1113" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1113" tag="hblock_tag_5" canDelete="false" classfield_id="1113" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1114" tag="hblock_tag_6" canDelete="false" classfield_id="1114" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1114" tag="hblock_tag_6" canDelete="false" classfield_id="1114" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1114" tag="hblock_tag_7" canDelete="false" classfield_id="1114" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1114" tag="hblock_tag_7" canDelete="false" classfield_id="1114" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1115" tag="operation_1115" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1115" tag="operation_1115" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1118" tag="operation_1118" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1118" tag="operation_1118" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1119" tag="operation_1119" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1119" tag="operation_1119" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1126" tag="operation_1126" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1126" tag="operation_1126" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1127" tag="operation_1127" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1127" tag="operation_1127" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1128" tag="operation_1128" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1128" tag="operation_1128" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1129" tag="operation_1129" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1129" tag="operation_1129" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12283,81 +12283,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisfactory.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:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1111" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1111" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1111" tag="hblock_tag_0" canDelete="false" classfield_id="1111" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1111" tag="hblock_tag_0" canDelete="false" classfield_id="1111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1111" tag="hblock_tag_1" canDelete="false" classfield_id="1111" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1111" tag="hblock_tag_1" canDelete="false" classfield_id="1111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1112" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1112" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1112" tag="hblock_tag_2" canDelete="false" classfield_id="1112" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1112" tag="hblock_tag_2" canDelete="false" classfield_id="1112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1112" tag="hblock_tag_3" canDelete="false" classfield_id="1112" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1112" tag="hblock_tag_3" canDelete="false" classfield_id="1112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1113" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1113" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1113" tag="hblock_tag_4" canDelete="false" classfield_id="1113" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1113" tag="hblock_tag_4" canDelete="false" classfield_id="1113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1113" tag="hblock_tag_5" canDelete="false" classfield_id="1113" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1113" tag="hblock_tag_5" canDelete="false" classfield_id="1113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1114" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1114" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1114" tag="hblock_tag_6" canDelete="false" classfield_id="1114" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1114" tag="hblock_tag_6" canDelete="false" classfield_id="1114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1114" tag="hblock_tag_7" canDelete="false" classfield_id="1114" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1114" tag="hblock_tag_7" canDelete="false" classfield_id="1114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -12365,7 +12365,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1130" tqparent_class="1130" fileExt=".cpp" fileName="kischannel" >
+    <classifiercodedocument writeOutCode="true" package="" id="1130" parent_class="1130" fileExt=".cpp" fileName="kischannel" >
      <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;kischannelsp.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;" >
        <header>
@@ -12383,92 +12383,92 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1131" tag="operation_1131" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1131" tag="operation_1131" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1137" tag="operation_1137" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1137" tag="operation_1137" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1139" tag="operation_1139" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1139" tag="operation_1139" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1142" tag="operation_1142" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1142" tag="operation_1142" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1144" tag="operation_1144" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1144" tag="operation_1144" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1145" tag="operation_1145" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1145" tag="operation_1145" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1146" tag="operation_1146" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1146" tag="operation_1146" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1148" tag="operation_1148" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1148" tag="operation_1148" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1151" tag="operation_1151" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1151" tag="operation_1151" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1152" tag="operation_1152" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1152" tag="operation_1152" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1153" tag="operation_1153" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1153" tag="operation_1153" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1156" tag="operation_1156" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1156" tag="operation_1156" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1157" tag="operation_1157" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1157" tag="operation_1157" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1158" tag="operation_1158" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1158" tag="operation_1158" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1160" tag="operation_1160" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1160" tag="operation_1160" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1163" tag="operation_1163" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1163" tag="operation_1163" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1166" tag="operation_1166" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1166" tag="operation_1166" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1169" tag="operation_1169" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1169" tag="operation_1169" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12481,7 +12481,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1170" tqparent_class="1170" fileExt=".cpp" fileName="kiscanvassubject" >
+    <classifiercodedocument writeOutCode="true" package="" id="1170" parent_class="1170" fileExt=".cpp" fileName="kiscanvassubject" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -12499,107 +12499,107 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1171" tag="operation_1171" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1171" tag="operation_1171" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1173" tag="operation_1173" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1173" tag="operation_1173" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1174" tag="operation_1174" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1174" tag="operation_1174" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1176" tag="operation_1176" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1176" tag="operation_1176" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1178" tag="operation_1178" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1178" tag="operation_1178" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1179" tag="operation_1179" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1179" tag="operation_1179" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1180" tag="operation_1180" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1180" tag="operation_1180" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1181" tag="operation_1181" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1181" tag="operation_1181" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1182" tag="operation_1182" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1182" tag="operation_1182" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1183" tag="operation_1183" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1183" tag="operation_1183" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1184" tag="operation_1184" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1184" tag="operation_1184" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1185" tag="operation_1185" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1185" tag="operation_1185" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1187" tag="operation_1187" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1187" tag="operation_1187" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1188" tag="operation_1188" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1188" tag="operation_1188" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1189" tag="operation_1189" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1189" tag="operation_1189" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1190" tag="operation_1190" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1190" tag="operation_1190" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1192" tag="operation_1192" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1192" tag="operation_1192" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1194" tag="operation_1194" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1194" tag="operation_1194" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1195" tag="operation_1195" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1195" tag="operation_1195" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1196" tag="operation_1196" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1196" tag="operation_1196" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1197" tag="operation_1197" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1197" tag="operation_1197" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12612,7 +12612,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1198" tqparent_class="1198" fileExt=".cpp" fileName="compositeop" >
+    <classifiercodedocument writeOutCode="true" package="" id="1198" parent_class="1198" fileExt=".cpp" fileName="compositeop" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -12630,27 +12630,27 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12662,36 +12662,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			compositeop.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>
-      <codeclassfield tqparent_id="1455" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1455" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1455" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1455" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -12699,7 +12699,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1237" tqparent_class="1237" fileExt=".cpp" fileName="enumimgtype" >
+    <classifiercodedocument writeOutCode="true" package="" id="1237" parent_class="1237" fileExt=".cpp" fileName="enumimgtype" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -12717,52 +12717,52 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -12774,71 +12774,71 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			enumimgtype.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>
-      <codeclassfield tqparent_id="1285" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1285" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1458" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1458" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1458" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1458" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -12846,7 +12846,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1259" tqparent_class="1259" fileExt=".cpp" fileName="kisimage" >
+    <classifiercodedocument writeOutCode="true" package="" id="1259" parent_class="1259" fileExt=".cpp" fileName="kisimage" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kischannelsp.h&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;channeltype.h&quot;&amp;#010;#include &quot;kispaintdevicesp.h&quot;&amp;#010;#include &quot;enumimgtype.h&quot;&amp;#010;#include &quot;pixeltype.h&quot;&amp;#010;#include &quot;double.h&quot;&amp;#010;#include &quot;kisselectionsp.h&quot;&amp;#010;#include &quot;kistilemgrsp.h&quot;&amp;#010;#include &quot;kisbackgroundsp.h&quot;&amp;#010;#include &quot;vkischannelsp.h&quot;&amp;#010;#include &quot;kocolormap.h&quot;&amp;#010;#include &quot;vkislayersp.h&quot;&amp;#010;" >
        <header>
@@ -12864,772 +12864,772 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1260" tag="hblock_tag_0" canDelete="false" classfield_id="1260" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1260" tag="hblock_tag_0" canDelete="false" classfield_id="1260" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1260" tag="hblock_tag_1" canDelete="false" classfield_id="1260" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1260" tag="hblock_tag_1" canDelete="false" classfield_id="1260" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1261" tag="hblock_tag_2" canDelete="false" classfield_id="1261" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1261" tag="hblock_tag_2" canDelete="false" classfield_id="1261" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1261" tag="hblock_tag_3" canDelete="false" classfield_id="1261" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1261" tag="hblock_tag_3" canDelete="false" classfield_id="1261" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1262" tag="hblock_tag_4" canDelete="false" classfield_id="1262" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1262" tag="hblock_tag_4" canDelete="false" classfield_id="1262" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1262" tag="hblock_tag_5" canDelete="false" classfield_id="1262" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1262" tag="hblock_tag_5" canDelete="false" classfield_id="1262" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1263" tag="hblock_tag_6" canDelete="false" classfield_id="1263" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1263" tag="hblock_tag_6" canDelete="false" classfield_id="1263" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1263" tag="hblock_tag_7" canDelete="false" classfield_id="1263" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1263" tag="hblock_tag_7" canDelete="false" classfield_id="1263" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1264" tag="hblock_tag_8" canDelete="false" classfield_id="1264" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1264" tag="hblock_tag_8" canDelete="false" classfield_id="1264" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1264" tag="hblock_tag_9" canDelete="false" classfield_id="1264" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1264" tag="hblock_tag_9" canDelete="false" classfield_id="1264" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1265" tag="hblock_tag_10" canDelete="false" classfield_id="1265" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1265" tag="hblock_tag_10" canDelete="false" classfield_id="1265" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1265" tag="hblock_tag_11" canDelete="false" classfield_id="1265" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1265" tag="hblock_tag_11" canDelete="false" classfield_id="1265" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1266" tag="hblock_tag_12" canDelete="false" classfield_id="1266" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1266" tag="hblock_tag_12" canDelete="false" classfield_id="1266" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1266" tag="hblock_tag_13" canDelete="false" classfield_id="1266" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1266" tag="hblock_tag_13" canDelete="false" classfield_id="1266" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1267" tag="hblock_tag_14" canDelete="false" classfield_id="1267" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1267" tag="hblock_tag_14" canDelete="false" classfield_id="1267" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1267" tag="hblock_tag_15" canDelete="false" classfield_id="1267" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1267" tag="hblock_tag_15" canDelete="false" classfield_id="1267" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1268" tag="hblock_tag_16" canDelete="false" classfield_id="1268" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1268" tag="hblock_tag_16" canDelete="false" classfield_id="1268" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1268" tag="hblock_tag_17" canDelete="false" classfield_id="1268" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1268" tag="hblock_tag_17" canDelete="false" classfield_id="1268" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1269" tag="hblock_tag_18" canDelete="false" classfield_id="1269" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1269" tag="hblock_tag_18" canDelete="false" classfield_id="1269" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1269" tag="hblock_tag_19" canDelete="false" classfield_id="1269" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1269" tag="hblock_tag_19" canDelete="false" classfield_id="1269" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1271" tag="hblock_tag_20" canDelete="false" classfield_id="1271" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1271" tag="hblock_tag_20" canDelete="false" classfield_id="1271" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1271" tag="hblock_tag_21" canDelete="false" classfield_id="1271" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1271" tag="hblock_tag_21" canDelete="false" classfield_id="1271" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1272" tag="hblock_tag_22" canDelete="false" classfield_id="1272" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1272" tag="hblock_tag_22" canDelete="false" classfield_id="1272" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1272" tag="hblock_tag_23" canDelete="false" classfield_id="1272" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1272" tag="hblock_tag_23" canDelete="false" classfield_id="1272" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1273" tag="hblock_tag_24" canDelete="false" classfield_id="1273" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1273" tag="hblock_tag_24" canDelete="false" classfield_id="1273" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1273" tag="hblock_tag_25" canDelete="false" classfield_id="1273" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1273" tag="hblock_tag_25" canDelete="false" classfield_id="1273" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1274" tag="hblock_tag_26" canDelete="false" classfield_id="1274" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1274" tag="hblock_tag_26" canDelete="false" classfield_id="1274" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1274" tag="hblock_tag_27" canDelete="false" classfield_id="1274" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1274" tag="hblock_tag_27" canDelete="false" classfield_id="1274" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1275" tag="hblock_tag_28" canDelete="false" classfield_id="1275" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1275" tag="hblock_tag_28" canDelete="false" classfield_id="1275" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1275" tag="hblock_tag_29" canDelete="false" classfield_id="1275" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1275" tag="hblock_tag_29" canDelete="false" classfield_id="1275" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1276" tag="hblock_tag_30" canDelete="false" classfield_id="1276" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1276" tag="hblock_tag_30" canDelete="false" classfield_id="1276" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1276" tag="hblock_tag_31" canDelete="false" classfield_id="1276" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1276" tag="hblock_tag_31" canDelete="false" classfield_id="1276" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1277" tag="hblock_tag_32" canDelete="false" classfield_id="1277" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1277" tag="hblock_tag_32" canDelete="false" classfield_id="1277" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1277" tag="hblock_tag_33" canDelete="false" classfield_id="1277" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1277" tag="hblock_tag_33" canDelete="false" classfield_id="1277" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1278" tag="hblock_tag_34" canDelete="false" classfield_id="1278" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1278" tag="hblock_tag_34" canDelete="false" classfield_id="1278" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1278" tag="hblock_tag_35" canDelete="false" classfield_id="1278" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1278" tag="hblock_tag_35" canDelete="false" classfield_id="1278" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1279" tag="hblock_tag_36" canDelete="false" classfield_id="1279" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1279" tag="hblock_tag_36" canDelete="false" classfield_id="1279" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1279" tag="hblock_tag_37" canDelete="false" classfield_id="1279" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1279" tag="hblock_tag_37" canDelete="false" classfield_id="1279" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1280" tag="hblock_tag_38" canDelete="false" classfield_id="1280" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1280" tag="hblock_tag_38" canDelete="false" classfield_id="1280" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1280" tag="hblock_tag_39" canDelete="false" classfield_id="1280" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1280" tag="hblock_tag_39" canDelete="false" classfield_id="1280" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1281" tag="hblock_tag_40" canDelete="false" classfield_id="1281" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1281" tag="hblock_tag_40" canDelete="false" classfield_id="1281" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1281" tag="hblock_tag_41" canDelete="false" classfield_id="1281" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1281" tag="hblock_tag_41" canDelete="false" classfield_id="1281" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1282" tag="hblock_tag_42" canDelete="false" classfield_id="1282" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1282" tag="hblock_tag_42" canDelete="false" classfield_id="1282" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1282" tag="hblock_tag_43" canDelete="false" classfield_id="1282" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1282" tag="hblock_tag_43" canDelete="false" classfield_id="1282" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1283" tag="hblock_tag_44" canDelete="false" classfield_id="1283" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1283" tag="hblock_tag_44" canDelete="false" classfield_id="1283" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1283" tag="hblock_tag_45" canDelete="false" classfield_id="1283" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1283" tag="hblock_tag_45" canDelete="false" classfield_id="1283" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1284" tag="hblock_tag_46" canDelete="false" classfield_id="1284" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1284" tag="hblock_tag_46" canDelete="false" classfield_id="1284" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1284" tag="hblock_tag_47" canDelete="false" classfield_id="1284" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1284" tag="hblock_tag_47" canDelete="false" classfield_id="1284" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1286" tag="hblock_tag_48" canDelete="false" classfield_id="1286" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1286" tag="hblock_tag_48" canDelete="false" classfield_id="1286" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1286" tag="hblock_tag_49" canDelete="false" classfield_id="1286" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1286" tag="hblock_tag_49" canDelete="false" classfield_id="1286" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1287" tag="hblock_tag_50" canDelete="false" classfield_id="1287" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1287" tag="hblock_tag_50" canDelete="false" classfield_id="1287" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1287" tag="hblock_tag_51" canDelete="false" classfield_id="1287" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1287" tag="hblock_tag_51" canDelete="false" classfield_id="1287" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1288" tag="hblock_tag_52" canDelete="false" classfield_id="1288" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1288" tag="hblock_tag_52" canDelete="false" classfield_id="1288" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1288" tag="hblock_tag_53" canDelete="false" classfield_id="1288" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1288" tag="hblock_tag_53" canDelete="false" classfield_id="1288" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1289" tag="hblock_tag_54" canDelete="false" classfield_id="1289" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1289" tag="hblock_tag_54" canDelete="false" classfield_id="1289" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1289" tag="hblock_tag_55" canDelete="false" classfield_id="1289" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1289" tag="hblock_tag_55" canDelete="false" classfield_id="1289" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1290" tag="hblock_tag_56" canDelete="false" classfield_id="1290" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1290" tag="hblock_tag_56" canDelete="false" classfield_id="1290" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1290" tag="hblock_tag_57" canDelete="false" classfield_id="1290" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1290" tag="hblock_tag_57" canDelete="false" classfield_id="1290" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1291" tag="hblock_tag_58" canDelete="false" classfield_id="1291" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1291" tag="hblock_tag_58" canDelete="false" classfield_id="1291" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1291" tag="hblock_tag_59" canDelete="false" classfield_id="1291" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1291" tag="hblock_tag_59" canDelete="false" classfield_id="1291" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_60" canDelete="false" classfield_id="1270" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_60" canDelete="false" classfield_id="1270" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_61" canDelete="false" classfield_id="1270" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_61" canDelete="false" classfield_id="1270" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_62" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_62" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_63" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_63" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_64" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_64" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_65" canDelete="false" classfield_id="1285" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_65" canDelete="false" classfield_id="1285" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_66" canDelete="false" classfield_id="1285" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_66" canDelete="false" classfield_id="1285" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_67" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_67" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_68" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_68" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_69" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_69" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1292" tag="operation_1292" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1292" tag="operation_1292" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1294" tag="operation_1294" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1294" tag="operation_1294" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1300" tag="operation_1300" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1300" tag="operation_1300" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1302" tag="operation_1302" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1302" tag="operation_1302" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1304" tag="operation_1304" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1304" tag="operation_1304" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1306" tag="operation_1306" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1306" tag="operation_1306" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1308" tag="operation_1308" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1308" tag="operation_1308" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1310" tag="operation_1310" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1310" tag="operation_1310" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1311" tag="operation_1311" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1311" tag="operation_1311" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1313" tag="operation_1313" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1313" tag="operation_1313" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1316" tag="operation_1316" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1316" tag="operation_1316" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1317" tag="operation_1317" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1317" tag="operation_1317" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1318" tag="operation_1318" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1318" tag="operation_1318" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1321" tag="operation_1321" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1321" tag="operation_1321" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1324" tag="operation_1324" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1324" tag="operation_1324" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1325" tag="operation_1325" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1325" tag="operation_1325" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1327" tag="operation_1327" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1327" tag="operation_1327" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1328" tag="operation_1328" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1328" tag="operation_1328" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1329" tag="operation_1329" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1329" tag="operation_1329" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1331" tag="operation_1331" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1331" tag="operation_1331" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1333" tag="operation_1333" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1333" tag="operation_1333" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1334" tag="operation_1334" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1334" tag="operation_1334" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1335" tag="operation_1335" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1335" tag="operation_1335" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1337" tag="operation_1337" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1337" tag="operation_1337" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1340" tag="operation_1340" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1340" tag="operation_1340" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1341" tag="operation_1341" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1341" tag="operation_1341" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1342" tag="operation_1342" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1342" tag="operation_1342" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1344" tag="operation_1344" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1344" tag="operation_1344" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1346" tag="operation_1346" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1346" tag="operation_1346" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1347" tag="operation_1347" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1347" tag="operation_1347" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1348" tag="operation_1348" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1348" tag="operation_1348" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1349" tag="operation_1349" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1349" tag="operation_1349" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1350" tag="operation_1350" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1350" tag="operation_1350" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1351" tag="operation_1351" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1351" tag="operation_1351" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1353" tag="operation_1353" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1353" tag="operation_1353" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1355" tag="operation_1355" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1355" tag="operation_1355" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1361" tag="operation_1361" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1361" tag="operation_1361" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1362" tag="operation_1362" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1362" tag="operation_1362" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1364" tag="operation_1364" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1364" tag="operation_1364" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1369" tag="operation_1369" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1369" tag="operation_1369" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1371" tag="operation_1371" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1371" tag="operation_1371" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1373" tag="operation_1373" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1373" tag="operation_1373" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1375" tag="operation_1375" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1375" tag="operation_1375" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1376" tag="operation_1376" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1376" tag="operation_1376" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1378" tag="operation_1378" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1378" tag="operation_1378" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1380" tag="operation_1380" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1380" tag="operation_1380" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1381" tag="operation_1381" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1381" tag="operation_1381" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1382" tag="operation_1382" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1382" tag="operation_1382" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1383" tag="operation_1383" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1383" tag="operation_1383" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1384" tag="operation_1384" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1384" tag="operation_1384" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1385" tag="operation_1385" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1385" tag="operation_1385" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1386" tag="operation_1386" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1386" tag="operation_1386" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1387" tag="operation_1387" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1387" tag="operation_1387" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1392" tag="operation_1392" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1392" tag="operation_1392" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1394" tag="operation_1394" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1394" tag="operation_1394" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1396" tag="operation_1396" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1396" tag="operation_1396" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1399" tag="operation_1399" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1399" tag="operation_1399" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1402" tag="operation_1402" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1402" tag="operation_1402" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1404" tag="operation_1404" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1404" tag="operation_1404" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1406" tag="operation_1406" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1406" tag="operation_1406" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1409" tag="operation_1409" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1409" tag="operation_1409" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1411" tag="operation_1411" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1411" tag="operation_1411" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1414" tag="operation_1414" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1414" tag="operation_1414" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1417" tag="operation_1417" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1417" tag="operation_1417" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1419" tag="operation_1419" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1419" tag="operation_1419" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1421" tag="operation_1421" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1421" tag="operation_1421" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1422" tag="operation_1422" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1422" tag="operation_1422" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1424" tag="operation_1424" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1424" tag="operation_1424" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1426" tag="operation_1426" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1426" tag="operation_1426" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1427" tag="operation_1427" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1427" tag="operation_1427" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1430" tag="operation_1430" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1430" tag="operation_1430" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1431" tag="operation_1431" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1431" tag="operation_1431" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1433" tag="operation_1433" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1433" tag="operation_1433" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1434" tag="operation_1434" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1434" tag="operation_1434" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1435" tag="operation_1435" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1435" tag="operation_1435" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1437" tag="operation_1437" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1437" tag="operation_1437" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1438" tag="operation_1438" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1438" tag="operation_1438" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1440" tag="operation_1440" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1440" tag="operation_1440" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1441" tag="operation_1441" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1441" tag="operation_1441" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1443" tag="operation_1443" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1443" tag="operation_1443" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1445" tag="operation_1445" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1445" tag="operation_1445" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1447" tag="operation_1447" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1447" tag="operation_1447" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1450" tag="operation_1450" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1450" tag="operation_1450" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1451" tag="operation_1451" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1451" tag="operation_1451" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -13641,671 +13641,671 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimage.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>
-      <codeclassfield tqparent_id="1260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1260" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1260" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1260" tag="hblock_tag_0" canDelete="false" classfield_id="1260" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1260" tag="hblock_tag_0" canDelete="false" classfield_id="1260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1260" tag="hblock_tag_1" canDelete="false" classfield_id="1260" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1260" tag="hblock_tag_1" canDelete="false" classfield_id="1260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1261" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1261" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1261" tag="hblock_tag_2" canDelete="false" classfield_id="1261" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1261" tag="hblock_tag_2" canDelete="false" classfield_id="1261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1261" tag="hblock_tag_3" canDelete="false" classfield_id="1261" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1261" tag="hblock_tag_3" canDelete="false" classfield_id="1261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1262" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1262" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1262" tag="hblock_tag_4" canDelete="false" classfield_id="1262" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1262" tag="hblock_tag_4" canDelete="false" classfield_id="1262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1262" tag="hblock_tag_5" canDelete="false" classfield_id="1262" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1262" tag="hblock_tag_5" canDelete="false" classfield_id="1262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1263" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1263" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1263" tag="hblock_tag_6" canDelete="false" classfield_id="1263" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1263" tag="hblock_tag_6" canDelete="false" classfield_id="1263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1263" tag="hblock_tag_7" canDelete="false" classfield_id="1263" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1263" tag="hblock_tag_7" canDelete="false" classfield_id="1263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1264" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1264" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1264" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1264" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1264" tag="hblock_tag_8" canDelete="false" classfield_id="1264" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1264" tag="hblock_tag_8" canDelete="false" classfield_id="1264" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1264" tag="hblock_tag_9" canDelete="false" classfield_id="1264" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1264" tag="hblock_tag_9" canDelete="false" classfield_id="1264" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1265" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1265" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1265" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1265" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1265" tag="hblock_tag_10" canDelete="false" classfield_id="1265" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1265" tag="hblock_tag_10" canDelete="false" classfield_id="1265" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1265" tag="hblock_tag_11" canDelete="false" classfield_id="1265" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1265" tag="hblock_tag_11" canDelete="false" classfield_id="1265" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1266" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1266" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1266" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1266" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1266" tag="hblock_tag_12" canDelete="false" classfield_id="1266" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1266" tag="hblock_tag_12" canDelete="false" classfield_id="1266" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1266" tag="hblock_tag_13" canDelete="false" classfield_id="1266" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1266" tag="hblock_tag_13" canDelete="false" classfield_id="1266" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1267" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1267" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1267" tag="hblock_tag_14" canDelete="false" classfield_id="1267" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1267" tag="hblock_tag_14" canDelete="false" classfield_id="1267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1267" tag="hblock_tag_15" canDelete="false" classfield_id="1267" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1267" tag="hblock_tag_15" canDelete="false" classfield_id="1267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1268" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1268" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1268" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1268" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1268" tag="hblock_tag_16" canDelete="false" classfield_id="1268" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1268" tag="hblock_tag_16" canDelete="false" classfield_id="1268" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1268" tag="hblock_tag_17" canDelete="false" classfield_id="1268" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1268" tag="hblock_tag_17" canDelete="false" classfield_id="1268" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1269" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1269" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1269" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1269" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1269" tag="hblock_tag_18" canDelete="false" classfield_id="1269" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1269" tag="hblock_tag_18" canDelete="false" classfield_id="1269" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1269" tag="hblock_tag_19" canDelete="false" classfield_id="1269" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1269" tag="hblock_tag_19" canDelete="false" classfield_id="1269" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1271" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1271" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1271" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1271" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1271" tag="hblock_tag_20" canDelete="false" classfield_id="1271" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1271" tag="hblock_tag_20" canDelete="false" classfield_id="1271" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1271" tag="hblock_tag_21" canDelete="false" classfield_id="1271" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1271" tag="hblock_tag_21" canDelete="false" classfield_id="1271" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1272" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1272" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1272" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1272" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1272" tag="hblock_tag_22" canDelete="false" classfield_id="1272" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1272" tag="hblock_tag_22" canDelete="false" classfield_id="1272" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1272" tag="hblock_tag_23" canDelete="false" classfield_id="1272" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1272" tag="hblock_tag_23" canDelete="false" classfield_id="1272" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1273" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1273" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1273" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1273" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1273" tag="hblock_tag_24" canDelete="false" classfield_id="1273" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1273" tag="hblock_tag_24" canDelete="false" classfield_id="1273" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1273" tag="hblock_tag_25" canDelete="false" classfield_id="1273" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1273" tag="hblock_tag_25" canDelete="false" classfield_id="1273" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1274" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1274" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1274" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1274" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1274" tag="hblock_tag_26" canDelete="false" classfield_id="1274" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1274" tag="hblock_tag_26" canDelete="false" classfield_id="1274" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1274" tag="hblock_tag_27" canDelete="false" classfield_id="1274" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1274" tag="hblock_tag_27" canDelete="false" classfield_id="1274" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1275" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1275" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1275" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1275" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1275" tag="hblock_tag_28" canDelete="false" classfield_id="1275" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1275" tag="hblock_tag_28" canDelete="false" classfield_id="1275" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1275" tag="hblock_tag_29" canDelete="false" classfield_id="1275" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1275" tag="hblock_tag_29" canDelete="false" classfield_id="1275" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1276" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1276" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1276" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1276" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1276" tag="hblock_tag_30" canDelete="false" classfield_id="1276" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1276" tag="hblock_tag_30" canDelete="false" classfield_id="1276" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1276" tag="hblock_tag_31" canDelete="false" classfield_id="1276" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1276" tag="hblock_tag_31" canDelete="false" classfield_id="1276" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1277" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1277" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1277" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1277" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1277" tag="hblock_tag_32" canDelete="false" classfield_id="1277" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1277" tag="hblock_tag_32" canDelete="false" classfield_id="1277" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1277" tag="hblock_tag_33" canDelete="false" classfield_id="1277" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1277" tag="hblock_tag_33" canDelete="false" classfield_id="1277" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1278" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1278" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1278" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1278" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1278" tag="hblock_tag_34" canDelete="false" classfield_id="1278" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1278" tag="hblock_tag_34" canDelete="false" classfield_id="1278" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1278" tag="hblock_tag_35" canDelete="false" classfield_id="1278" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1278" tag="hblock_tag_35" canDelete="false" classfield_id="1278" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1279" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1279" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1279" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1279" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1279" tag="hblock_tag_36" canDelete="false" classfield_id="1279" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1279" tag="hblock_tag_36" canDelete="false" classfield_id="1279" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1279" tag="hblock_tag_37" canDelete="false" classfield_id="1279" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1279" tag="hblock_tag_37" canDelete="false" classfield_id="1279" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1280" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1280" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1280" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1280" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1280" tag="hblock_tag_38" canDelete="false" classfield_id="1280" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1280" tag="hblock_tag_38" canDelete="false" classfield_id="1280" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1280" tag="hblock_tag_39" canDelete="false" classfield_id="1280" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1280" tag="hblock_tag_39" canDelete="false" classfield_id="1280" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1281" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1281" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1281" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1281" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1281" tag="hblock_tag_40" canDelete="false" classfield_id="1281" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1281" tag="hblock_tag_40" canDelete="false" classfield_id="1281" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1281" tag="hblock_tag_41" canDelete="false" classfield_id="1281" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1281" tag="hblock_tag_41" canDelete="false" classfield_id="1281" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1282" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1282" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1282" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1282" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1282" tag="hblock_tag_42" canDelete="false" classfield_id="1282" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1282" tag="hblock_tag_42" canDelete="false" classfield_id="1282" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1282" tag="hblock_tag_43" canDelete="false" classfield_id="1282" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1282" tag="hblock_tag_43" canDelete="false" classfield_id="1282" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1283" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1283" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1283" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1283" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1283" tag="hblock_tag_44" canDelete="false" classfield_id="1283" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1283" tag="hblock_tag_44" canDelete="false" classfield_id="1283" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1283" tag="hblock_tag_45" canDelete="false" classfield_id="1283" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1283" tag="hblock_tag_45" canDelete="false" classfield_id="1283" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1284" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1284" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1284" tag="hblock_tag_46" canDelete="false" classfield_id="1284" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1284" tag="hblock_tag_46" canDelete="false" classfield_id="1284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1284" tag="hblock_tag_47" canDelete="false" classfield_id="1284" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1284" tag="hblock_tag_47" canDelete="false" classfield_id="1284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1286" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1286" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1286" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1286" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1286" tag="hblock_tag_48" canDelete="false" classfield_id="1286" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1286" tag="hblock_tag_48" canDelete="false" classfield_id="1286" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1286" tag="hblock_tag_49" canDelete="false" classfield_id="1286" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1286" tag="hblock_tag_49" canDelete="false" classfield_id="1286" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1287" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1287" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1287" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1287" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1287" tag="hblock_tag_50" canDelete="false" classfield_id="1287" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1287" tag="hblock_tag_50" canDelete="false" classfield_id="1287" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1287" tag="hblock_tag_51" canDelete="false" classfield_id="1287" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1287" tag="hblock_tag_51" canDelete="false" classfield_id="1287" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1288" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1288" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1288" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1288" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1288" tag="hblock_tag_52" canDelete="false" classfield_id="1288" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1288" tag="hblock_tag_52" canDelete="false" classfield_id="1288" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1288" tag="hblock_tag_53" canDelete="false" classfield_id="1288" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1288" tag="hblock_tag_53" canDelete="false" classfield_id="1288" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1289" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1289" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1289" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1289" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1289" tag="hblock_tag_54" canDelete="false" classfield_id="1289" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1289" tag="hblock_tag_54" canDelete="false" classfield_id="1289" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1289" tag="hblock_tag_55" canDelete="false" classfield_id="1289" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1289" tag="hblock_tag_55" canDelete="false" classfield_id="1289" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1290" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1290" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1290" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1290" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1290" tag="hblock_tag_56" canDelete="false" classfield_id="1290" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1290" tag="hblock_tag_56" canDelete="false" classfield_id="1290" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1290" tag="hblock_tag_57" canDelete="false" classfield_id="1290" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1290" tag="hblock_tag_57" canDelete="false" classfield_id="1290" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1291" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1291" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1291" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1291" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1291" tag="hblock_tag_58" canDelete="false" classfield_id="1291" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1291" tag="hblock_tag_58" canDelete="false" classfield_id="1291" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1291" tag="hblock_tag_59" canDelete="false" classfield_id="1291" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1291" tag="hblock_tag_59" canDelete="false" classfield_id="1291" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1270" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1270" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1270" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1270" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_60" canDelete="false" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_60" canDelete="false" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_61" canDelete="false" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_61" canDelete="false" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_62" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_62" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_63" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_63" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_64" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_64" canDelete="false" writeOutText="false" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1285" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1285" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1285" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1285" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_65" canDelete="false" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_65" canDelete="false" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_66" canDelete="false" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_66" canDelete="false" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_67" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_67" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_68" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_68" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_69" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_69" canDelete="false" writeOutText="false" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -14313,7 +14313,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1453" tqparent_class="1453" fileExt=".cpp" fileName="kispaintdevice" >
+    <classifiercodedocument writeOutCode="true" package="" id="1453" parent_class="1453" fileExt=".cpp" fileName="kispaintdevice" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;kistilemgrsp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;compositeop.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;enumimgtype.h&quot;&amp;#010;" >
        <header>
@@ -14331,562 +14331,562 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1454" tag="hblock_tag_0" canDelete="false" classfield_id="1454" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1454" tag="hblock_tag_0" canDelete="false" classfield_id="1454" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1454" tag="hblock_tag_1" canDelete="false" classfield_id="1454" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1454" tag="hblock_tag_1" canDelete="false" classfield_id="1454" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1456" tag="hblock_tag_2" canDelete="false" classfield_id="1456" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1456" tag="hblock_tag_2" canDelete="false" classfield_id="1456" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1456" tag="hblock_tag_3" canDelete="false" classfield_id="1456" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1456" tag="hblock_tag_3" canDelete="false" classfield_id="1456" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1457" tag="hblock_tag_4" canDelete="false" classfield_id="1457" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1457" tag="hblock_tag_4" canDelete="false" classfield_id="1457" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1457" tag="hblock_tag_5" canDelete="false" classfield_id="1457" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1457" tag="hblock_tag_5" canDelete="false" classfield_id="1457" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1459" tag="hblock_tag_6" canDelete="false" classfield_id="1459" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1459" tag="hblock_tag_6" canDelete="false" classfield_id="1459" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1459" tag="hblock_tag_7" canDelete="false" classfield_id="1459" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1459" tag="hblock_tag_7" canDelete="false" classfield_id="1459" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1460" tag="hblock_tag_8" canDelete="false" classfield_id="1460" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1460" tag="hblock_tag_8" canDelete="false" classfield_id="1460" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1460" tag="hblock_tag_9" canDelete="false" classfield_id="1460" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1460" tag="hblock_tag_9" canDelete="false" classfield_id="1460" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1461" tag="hblock_tag_10" canDelete="false" classfield_id="1461" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1461" tag="hblock_tag_10" canDelete="false" classfield_id="1461" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1461" tag="hblock_tag_11" canDelete="false" classfield_id="1461" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1461" tag="hblock_tag_11" canDelete="false" classfield_id="1461" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1462" tag="hblock_tag_12" canDelete="false" classfield_id="1462" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1462" tag="hblock_tag_12" canDelete="false" classfield_id="1462" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1462" tag="hblock_tag_13" canDelete="false" classfield_id="1462" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1462" tag="hblock_tag_13" canDelete="false" classfield_id="1462" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1463" tag="hblock_tag_14" canDelete="false" classfield_id="1463" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1463" tag="hblock_tag_14" canDelete="false" classfield_id="1463" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1463" tag="hblock_tag_15" canDelete="false" classfield_id="1463" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1463" tag="hblock_tag_15" canDelete="false" classfield_id="1463" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1464" tag="hblock_tag_16" canDelete="false" classfield_id="1464" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1464" tag="hblock_tag_16" canDelete="false" classfield_id="1464" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1464" tag="hblock_tag_17" canDelete="false" classfield_id="1464" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1464" tag="hblock_tag_17" canDelete="false" classfield_id="1464" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1465" tag="hblock_tag_18" canDelete="false" classfield_id="1465" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1465" tag="hblock_tag_18" canDelete="false" classfield_id="1465" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1465" tag="hblock_tag_19" canDelete="false" classfield_id="1465" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1465" tag="hblock_tag_19" canDelete="false" classfield_id="1465" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1466" tag="hblock_tag_20" canDelete="false" classfield_id="1466" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1466" tag="hblock_tag_20" canDelete="false" classfield_id="1466" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1466" tag="hblock_tag_21" canDelete="false" classfield_id="1466" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1466" tag="hblock_tag_21" canDelete="false" classfield_id="1466" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1467" tag="hblock_tag_22" canDelete="false" classfield_id="1467" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1467" tag="hblock_tag_22" canDelete="false" classfield_id="1467" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1467" tag="hblock_tag_23" canDelete="false" classfield_id="1467" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1467" tag="hblock_tag_23" canDelete="false" classfield_id="1467" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1468" tag="hblock_tag_24" canDelete="false" classfield_id="1468" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1468" tag="hblock_tag_24" canDelete="false" classfield_id="1468" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1468" tag="hblock_tag_25" canDelete="false" classfield_id="1468" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1468" tag="hblock_tag_25" canDelete="false" classfield_id="1468" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1469" tag="hblock_tag_26" canDelete="false" classfield_id="1469" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1469" tag="hblock_tag_26" canDelete="false" classfield_id="1469" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1469" tag="hblock_tag_27" canDelete="false" classfield_id="1469" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1469" tag="hblock_tag_27" canDelete="false" classfield_id="1469" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1470" tag="hblock_tag_28" canDelete="false" classfield_id="1470" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1470" tag="hblock_tag_28" canDelete="false" classfield_id="1470" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1470" tag="hblock_tag_29" canDelete="false" classfield_id="1470" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1470" tag="hblock_tag_29" canDelete="false" classfield_id="1470" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1471" tag="hblock_tag_30" canDelete="false" classfield_id="1471" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1471" tag="hblock_tag_30" canDelete="false" classfield_id="1471" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1471" tag="hblock_tag_31" canDelete="false" classfield_id="1471" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1471" tag="hblock_tag_31" canDelete="false" classfield_id="1471" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1472" tag="hblock_tag_32" canDelete="false" classfield_id="1472" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1472" tag="hblock_tag_32" canDelete="false" classfield_id="1472" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1472" tag="hblock_tag_33" canDelete="false" classfield_id="1472" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1472" tag="hblock_tag_33" canDelete="false" classfield_id="1472" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1473" tag="hblock_tag_34" canDelete="false" classfield_id="1473" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1473" tag="hblock_tag_34" canDelete="false" classfield_id="1473" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1473" tag="hblock_tag_35" canDelete="false" classfield_id="1473" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1473" tag="hblock_tag_35" canDelete="false" classfield_id="1473" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_36" canDelete="false" classfield_id="1455" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_36" canDelete="false" classfield_id="1455" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_37" canDelete="false" classfield_id="1455" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_37" canDelete="false" classfield_id="1455" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_38" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_38" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_39" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_39" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_40" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_40" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_41" canDelete="false" classfield_id="1458" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_41" canDelete="false" classfield_id="1458" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_42" canDelete="false" classfield_id="1458" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_42" canDelete="false" classfield_id="1458" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_43" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_43" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_44" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_44" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_45" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_45" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1474" tag="operation_1474" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1474" tag="operation_1474" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1476" tag="operation_1476" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1476" tag="operation_1476" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1482" tag="operation_1482" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1482" tag="operation_1482" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1486" tag="operation_1486" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1486" tag="operation_1486" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1491" tag="operation_1491" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1491" tag="operation_1491" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1493" tag="operation_1493" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1493" tag="operation_1493" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1494" tag="operation_1494" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1494" tag="operation_1494" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Reimplemented by KisSelection; here it does nothing useful, but it&amp;#010;cannot be abstract, because otherwise this class would be abstract." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1495" tag="operation_1495" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1495" tag="operation_1495" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1496" tag="operation_1496" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1496" tag="operation_1496" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1497" tag="operation_1497" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1497" tag="operation_1497" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1502" tag="operation_1502" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1502" tag="operation_1502" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1504" tag="operation_1504" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1504" tag="operation_1504" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1505" tag="operation_1505" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1505" tag="operation_1505" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1506" tag="operation_1506" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1506" tag="operation_1506" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1513" tag="operation_1513" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1513" tag="operation_1513" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1516" tag="operation_1516" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1516" tag="operation_1516" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1518" tag="operation_1518" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1519" tag="operation_1519" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1519" tag="operation_1519" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1521" tag="operation_1521" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1521" tag="operation_1521" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1524" tag="operation_1524" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1524" tag="operation_1524" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1526" tag="operation_1526" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1526" tag="operation_1526" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1527" tag="operation_1527" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1527" tag="operation_1527" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1529" tag="operation_1529" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1529" tag="operation_1529" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1530" tag="operation_1530" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1530" tag="operation_1530" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1531" tag="operation_1531" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1531" tag="operation_1531" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1532" tag="operation_1532" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1532" tag="operation_1532" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1534" tag="operation_1534" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1534" tag="operation_1534" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1539" tag="operation_1539" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1539" tag="operation_1539" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1541" tag="operation_1541" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1541" tag="operation_1541" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1543" tag="operation_1543" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1543" tag="operation_1543" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1548" tag="operation_1548" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1551" tag="operation_1551" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1551" tag="operation_1551" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1553" tag="operation_1553" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1553" tag="operation_1553" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1554" tag="operation_1554" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1554" tag="operation_1554" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1557" tag="operation_1557" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1557" tag="operation_1557" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1562" tag="operation_1562" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1562" tag="operation_1562" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1563" tag="operation_1563" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1563" tag="operation_1563" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1564" tag="operation_1564" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1564" tag="operation_1564" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1566" tag="operation_1566" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1566" tag="operation_1566" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1567" tag="operation_1567" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1567" tag="operation_1567" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1570" tag="operation_1570" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1570" tag="operation_1570" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1572" tag="operation_1572" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1572" tag="operation_1572" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1577" tag="operation_1577" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1577" tag="operation_1577" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1579" tag="operation_1579" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1579" tag="operation_1579" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1581" tag="operation_1581" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1581" tag="operation_1581" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1583" tag="operation_1583" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1583" tag="operation_1583" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1588" tag="operation_1588" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1590" tag="operation_1590" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1590" tag="operation_1590" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1592" tag="operation_1592" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1592" tag="operation_1592" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1593" tag="operation_1593" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1593" tag="operation_1593" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1594" tag="operation_1594" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1594" tag="operation_1594" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1597" tag="operation_1597" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1597" tag="operation_1597" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1598" tag="operation_1598" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1598" tag="operation_1598" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1599" tag="operation_1599" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1599" tag="operation_1599" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1600" tag="operation_1600" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1600" tag="operation_1600" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1601" tag="operation_1601" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1601" tag="operation_1601" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1602" tag="operation_1602" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1602" tag="operation_1602" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1607" tag="operation_1607" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1607" tag="operation_1607" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1609" tag="operation_1609" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1609" tag="operation_1609" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1610" tag="operation_1610" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1610" tag="operation_1610" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1612" tag="operation_1612" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1612" tag="operation_1612" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1613" tag="operation_1613" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1613" tag="operation_1613" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1615" tag="operation_1615" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1615" tag="operation_1615" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1617" tag="operation_1617" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1617" tag="operation_1617" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1618" tag="operation_1618" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1618" tag="operation_1618" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1619" tag="operation_1619" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1619" tag="operation_1619" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -14898,431 +14898,431 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispaintdevice.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>
-      <codeclassfield tqparent_id="1454" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1454" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1454" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1454" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1454" tag="hblock_tag_0" canDelete="false" classfield_id="1454" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1454" tag="hblock_tag_0" canDelete="false" classfield_id="1454" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1454" tag="hblock_tag_1" canDelete="false" classfield_id="1454" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1454" tag="hblock_tag_1" canDelete="false" classfield_id="1454" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1456" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1456" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1456" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1456" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1456" tag="hblock_tag_2" canDelete="false" classfield_id="1456" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1456" tag="hblock_tag_2" canDelete="false" classfield_id="1456" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1456" tag="hblock_tag_3" canDelete="false" classfield_id="1456" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1456" tag="hblock_tag_3" canDelete="false" classfield_id="1456" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1457" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1457" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1457" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1457" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1457" tag="hblock_tag_4" canDelete="false" classfield_id="1457" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1457" tag="hblock_tag_4" canDelete="false" classfield_id="1457" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1457" tag="hblock_tag_5" canDelete="false" classfield_id="1457" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1457" tag="hblock_tag_5" canDelete="false" classfield_id="1457" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1459" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1459" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1459" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1459" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1459" tag="hblock_tag_6" canDelete="false" classfield_id="1459" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1459" tag="hblock_tag_6" canDelete="false" classfield_id="1459" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1459" tag="hblock_tag_7" canDelete="false" classfield_id="1459" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1459" tag="hblock_tag_7" canDelete="false" classfield_id="1459" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1460" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1460" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1460" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1460" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1460" tag="hblock_tag_8" canDelete="false" classfield_id="1460" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1460" tag="hblock_tag_8" canDelete="false" classfield_id="1460" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1460" tag="hblock_tag_9" canDelete="false" classfield_id="1460" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1460" tag="hblock_tag_9" canDelete="false" classfield_id="1460" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1461" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1461" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1461" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1461" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1461" tag="hblock_tag_10" canDelete="false" classfield_id="1461" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1461" tag="hblock_tag_10" canDelete="false" classfield_id="1461" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1461" tag="hblock_tag_11" canDelete="false" classfield_id="1461" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1461" tag="hblock_tag_11" canDelete="false" classfield_id="1461" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1462" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1462" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1462" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1462" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1462" tag="hblock_tag_12" canDelete="false" classfield_id="1462" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1462" tag="hblock_tag_12" canDelete="false" classfield_id="1462" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1462" tag="hblock_tag_13" canDelete="false" classfield_id="1462" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1462" tag="hblock_tag_13" canDelete="false" classfield_id="1462" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1463" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1463" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1463" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1463" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1463" tag="hblock_tag_14" canDelete="false" classfield_id="1463" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1463" tag="hblock_tag_14" canDelete="false" classfield_id="1463" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1463" tag="hblock_tag_15" canDelete="false" classfield_id="1463" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1463" tag="hblock_tag_15" canDelete="false" classfield_id="1463" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1464" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1464" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1464" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1464" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1464" tag="hblock_tag_16" canDelete="false" classfield_id="1464" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1464" tag="hblock_tag_16" canDelete="false" classfield_id="1464" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1464" tag="hblock_tag_17" canDelete="false" classfield_id="1464" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1464" tag="hblock_tag_17" canDelete="false" classfield_id="1464" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1465" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1465" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1465" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1465" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1465" tag="hblock_tag_18" canDelete="false" classfield_id="1465" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1465" tag="hblock_tag_18" canDelete="false" classfield_id="1465" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1465" tag="hblock_tag_19" canDelete="false" classfield_id="1465" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1465" tag="hblock_tag_19" canDelete="false" classfield_id="1465" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1466" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1466" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1466" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1466" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1466" tag="hblock_tag_20" canDelete="false" classfield_id="1466" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1466" tag="hblock_tag_20" canDelete="false" classfield_id="1466" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1466" tag="hblock_tag_21" canDelete="false" classfield_id="1466" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1466" tag="hblock_tag_21" canDelete="false" classfield_id="1466" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1467" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1467" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1467" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1467" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1467" tag="hblock_tag_22" canDelete="false" classfield_id="1467" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1467" tag="hblock_tag_22" canDelete="false" classfield_id="1467" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1467" tag="hblock_tag_23" canDelete="false" classfield_id="1467" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1467" tag="hblock_tag_23" canDelete="false" classfield_id="1467" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1468" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1468" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1468" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1468" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1468" tag="hblock_tag_24" canDelete="false" classfield_id="1468" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1468" tag="hblock_tag_24" canDelete="false" classfield_id="1468" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1468" tag="hblock_tag_25" canDelete="false" classfield_id="1468" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1468" tag="hblock_tag_25" canDelete="false" classfield_id="1468" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1469" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1469" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1469" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1469" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1469" tag="hblock_tag_26" canDelete="false" classfield_id="1469" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1469" tag="hblock_tag_26" canDelete="false" classfield_id="1469" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1469" tag="hblock_tag_27" canDelete="false" classfield_id="1469" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1469" tag="hblock_tag_27" canDelete="false" classfield_id="1469" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1470" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1470" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1470" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1470" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1470" tag="hblock_tag_28" canDelete="false" classfield_id="1470" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1470" tag="hblock_tag_28" canDelete="false" classfield_id="1470" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1470" tag="hblock_tag_29" canDelete="false" classfield_id="1470" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1470" tag="hblock_tag_29" canDelete="false" classfield_id="1470" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1471" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1471" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1471" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1471" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1471" tag="hblock_tag_30" canDelete="false" classfield_id="1471" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1471" tag="hblock_tag_30" canDelete="false" classfield_id="1471" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1471" tag="hblock_tag_31" canDelete="false" classfield_id="1471" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1471" tag="hblock_tag_31" canDelete="false" classfield_id="1471" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1472" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1472" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1472" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1472" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1472" tag="hblock_tag_32" canDelete="false" classfield_id="1472" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1472" tag="hblock_tag_32" canDelete="false" classfield_id="1472" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1472" tag="hblock_tag_33" canDelete="false" classfield_id="1472" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1472" tag="hblock_tag_33" canDelete="false" classfield_id="1472" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1473" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1473" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1473" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1473" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1473" tag="hblock_tag_34" canDelete="false" classfield_id="1473" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1473" tag="hblock_tag_34" canDelete="false" classfield_id="1473" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1473" tag="hblock_tag_35" canDelete="false" classfield_id="1473" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1473" tag="hblock_tag_35" canDelete="false" classfield_id="1473" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1455" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1455" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1455" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1455" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_36" canDelete="false" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_36" canDelete="false" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_37" canDelete="false" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_37" canDelete="false" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_38" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_38" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_39" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_39" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_40" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_40" canDelete="false" writeOutText="false" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1458" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1458" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1458" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1458" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_41" canDelete="false" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_41" canDelete="false" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_42" canDelete="false" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_42" canDelete="false" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_43" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_43" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_44" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_44" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_45" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_45" canDelete="false" writeOutText="false" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -15330,9 +15330,9 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1620" tqparent_class="1620" fileExt=".cpp" fileName="kislayer" >
+    <classifiercodedocument writeOutCode="true" package="" id="1620" parent_class="1620" fileExt=".cpp" fileName="kislayer" >
      <textblocks>
-      <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;kistilemgrsp.h&quot;&amp;#010;#include &quot;kistqmasksp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
+      <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;kistilemgrsp.h&quot;&amp;#010;#include &quot;kismasksp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
         <cppcodedocumentation tag="" writeOutText="false" />
        </header>
@@ -15348,157 +15348,157 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1621" tag="hblock_tag_0" canDelete="false" classfield_id="1621" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1621" tag="hblock_tag_0" canDelete="false" classfield_id="1621" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1621" tag="hblock_tag_1" canDelete="false" classfield_id="1621" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1621" tag="hblock_tag_1" canDelete="false" classfield_id="1621" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1622" tag="hblock_tag_2" canDelete="false" classfield_id="1622" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1622" tag="hblock_tag_2" canDelete="false" classfield_id="1622" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1622" tag="hblock_tag_3" canDelete="false" classfield_id="1622" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1622" tag="hblock_tag_3" canDelete="false" classfield_id="1622" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1623" tag="hblock_tag_4" canDelete="false" classfield_id="1623" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1623" tag="hblock_tag_4" canDelete="false" classfield_id="1623" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1623" tag="hblock_tag_5" canDelete="false" classfield_id="1623" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1623" tag="hblock_tag_5" canDelete="false" classfield_id="1623" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1624" tag="hblock_tag_6" canDelete="false" classfield_id="1624" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1624" tag="hblock_tag_6" canDelete="false" classfield_id="1624" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1624" tag="hblock_tag_7" canDelete="false" classfield_id="1624" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1624" tag="hblock_tag_7" canDelete="false" classfield_id="1624" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1625" tag="hblock_tag_8" canDelete="false" classfield_id="1625" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1625" tag="hblock_tag_8" canDelete="false" classfield_id="1625" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1625" tag="hblock_tag_9" canDelete="false" classfield_id="1625" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1625" tag="hblock_tag_9" canDelete="false" classfield_id="1625" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1626" tag="hblock_tag_10" canDelete="false" classfield_id="1626" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1626" tag="hblock_tag_10" canDelete="false" classfield_id="1626" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1626" tag="hblock_tag_11" canDelete="false" classfield_id="1626" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1626" tag="hblock_tag_11" canDelete="false" classfield_id="1626" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1627" tag="hblock_tag_12" canDelete="false" classfield_id="1627" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1627" tag="hblock_tag_12" canDelete="false" classfield_id="1627" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1627" tag="hblock_tag_13" canDelete="false" classfield_id="1627" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1627" tag="hblock_tag_13" canDelete="false" classfield_id="1627" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1628" tag="operation_1628" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1628" tag="operation_1628" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1634" tag="operation_1634" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1634" tag="operation_1634" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1639" tag="operation_1639" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1639" tag="operation_1639" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1644" tag="operation_1644" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1644" tag="operation_1644" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1646" tag="operation_1646" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1646" tag="operation_1646" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1647" tag="operation_1647" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1647" tag="operation_1647" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1649" tag="operation_1649" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1649" tag="operation_1649" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1651" tag="operation_1651" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1651" tag="operation_1651" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1653" tag="operation_1653" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1653" tag="operation_1653" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1654" tag="operation_1654" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1654" tag="operation_1654" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1656" tag="operation_1656" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1656" tag="operation_1656" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1657" tag="operation_1657" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1657" tag="operation_1657" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1658" tag="operation_1658" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1658" tag="operation_1658" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1660" tag="operation_1660" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1660" tag="operation_1660" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1663" tag="operation_1663" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1663" tag="operation_1663" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1664" tag="operation_1664" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1664" tag="operation_1664" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1666" tag="operation_1666" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1666" tag="operation_1666" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -15510,141 +15510,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kislayer.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>
-      <codeclassfield tqparent_id="1621" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1621" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1621" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1621" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1621" tag="hblock_tag_0" canDelete="false" classfield_id="1621" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1621" tag="hblock_tag_0" canDelete="false" classfield_id="1621" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1621" tag="hblock_tag_1" canDelete="false" classfield_id="1621" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1621" tag="hblock_tag_1" canDelete="false" classfield_id="1621" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1622" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1622" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1622" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1622" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1622" tag="hblock_tag_2" canDelete="false" classfield_id="1622" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1622" tag="hblock_tag_2" canDelete="false" classfield_id="1622" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1622" tag="hblock_tag_3" canDelete="false" classfield_id="1622" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1622" tag="hblock_tag_3" canDelete="false" classfield_id="1622" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1623" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1623" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1623" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1623" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1623" tag="hblock_tag_4" canDelete="false" classfield_id="1623" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1623" tag="hblock_tag_4" canDelete="false" classfield_id="1623" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1623" tag="hblock_tag_5" canDelete="false" classfield_id="1623" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1623" tag="hblock_tag_5" canDelete="false" classfield_id="1623" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1624" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1624" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1624" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1624" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1624" tag="hblock_tag_6" canDelete="false" classfield_id="1624" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1624" tag="hblock_tag_6" canDelete="false" classfield_id="1624" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1624" tag="hblock_tag_7" canDelete="false" classfield_id="1624" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1624" tag="hblock_tag_7" canDelete="false" classfield_id="1624" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1625" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1625" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1625" tag="hblock_tag_8" canDelete="false" classfield_id="1625" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1625" tag="hblock_tag_8" canDelete="false" classfield_id="1625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1625" tag="hblock_tag_9" canDelete="false" classfield_id="1625" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1625" tag="hblock_tag_9" canDelete="false" classfield_id="1625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1626" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1626" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1626" tag="hblock_tag_10" canDelete="false" classfield_id="1626" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1626" tag="hblock_tag_10" canDelete="false" classfield_id="1626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1626" tag="hblock_tag_11" canDelete="false" classfield_id="1626" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1626" tag="hblock_tag_11" canDelete="false" classfield_id="1626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1627" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1627" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1627" tag="hblock_tag_12" canDelete="false" classfield_id="1627" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1627" tag="hblock_tag_12" canDelete="false" classfield_id="1627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1627" tag="hblock_tag_13" canDelete="false" classfield_id="1627" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1627" tag="hblock_tag_13" canDelete="false" classfield_id="1627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -15652,7 +15652,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1667" tqparent_class="1667" fileExt=".cpp" fileName="kisnameserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="1667" parent_class="1667" fileExt=".cpp" fileName="kisnameserver" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -15670,47 +15670,47 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1668" tag="hblock_tag_0" canDelete="false" classfield_id="1668" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1668" tag="hblock_tag_0" canDelete="false" classfield_id="1668" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1668" tag="hblock_tag_1" canDelete="false" classfield_id="1668" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1668" tag="hblock_tag_1" canDelete="false" classfield_id="1668" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1669" tag="hblock_tag_2" canDelete="false" classfield_id="1669" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1669" tag="hblock_tag_2" canDelete="false" classfield_id="1669" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1669" tag="hblock_tag_3" canDelete="false" classfield_id="1669" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1669" tag="hblock_tag_3" canDelete="false" classfield_id="1669" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1670" tag="operation_1670" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1670" tag="operation_1670" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1673" tag="operation_1673" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1673" tag="operation_1673" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1674" tag="operation_1674" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1674" tag="operation_1674" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1675" tag="operation_1675" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1675" tag="operation_1675" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1676" tag="operation_1676" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1676" tag="operation_1676" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -15722,41 +15722,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisnameserver.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>
-      <codeclassfield tqparent_id="1668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1668" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1668" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1668" tag="hblock_tag_0" canDelete="false" classfield_id="1668" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1668" tag="hblock_tag_0" canDelete="false" classfield_id="1668" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1668" tag="hblock_tag_1" canDelete="false" classfield_id="1668" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1668" tag="hblock_tag_1" canDelete="false" classfield_id="1668" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1669" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1669" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1669" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1669" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1669" tag="hblock_tag_2" canDelete="false" classfield_id="1669" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1669" tag="hblock_tag_2" canDelete="false" classfield_id="1669" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1669" tag="hblock_tag_3" canDelete="false" classfield_id="1669" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1669" tag="hblock_tag_3" canDelete="false" classfield_id="1669" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -15764,7 +15764,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1677" tqparent_class="1677" fileExt=".cpp" fileName="kismemento" >
+    <classifiercodedocument writeOutCode="true" package="" id="1677" parent_class="1677" fileExt=".cpp" fileName="kismemento" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -15782,7 +15782,7 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1678" tag="operation_1678" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1678" tag="operation_1678" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -15795,7 +15795,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1679" tqparent_class="1679" fileExt=".cpp" fileName="kispaintdevicevisitor" >
+    <classifiercodedocument writeOutCode="true" package="" id="1679" parent_class="1679" fileExt=".cpp" fileName="kispaintdevicevisitor" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;#include &quot;kispaintdevicesp.h&quot;&amp;#010;#include &quot;kisselectionsp.h&quot;&amp;#010;" >
        <header>
@@ -15813,62 +15813,62 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1680" tag="operation_1680" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1680" tag="operation_1680" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1683" tag="operation_1683" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1683" tag="operation_1683" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1686" tag="operation_1686" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1686" tag="operation_1686" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1689" tag="operation_1689" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1689" tag="operation_1689" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1692" tag="operation_1692" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1692" tag="operation_1692" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1695" tag="operation_1695" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1695" tag="operation_1695" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1696" tag="operation_1696" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1696" tag="operation_1696" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1699" tag="operation_1699" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1699" tag="operation_1699" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1702" tag="operation_1702" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1702" tag="operation_1702" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1705" tag="operation_1705" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1705" tag="operation_1705" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1708" tag="operation_1708" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1708" tag="operation_1708" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1711" tag="operation_1711" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1711" tag="operation_1711" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -15881,7 +15881,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1712" tqparent_class="1712" fileExt=".cpp" fileName="kismementooriginatorinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="1712" parent_class="1712" fileExt=".cpp" fileName="kismementooriginatorinterface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kismementosp.h&quot;&amp;#010;" >
        <header>
@@ -15899,32 +15899,32 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1713" tag="operation_1713" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1713" tag="operation_1713" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1715" tag="operation_1715" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1715" tag="operation_1715" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1716" tag="operation_1716" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1716" tag="operation_1716" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1718" tag="operation_1718" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1718" tag="operation_1718" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1720" tag="operation_1720" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="1720" tag="operation_1720" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1721" tag="operation_1721" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1721" tag="operation_1721" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -15937,7 +15937,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1722" tqparent_class="1722" fileExt=".cpp" fileName="kistqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="1722" parent_class="1722" fileExt=".cpp" fileName="kistqmask" >
      <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>
@@ -15955,47 +15955,47 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="1723" tag="operation_1723" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1723" tag="operation_1723" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1729" tag="operation_1729" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1729" tag="operation_1729" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1731" tag="operation_1731" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1731" tag="operation_1731" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1732" tag="operation_1732" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1732" tag="operation_1732" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1734" tag="operation_1734" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1735" tag="operation_1735" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1735" tag="operation_1735" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1737" tag="operation_1737" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1737" tag="operation_1737" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1738" tag="operation_1738" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1738" tag="operation_1738" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1740" tag="operation_1740" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1740" tag="operation_1740" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -16008,7 +16008,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1741" tqparent_class="1741" fileExt=".cpp" fileName="kisimagepipebrush" >
+    <classifiercodedocument writeOutCode="true" package="" id="1741" parent_class="1741" fileExt=".cpp" fileName="kisimagepipebrush" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -16026,147 +16026,147 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1743" tag="hblock_tag_0" canDelete="false" classfield_id="1743" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1743" tag="hblock_tag_0" canDelete="false" classfield_id="1743" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1743" tag="hblock_tag_1" canDelete="false" classfield_id="1743" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1743" tag="hblock_tag_1" canDelete="false" classfield_id="1743" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1744" tag="hblock_tag_2" canDelete="false" classfield_id="1744" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1744" tag="hblock_tag_2" canDelete="false" classfield_id="1744" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1744" tag="hblock_tag_3" canDelete="false" classfield_id="1744" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1744" tag="hblock_tag_3" canDelete="false" classfield_id="1744" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1745" tag="hblock_tag_4" canDelete="false" classfield_id="1745" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1745" tag="hblock_tag_4" canDelete="false" classfield_id="1745" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1745" tag="hblock_tag_5" canDelete="false" classfield_id="1745" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1745" tag="hblock_tag_5" canDelete="false" classfield_id="1745" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1746" tag="hblock_tag_6" canDelete="false" classfield_id="1746" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1746" tag="hblock_tag_6" canDelete="false" classfield_id="1746" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1746" tag="hblock_tag_7" canDelete="false" classfield_id="1746" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1746" tag="hblock_tag_7" canDelete="false" classfield_id="1746" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1747" tag="hblock_tag_8" canDelete="false" classfield_id="1747" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1747" tag="hblock_tag_8" canDelete="false" classfield_id="1747" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1747" tag="hblock_tag_9" canDelete="false" classfield_id="1747" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1747" tag="hblock_tag_9" canDelete="false" classfield_id="1747" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1748" tag="hblock_tag_10" canDelete="false" classfield_id="1748" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1748" tag="hblock_tag_10" canDelete="false" classfield_id="1748" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1748" tag="hblock_tag_11" canDelete="false" classfield_id="1748" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1748" tag="hblock_tag_11" canDelete="false" classfield_id="1748" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1749" tag="hblock_tag_12" canDelete="false" classfield_id="1749" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1749" tag="hblock_tag_12" canDelete="false" classfield_id="1749" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1749" tag="hblock_tag_13" canDelete="false" classfield_id="1749" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1749" tag="hblock_tag_13" canDelete="false" classfield_id="1749" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_14" canDelete="false" classfield_id="1742" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_14" canDelete="false" classfield_id="1742" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_15" canDelete="false" classfield_id="1742" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_15" canDelete="false" classfield_id="1742" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1750" tag="operation_1750" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1750" tag="operation_1750" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1752" tag="operation_1752" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1752" tag="operation_1752" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1753" tag="operation_1753" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1753" tag="operation_1753" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1754" tag="operation_1754" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1754" tag="operation_1754" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="@return the next image in the pipe." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1755" tag="operation_1755" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1755" tag="operation_1755" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1756" tag="operation_1756" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1756" tag="operation_1756" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="@return the next tqmask in the pipe." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1758" tag="operation_1758" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1758" tag="operation_1758" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1759" tag="operation_1759" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1759" tag="operation_1759" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1761" tag="operation_1761" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1761" tag="operation_1761" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1763" tag="operation_1763" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1763" tag="operation_1763" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -16178,176 +16178,176 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimagepipebrush.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>
-      <codeclassfield tqparent_id="1743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1743" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1743" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1743" tag="hblock_tag_0" canDelete="false" classfield_id="1743" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1743" tag="hblock_tag_0" canDelete="false" classfield_id="1743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1743" tag="hblock_tag_1" canDelete="false" classfield_id="1743" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1743" tag="hblock_tag_1" canDelete="false" classfield_id="1743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1744" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1744" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1744" tag="hblock_tag_2" canDelete="false" classfield_id="1744" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1744" tag="hblock_tag_2" canDelete="false" classfield_id="1744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1744" tag="hblock_tag_3" canDelete="false" classfield_id="1744" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1744" tag="hblock_tag_3" canDelete="false" classfield_id="1744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1745" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1745" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1745" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1745" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1745" tag="hblock_tag_4" canDelete="false" classfield_id="1745" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1745" tag="hblock_tag_4" canDelete="false" classfield_id="1745" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1745" tag="hblock_tag_5" canDelete="false" classfield_id="1745" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1745" tag="hblock_tag_5" canDelete="false" classfield_id="1745" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1746" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1746" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1746" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1746" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1746" tag="hblock_tag_6" canDelete="false" classfield_id="1746" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1746" tag="hblock_tag_6" canDelete="false" classfield_id="1746" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1746" tag="hblock_tag_7" canDelete="false" classfield_id="1746" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1746" tag="hblock_tag_7" canDelete="false" classfield_id="1746" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1747" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1747" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1747" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1747" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1747" tag="hblock_tag_8" canDelete="false" classfield_id="1747" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1747" tag="hblock_tag_8" canDelete="false" classfield_id="1747" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1747" tag="hblock_tag_9" canDelete="false" classfield_id="1747" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1747" tag="hblock_tag_9" canDelete="false" classfield_id="1747" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1748" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1748" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1748" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1748" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1748" tag="hblock_tag_10" canDelete="false" classfield_id="1748" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1748" tag="hblock_tag_10" canDelete="false" classfield_id="1748" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1748" tag="hblock_tag_11" canDelete="false" classfield_id="1748" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1748" tag="hblock_tag_11" canDelete="false" classfield_id="1748" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1749" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1749" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1749" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1749" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1749" tag="hblock_tag_12" canDelete="false" classfield_id="1749" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1749" tag="hblock_tag_12" canDelete="false" classfield_id="1749" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1749" tag="hblock_tag_13" canDelete="false" classfield_id="1749" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1749" tag="hblock_tag_13" canDelete="false" classfield_id="1749" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1742" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1742" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1742" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1742" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_14" canDelete="false" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_14" canDelete="false" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_15" canDelete="false" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_15" canDelete="false" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -16355,7 +16355,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1767" tqparent_class="1767" fileExt=".cpp" fileName="kispainter" >
+    <classifiercodedocument writeOutCode="true" package="" id="1767" parent_class="1767" fileExt=".cpp" fileName="kispainter" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kispaintdevicesp.h&quot;&amp;#010;#include &quot;compositeop.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;float.h&quot;&amp;#010;#include &quot;kistilesp.h&quot;&amp;#010;#include &quot;kislayersp.h&quot;&amp;#010;" >
        <header>
@@ -16373,357 +16373,357 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1768" tag="hblock_tag_0" canDelete="false" classfield_id="1768" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1768" tag="hblock_tag_0" canDelete="false" classfield_id="1768" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1768" tag="hblock_tag_1" canDelete="false" classfield_id="1768" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1768" tag="hblock_tag_1" canDelete="false" classfield_id="1768" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1770" tag="hblock_tag_2" canDelete="false" classfield_id="1770" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1770" tag="hblock_tag_2" canDelete="false" classfield_id="1770" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1770" tag="hblock_tag_3" canDelete="false" classfield_id="1770" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1770" tag="hblock_tag_3" canDelete="false" classfield_id="1770" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1771" tag="hblock_tag_4" canDelete="false" classfield_id="1771" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1771" tag="hblock_tag_4" canDelete="false" classfield_id="1771" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1771" tag="hblock_tag_5" canDelete="false" classfield_id="1771" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1771" tag="hblock_tag_5" canDelete="false" classfield_id="1771" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1772" tag="hblock_tag_6" canDelete="false" classfield_id="1772" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1772" tag="hblock_tag_6" canDelete="false" classfield_id="1772" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1772" tag="hblock_tag_7" canDelete="false" classfield_id="1772" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1772" tag="hblock_tag_7" canDelete="false" classfield_id="1772" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1773" tag="hblock_tag_8" canDelete="false" classfield_id="1773" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1773" tag="hblock_tag_8" canDelete="false" classfield_id="1773" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1773" tag="hblock_tag_9" canDelete="false" classfield_id="1773" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1773" tag="hblock_tag_9" canDelete="false" classfield_id="1773" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1774" tag="hblock_tag_10" canDelete="false" classfield_id="1774" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1774" tag="hblock_tag_10" canDelete="false" classfield_id="1774" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1774" tag="hblock_tag_11" canDelete="false" classfield_id="1774" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1774" tag="hblock_tag_11" canDelete="false" classfield_id="1774" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1775" tag="hblock_tag_12" canDelete="false" classfield_id="1775" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1775" tag="hblock_tag_12" canDelete="false" classfield_id="1775" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1775" tag="hblock_tag_13" canDelete="false" classfield_id="1775" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1775" tag="hblock_tag_13" canDelete="false" classfield_id="1775" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1777" tag="hblock_tag_14" canDelete="false" classfield_id="1777" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1777" tag="hblock_tag_14" canDelete="false" classfield_id="1777" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1777" tag="hblock_tag_15" canDelete="false" classfield_id="1777" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1777" tag="hblock_tag_15" canDelete="false" classfield_id="1777" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1778" tag="hblock_tag_16" canDelete="false" classfield_id="1778" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1778" tag="hblock_tag_16" canDelete="false" classfield_id="1778" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1778" tag="hblock_tag_17" canDelete="false" classfield_id="1778" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1778" tag="hblock_tag_17" canDelete="false" classfield_id="1778" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1779" tag="hblock_tag_18" canDelete="false" classfield_id="1779" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1779" tag="hblock_tag_18" canDelete="false" classfield_id="1779" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1779" tag="hblock_tag_19" canDelete="false" classfield_id="1779" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1779" tag="hblock_tag_19" canDelete="false" classfield_id="1779" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1780" tag="hblock_tag_20" canDelete="false" classfield_id="1780" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1780" tag="hblock_tag_20" canDelete="false" classfield_id="1780" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1780" tag="hblock_tag_21" canDelete="false" classfield_id="1780" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1780" tag="hblock_tag_21" canDelete="false" classfield_id="1780" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1781" tag="hblock_tag_22" canDelete="false" classfield_id="1781" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1781" tag="hblock_tag_22" canDelete="false" classfield_id="1781" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1781" tag="hblock_tag_23" canDelete="false" classfield_id="1781" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1781" tag="hblock_tag_23" canDelete="false" classfield_id="1781" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1782" tag="hblock_tag_24" canDelete="false" classfield_id="1782" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1782" tag="hblock_tag_24" canDelete="false" classfield_id="1782" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1782" tag="hblock_tag_25" canDelete="false" classfield_id="1782" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1782" tag="hblock_tag_25" canDelete="false" classfield_id="1782" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1783" tag="hblock_tag_26" canDelete="false" classfield_id="1783" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1783" tag="hblock_tag_26" canDelete="false" classfield_id="1783" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1783" tag="hblock_tag_27" canDelete="false" classfield_id="1783" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1783" tag="hblock_tag_27" canDelete="false" classfield_id="1783" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_28" canDelete="false" classfield_id="1769" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_28" canDelete="false" classfield_id="1769" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_29" canDelete="false" classfield_id="1769" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_29" canDelete="false" classfield_id="1769" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_33" canDelete="false" classfield_id="1776" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_33" canDelete="false" classfield_id="1776" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_34" canDelete="false" classfield_id="1776" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_34" canDelete="false" classfield_id="1776" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_35" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_35" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_36" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_36" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_37" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_37" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1784" tag="operation_1784" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1784" tag="operation_1784" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1786" tag="operation_1786" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1786" tag="operation_1786" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1787" tag="operation_1787" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1787" tag="operation_1787" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1789" tag="operation_1789" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1789" tag="operation_1789" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1791" tag="operation_1791" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1791" tag="operation_1791" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1793" tag="operation_1793" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1793" tag="operation_1793" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1795" tag="operation_1795" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1795" tag="operation_1795" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1805" tag="operation_1805" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1805" tag="operation_1805" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1814" tag="operation_1814" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1814" tag="operation_1814" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1816" tag="operation_1816" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1816" tag="operation_1816" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1817" tag="operation_1817" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1817" tag="operation_1817" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1818" tag="operation_1818" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1818" tag="operation_1818" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1819" tag="operation_1819" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1819" tag="operation_1819" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1820" tag="operation_1820" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1820" tag="operation_1820" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1825" tag="operation_1825" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1825" tag="operation_1825" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1832" tag="operation_1832" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1832" tag="operation_1832" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1837" tag="operation_1837" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1837" tag="operation_1837" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1839" tag="operation_1839" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1839" tag="operation_1839" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1845" tag="operation_1845" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1845" tag="operation_1845" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1852" tag="operation_1852" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1852" tag="operation_1852" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1855" tag="operation_1855" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1855" tag="operation_1855" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1859" tag="operation_1859" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1859" tag="operation_1859" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1864" tag="operation_1864" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1864" tag="operation_1864" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1871" tag="operation_1871" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1871" tag="operation_1871" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1873" tag="operation_1873" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1873" tag="operation_1873" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1875" tag="operation_1875" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1875" tag="operation_1875" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1877" tag="operation_1877" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1877" tag="operation_1877" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1879" tag="operation_1879" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1879" tag="operation_1879" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1881" tag="operation_1881" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1881" tag="operation_1881" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1883" tag="operation_1883" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1883" tag="operation_1883" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1885" tag="operation_1885" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1894" tag="operation_1894" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1894" tag="operation_1894" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1902" tag="operation_1902" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1902" tag="operation_1902" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -16735,351 +16735,351 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispainter.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>
-      <codeclassfield tqparent_id="1768" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1768" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1768" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1768" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1768" tag="hblock_tag_0" canDelete="false" classfield_id="1768" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1768" tag="hblock_tag_0" canDelete="false" classfield_id="1768" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1768" tag="hblock_tag_1" canDelete="false" classfield_id="1768" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1768" tag="hblock_tag_1" canDelete="false" classfield_id="1768" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1770" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1770" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1770" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1770" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1770" tag="hblock_tag_2" canDelete="false" classfield_id="1770" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1770" tag="hblock_tag_2" canDelete="false" classfield_id="1770" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1770" tag="hblock_tag_3" canDelete="false" classfield_id="1770" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1770" tag="hblock_tag_3" canDelete="false" classfield_id="1770" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1771" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1771" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1771" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1771" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1771" tag="hblock_tag_4" canDelete="false" classfield_id="1771" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1771" tag="hblock_tag_4" canDelete="false" classfield_id="1771" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1771" tag="hblock_tag_5" canDelete="false" classfield_id="1771" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1771" tag="hblock_tag_5" canDelete="false" classfield_id="1771" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1772" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1772" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1772" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1772" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1772" tag="hblock_tag_6" canDelete="false" classfield_id="1772" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1772" tag="hblock_tag_6" canDelete="false" classfield_id="1772" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1772" tag="hblock_tag_7" canDelete="false" classfield_id="1772" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1772" tag="hblock_tag_7" canDelete="false" classfield_id="1772" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1773" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1773" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1773" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1773" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1773" tag="hblock_tag_8" canDelete="false" classfield_id="1773" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1773" tag="hblock_tag_8" canDelete="false" classfield_id="1773" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1773" tag="hblock_tag_9" canDelete="false" classfield_id="1773" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1773" tag="hblock_tag_9" canDelete="false" classfield_id="1773" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1774" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1774" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1774" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1774" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1774" tag="hblock_tag_10" canDelete="false" classfield_id="1774" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1774" tag="hblock_tag_10" canDelete="false" classfield_id="1774" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1774" tag="hblock_tag_11" canDelete="false" classfield_id="1774" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1774" tag="hblock_tag_11" canDelete="false" classfield_id="1774" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1775" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1775" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1775" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1775" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1775" tag="hblock_tag_12" canDelete="false" classfield_id="1775" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1775" tag="hblock_tag_12" canDelete="false" classfield_id="1775" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1775" tag="hblock_tag_13" canDelete="false" classfield_id="1775" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1775" tag="hblock_tag_13" canDelete="false" classfield_id="1775" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1777" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1777" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1777" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1777" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1777" tag="hblock_tag_14" canDelete="false" classfield_id="1777" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1777" tag="hblock_tag_14" canDelete="false" classfield_id="1777" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1777" tag="hblock_tag_15" canDelete="false" classfield_id="1777" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1777" tag="hblock_tag_15" canDelete="false" classfield_id="1777" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1778" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1778" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1778" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1778" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1778" tag="hblock_tag_16" canDelete="false" classfield_id="1778" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1778" tag="hblock_tag_16" canDelete="false" classfield_id="1778" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1778" tag="hblock_tag_17" canDelete="false" classfield_id="1778" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1778" tag="hblock_tag_17" canDelete="false" classfield_id="1778" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1779" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1779" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1779" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1779" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1779" tag="hblock_tag_18" canDelete="false" classfield_id="1779" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1779" tag="hblock_tag_18" canDelete="false" classfield_id="1779" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1779" tag="hblock_tag_19" canDelete="false" classfield_id="1779" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1779" tag="hblock_tag_19" canDelete="false" classfield_id="1779" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1780" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1780" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1780" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1780" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1780" tag="hblock_tag_20" canDelete="false" classfield_id="1780" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1780" tag="hblock_tag_20" canDelete="false" classfield_id="1780" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1780" tag="hblock_tag_21" canDelete="false" classfield_id="1780" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1780" tag="hblock_tag_21" canDelete="false" classfield_id="1780" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1781" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1781" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1781" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1781" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1781" tag="hblock_tag_22" canDelete="false" classfield_id="1781" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1781" tag="hblock_tag_22" canDelete="false" classfield_id="1781" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1781" tag="hblock_tag_23" canDelete="false" classfield_id="1781" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1781" tag="hblock_tag_23" canDelete="false" classfield_id="1781" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1782" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1782" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1782" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1782" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1782" tag="hblock_tag_24" canDelete="false" classfield_id="1782" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1782" tag="hblock_tag_24" canDelete="false" classfield_id="1782" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1782" tag="hblock_tag_25" canDelete="false" classfield_id="1782" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1782" tag="hblock_tag_25" canDelete="false" classfield_id="1782" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1783" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1783" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1783" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1783" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1783" tag="hblock_tag_26" canDelete="false" classfield_id="1783" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1783" tag="hblock_tag_26" canDelete="false" classfield_id="1783" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1783" tag="hblock_tag_27" canDelete="false" classfield_id="1783" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1783" tag="hblock_tag_27" canDelete="false" classfield_id="1783" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1769" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1769" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1769" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1769" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_28" canDelete="false" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_28" canDelete="false" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_29" canDelete="false" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_29" canDelete="false" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_30" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_31" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_32" canDelete="false" writeOutText="false" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1776" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1776" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1776" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1776" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_33" canDelete="false" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_33" canDelete="false" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_34" canDelete="false" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_34" canDelete="false" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_35" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_35" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_36" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_36" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_37" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_37" canDelete="false" writeOutText="false" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -17087,7 +17087,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1903" tqparent_class="1903" fileExt=".cpp" fileName="kisselection" >
+    <classifiercodedocument writeOutCode="true" package="" id="1903" parent_class="1903" fileExt=".cpp" fileName="kisselection" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kispaintdevicesp.h&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -17105,142 +17105,142 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1904" tag="hblock_tag_0" canDelete="false" classfield_id="1904" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1904" tag="hblock_tag_0" canDelete="false" classfield_id="1904" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1904" tag="hblock_tag_1" canDelete="false" classfield_id="1904" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1904" tag="hblock_tag_1" canDelete="false" classfield_id="1904" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1905" tag="hblock_tag_2" canDelete="false" classfield_id="1905" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1905" tag="hblock_tag_2" canDelete="false" classfield_id="1905" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1905" tag="hblock_tag_3" canDelete="false" classfield_id="1905" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1905" tag="hblock_tag_3" canDelete="false" classfield_id="1905" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1906" tag="hblock_tag_4" canDelete="false" classfield_id="1906" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1906" tag="hblock_tag_4" canDelete="false" classfield_id="1906" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1906" tag="hblock_tag_5" canDelete="false" classfield_id="1906" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1906" tag="hblock_tag_5" canDelete="false" classfield_id="1906" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1907" tag="hblock_tag_6" canDelete="false" classfield_id="1907" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1907" tag="hblock_tag_6" canDelete="false" classfield_id="1907" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1907" tag="hblock_tag_7" canDelete="false" classfield_id="1907" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1907" tag="hblock_tag_7" canDelete="false" classfield_id="1907" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1908" tag="hblock_tag_8" canDelete="false" classfield_id="1908" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1908" tag="hblock_tag_8" canDelete="false" classfield_id="1908" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1908" tag="hblock_tag_9" canDelete="false" classfield_id="1908" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1908" tag="hblock_tag_9" canDelete="false" classfield_id="1908" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1909" tag="hblock_tag_10" canDelete="false" classfield_id="1909" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1909" tag="hblock_tag_10" canDelete="false" classfield_id="1909" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1909" tag="hblock_tag_11" canDelete="false" classfield_id="1909" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1909" tag="hblock_tag_11" canDelete="false" classfield_id="1909" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1910" tag="hblock_tag_12" canDelete="false" classfield_id="1910" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1910" tag="hblock_tag_12" canDelete="false" classfield_id="1910" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1910" tag="hblock_tag_13" canDelete="false" classfield_id="1910" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1910" tag="hblock_tag_13" canDelete="false" classfield_id="1910" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1911" tag="operation_1911" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1911" tag="operation_1911" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1916" tag="operation_1916" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1916" tag="operation_1916" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1921" tag="operation_1921" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1921" tag="operation_1921" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1922" tag="operation_1922" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1922" tag="operation_1922" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1924" tag="operation_1924" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1924" tag="operation_1924" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1925" tag="operation_1925" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1925" tag="operation_1925" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1927" tag="operation_1927" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1927" tag="operation_1927" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1930" tag="operation_1930" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1930" tag="operation_1930" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1931" tag="operation_1931" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1931" tag="operation_1931" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1936" tag="operation_1936" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1936" tag="operation_1936" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1938" tag="operation_1938" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1938" tag="operation_1938" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1940" tag="operation_1940" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1940" tag="operation_1940" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1941" tag="operation_1941" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1941" tag="operation_1941" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1942" tag="operation_1942" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1942" tag="operation_1942" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -17252,141 +17252,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisselection.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:50:04&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1904" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1904" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1904" tag="hblock_tag_0" canDelete="false" classfield_id="1904" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1904" tag="hblock_tag_0" canDelete="false" classfield_id="1904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1904" tag="hblock_tag_1" canDelete="false" classfield_id="1904" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1904" tag="hblock_tag_1" canDelete="false" classfield_id="1904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1905" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1905" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1905" tag="hblock_tag_2" canDelete="false" classfield_id="1905" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1905" tag="hblock_tag_2" canDelete="false" classfield_id="1905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1905" tag="hblock_tag_3" canDelete="false" classfield_id="1905" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1905" tag="hblock_tag_3" canDelete="false" classfield_id="1905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1906" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1906" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1906" tag="hblock_tag_4" canDelete="false" classfield_id="1906" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1906" tag="hblock_tag_4" canDelete="false" classfield_id="1906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1906" tag="hblock_tag_5" canDelete="false" classfield_id="1906" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1906" tag="hblock_tag_5" canDelete="false" classfield_id="1906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1907" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1907" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1907" tag="hblock_tag_6" canDelete="false" classfield_id="1907" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1907" tag="hblock_tag_6" canDelete="false" classfield_id="1907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1907" tag="hblock_tag_7" canDelete="false" classfield_id="1907" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1907" tag="hblock_tag_7" canDelete="false" classfield_id="1907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1908" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1908" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1908" tag="hblock_tag_8" canDelete="false" classfield_id="1908" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1908" tag="hblock_tag_8" canDelete="false" classfield_id="1908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1908" tag="hblock_tag_9" canDelete="false" classfield_id="1908" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1908" tag="hblock_tag_9" canDelete="false" classfield_id="1908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1909" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1909" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1909" tag="hblock_tag_10" canDelete="false" classfield_id="1909" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1909" tag="hblock_tag_10" canDelete="false" classfield_id="1909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1909" tag="hblock_tag_11" canDelete="false" classfield_id="1909" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1909" tag="hblock_tag_11" canDelete="false" classfield_id="1909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1910" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1910" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1910" tag="hblock_tag_12" canDelete="false" classfield_id="1910" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1910" tag="hblock_tag_12" canDelete="false" classfield_id="1910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1910" tag="hblock_tag_13" canDelete="false" classfield_id="1910" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1910" tag="hblock_tag_13" canDelete="false" classfield_id="1910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -17394,7 +17394,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1943" tqparent_class="1943" fileExt=".cpp" fileName="kisresourcemediator" >
+    <classifiercodedocument writeOutCode="true" package="" id="1943" parent_class="1943" fileExt=".cpp" fileName="kisresourcemediator" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -17412,117 +17412,117 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1944" tag="hblock_tag_0" canDelete="false" classfield_id="1944" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1944" tag="hblock_tag_0" canDelete="false" classfield_id="1944" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1944" tag="hblock_tag_1" canDelete="false" classfield_id="1944" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1944" tag="hblock_tag_1" canDelete="false" classfield_id="1944" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1945" tag="hblock_tag_2" canDelete="false" classfield_id="1945" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1945" tag="hblock_tag_2" canDelete="false" classfield_id="1945" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1945" tag="hblock_tag_3" canDelete="false" classfield_id="1945" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1945" tag="hblock_tag_3" canDelete="false" classfield_id="1945" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1946" tag="hblock_tag_4" canDelete="false" classfield_id="1946" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1946" tag="hblock_tag_4" canDelete="false" classfield_id="1946" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1946" tag="hblock_tag_5" canDelete="false" classfield_id="1946" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1946" tag="hblock_tag_5" canDelete="false" classfield_id="1946" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1947" tag="operation_1947" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1947" tag="operation_1947" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1955" tag="operation_1955" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1955" tag="operation_1955" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1956" tag="operation_1956" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1956" tag="operation_1956" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1957" tag="operation_1957" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1957" tag="operation_1957" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1959" tag="operation_1959" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1959" tag="operation_1959" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1961" tag="operation_1961" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1961" tag="operation_1961" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1963" tag="operation_1963" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1963" tag="operation_1963" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -17534,131 +17534,131 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisresourcemediator.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>
-      <codeclassfield tqparent_id="1944" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1944" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1944" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1944" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1944" tag="hblock_tag_0" canDelete="false" classfield_id="1944" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1944" tag="hblock_tag_0" canDelete="false" classfield_id="1944" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1944" tag="hblock_tag_1" canDelete="false" classfield_id="1944" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1944" tag="hblock_tag_1" canDelete="false" classfield_id="1944" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1945" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1945" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1945" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1945" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1945" tag="hblock_tag_2" canDelete="false" classfield_id="1945" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1945" tag="hblock_tag_2" canDelete="false" classfield_id="1945" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1945" tag="hblock_tag_3" canDelete="false" classfield_id="1945" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1945" tag="hblock_tag_3" canDelete="false" classfield_id="1945" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1946" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1946" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1946" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1946" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1946" tag="hblock_tag_4" canDelete="false" classfield_id="1946" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1946" tag="hblock_tag_4" canDelete="false" classfield_id="1946" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1946" tag="hblock_tag_5" canDelete="false" classfield_id="1946" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1946" tag="hblock_tag_5" canDelete="false" classfield_id="1946" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2369" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2369" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2369" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2369" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2423" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2423" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2423" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2423" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -17666,7 +17666,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1964" tqparent_class="1964" fileExt=".cpp" fileName="kisresourceserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="1964" parent_class="1964" fileExt=".cpp" fileName="kisresourceserver" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -17684,132 +17684,132 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1965" tag="hblock_tag_0" canDelete="false" classfield_id="1965" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1965" tag="hblock_tag_0" canDelete="false" classfield_id="1965" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1965" tag="hblock_tag_1" canDelete="false" classfield_id="1965" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1965" tag="hblock_tag_1" canDelete="false" classfield_id="1965" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1966" tag="hblock_tag_2" canDelete="false" classfield_id="1966" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1966" tag="hblock_tag_2" canDelete="false" classfield_id="1966" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1966" tag="hblock_tag_3" canDelete="false" classfield_id="1966" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1966" tag="hblock_tag_3" canDelete="false" classfield_id="1966" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1967" tag="hblock_tag_4" canDelete="false" classfield_id="1967" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1967" tag="hblock_tag_4" canDelete="false" classfield_id="1967" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1967" tag="hblock_tag_5" canDelete="false" classfield_id="1967" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1967" tag="hblock_tag_5" canDelete="false" classfield_id="1967" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1968" tag="hblock_tag_6" canDelete="false" classfield_id="1968" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1968" tag="hblock_tag_6" canDelete="false" classfield_id="1968" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1968" tag="hblock_tag_7" canDelete="false" classfield_id="1968" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1968" tag="hblock_tag_7" canDelete="false" classfield_id="1968" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1969" tag="hblock_tag_8" canDelete="false" classfield_id="1969" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1969" tag="hblock_tag_8" canDelete="false" classfield_id="1969" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1969" tag="hblock_tag_9" canDelete="false" classfield_id="1969" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1969" tag="hblock_tag_9" canDelete="false" classfield_id="1969" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1970" tag="hblock_tag_10" canDelete="false" classfield_id="1970" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1970" tag="hblock_tag_10" canDelete="false" classfield_id="1970" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1970" tag="hblock_tag_11" canDelete="false" classfield_id="1970" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1970" tag="hblock_tag_11" canDelete="false" classfield_id="1970" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1971" tag="operation_1971" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1971" tag="operation_1971" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1972" tag="operation_1972" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1972" tag="operation_1972" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1973" tag="operation_1973" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1973" tag="operation_1973" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1974" tag="operation_1974" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1974" tag="operation_1974" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1975" tag="operation_1975" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1975" tag="operation_1975" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1976" tag="operation_1976" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1976" tag="operation_1976" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1977" tag="operation_1977" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1977" tag="operation_1977" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1978" tag="operation_1978" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1978" tag="operation_1978" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1979" tag="operation_1979" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1979" tag="operation_1979" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1980" tag="operation_1980" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1980" tag="operation_1980" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1981" tag="operation_1981" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1981" tag="operation_1981" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1982" tag="operation_1982" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1982" tag="operation_1982" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1983" tag="operation_1983" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1983" tag="operation_1983" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1984" tag="operation_1984" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1984" tag="operation_1984" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -17821,121 +17821,121 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisresourceserver.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>
-      <codeclassfield tqparent_id="1965" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1965" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1965" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1965" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1965" tag="hblock_tag_0" canDelete="false" classfield_id="1965" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1965" tag="hblock_tag_0" canDelete="false" classfield_id="1965" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1965" tag="hblock_tag_1" canDelete="false" classfield_id="1965" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1965" tag="hblock_tag_1" canDelete="false" classfield_id="1965" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1966" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1966" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1966" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1966" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1966" tag="hblock_tag_2" canDelete="false" classfield_id="1966" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1966" tag="hblock_tag_2" canDelete="false" classfield_id="1966" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1966" tag="hblock_tag_3" canDelete="false" classfield_id="1966" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1966" tag="hblock_tag_3" canDelete="false" classfield_id="1966" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1967" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1967" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1967" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1967" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1967" tag="hblock_tag_4" canDelete="false" classfield_id="1967" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1967" tag="hblock_tag_4" canDelete="false" classfield_id="1967" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1967" tag="hblock_tag_5" canDelete="false" classfield_id="1967" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1967" tag="hblock_tag_5" canDelete="false" classfield_id="1967" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1968" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1968" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1968" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1968" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1968" tag="hblock_tag_6" canDelete="false" classfield_id="1968" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1968" tag="hblock_tag_6" canDelete="false" classfield_id="1968" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1968" tag="hblock_tag_7" canDelete="false" classfield_id="1968" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1968" tag="hblock_tag_7" canDelete="false" classfield_id="1968" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1969" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1969" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1969" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1969" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1969" tag="hblock_tag_8" canDelete="false" classfield_id="1969" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1969" tag="hblock_tag_8" canDelete="false" classfield_id="1969" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1969" tag="hblock_tag_9" canDelete="false" classfield_id="1969" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1969" tag="hblock_tag_9" canDelete="false" classfield_id="1969" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1970" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1970" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1970" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1970" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1970" tag="hblock_tag_10" canDelete="false" classfield_id="1970" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1970" tag="hblock_tag_10" canDelete="false" classfield_id="1970" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1970" tag="hblock_tag_11" canDelete="false" classfield_id="1970" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1970" tag="hblock_tag_11" canDelete="false" classfield_id="1970" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -17943,7 +17943,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1985" tqparent_class="1985" fileExt=".cpp" fileName="kispluginserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="1985" parent_class="1985" fileExt=".cpp" fileName="kispluginserver" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;int.h&quot;&amp;#010;#include &quot;plugininfolist.h&quot;&amp;#010;" >
        <header>
@@ -17961,47 +17961,47 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1986" tag="hblock_tag_0" canDelete="false" classfield_id="1986" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1986" tag="hblock_tag_0" canDelete="false" classfield_id="1986" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1986" tag="hblock_tag_1" canDelete="false" classfield_id="1986" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1986" tag="hblock_tag_1" canDelete="false" classfield_id="1986" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1987" tag="hblock_tag_2" canDelete="false" classfield_id="1987" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1987" tag="hblock_tag_2" canDelete="false" classfield_id="1987" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1987" tag="hblock_tag_3" canDelete="false" classfield_id="1987" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1987" tag="hblock_tag_3" canDelete="false" classfield_id="1987" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1988" tag="operation_1988" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1988" tag="operation_1988" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1989" tag="operation_1989" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1989" tag="operation_1989" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1991" tag="operation_1991" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1991" tag="operation_1991" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1993" tag="operation_1993" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1993" tag="operation_1993" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1995" tag="operation_1995" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="1995" tag="operation_1995" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -18013,41 +18013,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispluginserver.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>
-      <codeclassfield tqparent_id="1986" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1986" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1986" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1986" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1986" tag="hblock_tag_0" canDelete="false" classfield_id="1986" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1986" tag="hblock_tag_0" canDelete="false" classfield_id="1986" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1986" tag="hblock_tag_1" canDelete="false" classfield_id="1986" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1986" tag="hblock_tag_1" canDelete="false" classfield_id="1986" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1987" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1987" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1987" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1987" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1987" tag="hblock_tag_2" canDelete="false" classfield_id="1987" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1987" tag="hblock_tag_2" canDelete="false" classfield_id="1987" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1987" tag="hblock_tag_3" canDelete="false" classfield_id="1987" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1987" tag="hblock_tag_3" canDelete="false" classfield_id="1987" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -18055,7 +18055,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1996" tqparent_class="1996" fileExt=".cpp" fileName="kistilecommand" >
+    <classifiercodedocument writeOutCode="true" package="" id="1996" parent_class="1996" fileExt=".cpp" fileName="kistilecommand" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kispaintdevicesp.h&quot;&amp;#010;#include &quot;kistilesp.h&quot;&amp;#010;#include &quot;tilemap.h&quot;&amp;#010;" >
        <header>
@@ -18073,92 +18073,92 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1997" tag="hblock_tag_0" canDelete="false" classfield_id="1997" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1997" tag="hblock_tag_0" canDelete="false" classfield_id="1997" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1997" tag="hblock_tag_1" canDelete="false" classfield_id="1997" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1997" tag="hblock_tag_1" canDelete="false" classfield_id="1997" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1998" tag="hblock_tag_2" canDelete="false" classfield_id="1998" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1998" tag="hblock_tag_2" canDelete="false" classfield_id="1998" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1998" tag="hblock_tag_3" canDelete="false" classfield_id="1998" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1998" tag="hblock_tag_3" canDelete="false" classfield_id="1998" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1999" tag="hblock_tag_4" canDelete="false" classfield_id="1999" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="1999" tag="hblock_tag_4" canDelete="false" classfield_id="1999" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1999" tag="hblock_tag_5" canDelete="false" classfield_id="1999" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="1999" tag="hblock_tag_5" canDelete="false" classfield_id="1999" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2000" tag="hblock_tag_6" canDelete="false" classfield_id="2000" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2000" tag="hblock_tag_6" canDelete="false" classfield_id="2000" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2000" tag="hblock_tag_7" canDelete="false" classfield_id="2000" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2000" tag="hblock_tag_7" canDelete="false" classfield_id="2000" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2001" tag="hblock_tag_8" canDelete="false" classfield_id="2001" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2001" tag="hblock_tag_8" canDelete="false" classfield_id="2001" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2001" tag="hblock_tag_9" canDelete="false" classfield_id="2001" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2001" tag="hblock_tag_9" canDelete="false" classfield_id="2001" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2002" tag="operation_2002" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2002" tag="operation_2002" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2005" tag="operation_2005" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2005" tag="operation_2005" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2012" tag="operation_2012" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2012" tag="operation_2012" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2016" tag="operation_2016" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2016" tag="operation_2016" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2019" tag="operation_2019" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2019" tag="operation_2019" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2020" tag="operation_2020" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2020" tag="operation_2020" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2021" tag="operation_2021" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2021" tag="operation_2021" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2022" tag="operation_2022" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2022" tag="operation_2022" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -18170,101 +18170,101 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilecommand.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:47:19&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1997" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1997" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1997" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1997" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1997" tag="hblock_tag_0" canDelete="false" classfield_id="1997" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1997" tag="hblock_tag_0" canDelete="false" classfield_id="1997" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1997" tag="hblock_tag_1" canDelete="false" classfield_id="1997" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1997" tag="hblock_tag_1" canDelete="false" classfield_id="1997" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1998" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1998" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1998" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1998" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1998" tag="hblock_tag_2" canDelete="false" classfield_id="1998" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1998" tag="hblock_tag_2" canDelete="false" classfield_id="1998" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1998" tag="hblock_tag_3" canDelete="false" classfield_id="1998" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1998" tag="hblock_tag_3" canDelete="false" classfield_id="1998" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1999" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1999" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1999" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1999" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1999" tag="hblock_tag_4" canDelete="false" classfield_id="1999" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1999" tag="hblock_tag_4" canDelete="false" classfield_id="1999" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1999" tag="hblock_tag_5" canDelete="false" classfield_id="1999" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1999" tag="hblock_tag_5" canDelete="false" classfield_id="1999" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2000" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2000" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2000" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2000" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2000" tag="hblock_tag_6" canDelete="false" classfield_id="2000" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2000" tag="hblock_tag_6" canDelete="false" classfield_id="2000" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2000" tag="hblock_tag_7" canDelete="false" classfield_id="2000" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2000" tag="hblock_tag_7" canDelete="false" classfield_id="2000" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2001" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2001" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2001" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2001" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2001" tag="hblock_tag_8" canDelete="false" classfield_id="2001" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2001" tag="hblock_tag_8" canDelete="false" classfield_id="2001" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2001" tag="hblock_tag_9" canDelete="false" classfield_id="2001" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2001" tag="hblock_tag_9" canDelete="false" classfield_id="2001" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -18272,7 +18272,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2023" tqparent_class="2023" fileExt=".cpp" fileName="plugininfo" >
+    <classifiercodedocument writeOutCode="true" package="" id="2023" parent_class="2023" fileExt=".cpp" fileName="plugininfo" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;plugintype.h&quot;&amp;#010;#include &quot;int.h&quot;&amp;#010;" >
        <header>
@@ -18290,117 +18290,117 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2024" tag="hblock_tag_0" canDelete="false" classfield_id="2024" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2024" tag="hblock_tag_0" canDelete="false" classfield_id="2024" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2024" tag="hblock_tag_1" canDelete="false" classfield_id="2024" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2024" tag="hblock_tag_1" canDelete="false" classfield_id="2024" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2025" tag="hblock_tag_2" canDelete="false" classfield_id="2025" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2025" tag="hblock_tag_2" canDelete="false" classfield_id="2025" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2025" tag="hblock_tag_3" canDelete="false" classfield_id="2025" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2025" tag="hblock_tag_3" canDelete="false" classfield_id="2025" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2026" tag="hblock_tag_4" canDelete="false" classfield_id="2026" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2026" tag="hblock_tag_4" canDelete="false" classfield_id="2026" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2026" tag="hblock_tag_5" canDelete="false" classfield_id="2026" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2026" tag="hblock_tag_5" canDelete="false" classfield_id="2026" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2027" tag="hblock_tag_6" canDelete="false" classfield_id="2027" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2027" tag="hblock_tag_6" canDelete="false" classfield_id="2027" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2027" tag="hblock_tag_7" canDelete="false" classfield_id="2027" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2027" tag="hblock_tag_7" canDelete="false" classfield_id="2027" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2028" tag="hblock_tag_8" canDelete="false" classfield_id="2028" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2028" tag="hblock_tag_8" canDelete="false" classfield_id="2028" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2028" tag="hblock_tag_9" canDelete="false" classfield_id="2028" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2028" tag="hblock_tag_9" canDelete="false" classfield_id="2028" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2029" tag="hblock_tag_10" canDelete="false" classfield_id="2029" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2029" tag="hblock_tag_10" canDelete="false" classfield_id="2029" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2029" tag="hblock_tag_11" canDelete="false" classfield_id="2029" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2029" tag="hblock_tag_11" canDelete="false" classfield_id="2029" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2030" tag="hblock_tag_12" canDelete="false" classfield_id="2030" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2030" tag="hblock_tag_12" canDelete="false" classfield_id="2030" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2030" tag="hblock_tag_13" canDelete="false" classfield_id="2030" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2030" tag="hblock_tag_13" canDelete="false" classfield_id="2030" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2031" tag="operation_2031" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2031" tag="operation_2031" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2038" tag="operation_2038" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2038" tag="operation_2038" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2039" tag="operation_2039" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2039" tag="operation_2039" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2040" tag="operation_2040" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2040" tag="operation_2040" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2041" tag="operation_2041" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2041" tag="operation_2041" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2042" tag="operation_2042" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2042" tag="operation_2042" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2043" tag="operation_2043" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2043" tag="operation_2043" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2044" tag="operation_2044" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2044" tag="operation_2044" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2046" tag="operation_2046" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2046" tag="operation_2046" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -18412,141 +18412,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			plugininfo.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>
-      <codeclassfield tqparent_id="2024" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2024" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2024" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2024" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2024" tag="hblock_tag_0" canDelete="false" classfield_id="2024" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2024" tag="hblock_tag_0" canDelete="false" classfield_id="2024" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2024" tag="hblock_tag_1" canDelete="false" classfield_id="2024" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2024" tag="hblock_tag_1" canDelete="false" classfield_id="2024" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2025" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2025" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2025" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2025" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2025" tag="hblock_tag_2" canDelete="false" classfield_id="2025" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2025" tag="hblock_tag_2" canDelete="false" classfield_id="2025" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2025" tag="hblock_tag_3" canDelete="false" classfield_id="2025" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2025" tag="hblock_tag_3" canDelete="false" classfield_id="2025" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2026" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2026" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2026" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2026" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2026" tag="hblock_tag_4" canDelete="false" classfield_id="2026" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2026" tag="hblock_tag_4" canDelete="false" classfield_id="2026" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2026" tag="hblock_tag_5" canDelete="false" classfield_id="2026" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2026" tag="hblock_tag_5" canDelete="false" classfield_id="2026" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2027" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2027" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2027" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2027" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2027" tag="hblock_tag_6" canDelete="false" classfield_id="2027" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2027" tag="hblock_tag_6" canDelete="false" classfield_id="2027" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2027" tag="hblock_tag_7" canDelete="false" classfield_id="2027" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2027" tag="hblock_tag_7" canDelete="false" classfield_id="2027" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2028" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2028" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2028" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2028" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2028" tag="hblock_tag_8" canDelete="false" classfield_id="2028" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2028" tag="hblock_tag_8" canDelete="false" classfield_id="2028" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2028" tag="hblock_tag_9" canDelete="false" classfield_id="2028" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2028" tag="hblock_tag_9" canDelete="false" classfield_id="2028" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2029" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2029" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2029" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2029" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2029" tag="hblock_tag_10" canDelete="false" classfield_id="2029" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2029" tag="hblock_tag_10" canDelete="false" classfield_id="2029" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2029" tag="hblock_tag_11" canDelete="false" classfield_id="2029" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2029" tag="hblock_tag_11" canDelete="false" classfield_id="2029" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2030" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2030" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2030" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2030" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2030" tag="hblock_tag_12" canDelete="false" classfield_id="2030" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2030" tag="hblock_tag_12" canDelete="false" classfield_id="2030" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2030" tag="hblock_tag_13" canDelete="false" classfield_id="2030" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2030" tag="hblock_tag_13" canDelete="false" classfield_id="2030" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -18554,7 +18554,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2047" tqparent_class="2047" fileExt=".cpp" fileName="kisresource" >
+    <classifiercodedocument writeOutCode="true" package="" id="2047" parent_class="2047" fileExt=".cpp" fileName="kisresource" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -18572,177 +18572,177 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2048" tag="hblock_tag_0" canDelete="false" classfield_id="2048" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2048" tag="hblock_tag_0" canDelete="false" classfield_id="2048" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2048" tag="hblock_tag_1" canDelete="false" classfield_id="2048" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2048" tag="hblock_tag_1" canDelete="false" classfield_id="2048" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2049" tag="hblock_tag_2" canDelete="false" classfield_id="2049" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2049" tag="hblock_tag_2" canDelete="false" classfield_id="2049" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2049" tag="hblock_tag_3" canDelete="false" classfield_id="2049" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2049" tag="hblock_tag_3" canDelete="false" classfield_id="2049" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2050" tag="hblock_tag_4" canDelete="false" classfield_id="2050" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2050" tag="hblock_tag_4" canDelete="false" classfield_id="2050" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2050" tag="hblock_tag_5" canDelete="false" classfield_id="2050" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2050" tag="hblock_tag_5" canDelete="false" classfield_id="2050" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2051" tag="hblock_tag_6" canDelete="false" classfield_id="2051" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2051" tag="hblock_tag_6" canDelete="false" classfield_id="2051" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2051" tag="hblock_tag_7" canDelete="false" classfield_id="2051" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2051" tag="hblock_tag_7" canDelete="false" classfield_id="2051" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2052" tag="hblock_tag_8" canDelete="false" classfield_id="2052" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2052" tag="hblock_tag_8" canDelete="false" classfield_id="2052" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2052" tag="hblock_tag_9" canDelete="false" classfield_id="2052" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2052" tag="hblock_tag_9" canDelete="false" classfield_id="2052" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2053" tag="hblock_tag_10" canDelete="false" classfield_id="2053" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2053" tag="hblock_tag_10" canDelete="false" classfield_id="2053" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2053" tag="hblock_tag_11" canDelete="false" classfield_id="2053" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2053" tag="hblock_tag_11" canDelete="false" classfield_id="2053" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2054" tag="hblock_tag_12" canDelete="false" classfield_id="2054" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2054" tag="hblock_tag_12" canDelete="false" classfield_id="2054" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2054" tag="hblock_tag_13" canDelete="false" classfield_id="2054" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2054" tag="hblock_tag_13" canDelete="false" classfield_id="2054" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2055" tag="operation_2055" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2055" tag="operation_2055" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2057" tag="operation_2057" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2057" tag="operation_2057" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2059" tag="operation_2059" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2059" tag="operation_2059" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Creates a new KisResource object using @p filename.  No file is opened&amp;#010;in the constructor, you have to call loadAsync.&amp;#010;&amp;#010;@param filename the file name to save and load from." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2061" tag="operation_2061" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2061" tag="operation_2061" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2062" tag="operation_2062" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2062" tag="operation_2062" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2063" tag="operation_2063" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2063" tag="operation_2063" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2064" tag="operation_2064" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2064" tag="operation_2064" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Returns a QImage representing this resource.  This image could be null." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2065" tag="operation_2065" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2065" tag="operation_2065" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Load this resource asynchronously.  The signal loadComplete is emitted when&amp;#010;the resource has been loaded and valid flag is set to true." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2066" tag="operation_2066" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2066" tag="operation_2066" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2067" tag="operation_2067" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2067" tag="operation_2067" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Save this resource asynchronously.  The signal saveComplete is emitted when&amp;#010;the resource has been saved." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2068" tag="operation_2068" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2068" tag="operation_2068" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2070" tag="operation_2070" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2070" tag="operation_2070" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2072" tag="operation_2072" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2072" tag="operation_2072" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2074" tag="operation_2074" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2074" tag="operation_2074" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2076" tag="operation_2076" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2076" tag="operation_2076" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2078" tag="operation_2078" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2078" tag="operation_2078" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2080" tag="operation_2080" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2080" tag="operation_2080" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2082" tag="operation_2082" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2082" tag="operation_2082" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2083" tag="operation_2083" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2083" tag="operation_2083" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2084" tag="operation_2084" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2084" tag="operation_2084" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2085" tag="operation_2085" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2085" tag="operation_2085" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" text="Creates a new KisResource object using @p filename.  No file is opened&amp;#010;in the constructor, you have to call loadAsync.&amp;#010;&amp;#010;@param filename the file name to save and load from." />
          </header>
@@ -18754,141 +18754,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisresource.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>
-      <codeclassfield tqparent_id="2048" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2048" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2048" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2048" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2048" tag="hblock_tag_0" canDelete="false" classfield_id="2048" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2048" tag="hblock_tag_0" canDelete="false" classfield_id="2048" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2048" tag="hblock_tag_1" canDelete="false" classfield_id="2048" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2048" tag="hblock_tag_1" canDelete="false" classfield_id="2048" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2049" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2049" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2049" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2049" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2049" tag="hblock_tag_2" canDelete="false" classfield_id="2049" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2049" tag="hblock_tag_2" canDelete="false" classfield_id="2049" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2049" tag="hblock_tag_3" canDelete="false" classfield_id="2049" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2049" tag="hblock_tag_3" canDelete="false" classfield_id="2049" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2050" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2050" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2050" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2050" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2050" tag="hblock_tag_4" canDelete="false" classfield_id="2050" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2050" tag="hblock_tag_4" canDelete="false" classfield_id="2050" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2050" tag="hblock_tag_5" canDelete="false" classfield_id="2050" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2050" tag="hblock_tag_5" canDelete="false" classfield_id="2050" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2051" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2051" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2051" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2051" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2051" tag="hblock_tag_6" canDelete="false" classfield_id="2051" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2051" tag="hblock_tag_6" canDelete="false" classfield_id="2051" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2051" tag="hblock_tag_7" canDelete="false" classfield_id="2051" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2051" tag="hblock_tag_7" canDelete="false" classfield_id="2051" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2052" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2052" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2052" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2052" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2052" tag="hblock_tag_8" canDelete="false" classfield_id="2052" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2052" tag="hblock_tag_8" canDelete="false" classfield_id="2052" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2052" tag="hblock_tag_9" canDelete="false" classfield_id="2052" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2052" tag="hblock_tag_9" canDelete="false" classfield_id="2052" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2053" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2053" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2053" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2053" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2053" tag="hblock_tag_10" canDelete="false" classfield_id="2053" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2053" tag="hblock_tag_10" canDelete="false" classfield_id="2053" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2053" tag="hblock_tag_11" canDelete="false" classfield_id="2053" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2053" tag="hblock_tag_11" canDelete="false" classfield_id="2053" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2054" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2054" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2054" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2054" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2054" tag="hblock_tag_12" canDelete="false" classfield_id="2054" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2054" tag="hblock_tag_12" canDelete="false" classfield_id="2054" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2054" tag="hblock_tag_13" canDelete="false" classfield_id="2054" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2054" tag="hblock_tag_13" canDelete="false" classfield_id="2054" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -18896,7 +18896,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2086" tqparent_class="2086" fileExt=".cpp" fileName="kisrenderinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="2086" parent_class="2086" fileExt=".cpp" fileName="kisrenderinterface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -18914,57 +18914,57 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="2087" tag="operation_2087" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2087" tag="operation_2087" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2089" tag="operation_2089" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2089" tag="operation_2089" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2090" tag="operation_2090" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2090" tag="operation_2090" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2092" tag="operation_2092" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2092" tag="operation_2092" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2093" tag="operation_2093" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2093" tag="operation_2093" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2095" tag="operation_2095" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2095" tag="operation_2095" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2100" tag="operation_2100" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2100" tag="operation_2100" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2102" tag="operation_2102" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2102" tag="operation_2102" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2105" tag="operation_2105" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2105" tag="operation_2105" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2106" tag="operation_2106" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2106" tag="operation_2106" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2108" tag="operation_2108" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2108" tag="operation_2108" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -18977,7 +18977,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2109" tqparent_class="2109" fileExt=".cpp" fileName="kispattern" >
+    <classifiercodedocument writeOutCode="true" package="" id="2109" parent_class="2109" fileExt=".cpp" fileName="kispattern" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;kisresource.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -18995,142 +18995,142 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2110" tag="hblock_tag_0" canDelete="false" classfield_id="2110" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2110" tag="hblock_tag_0" canDelete="false" classfield_id="2110" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2110" tag="hblock_tag_1" canDelete="false" classfield_id="2110" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2110" tag="hblock_tag_1" canDelete="false" classfield_id="2110" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2111" tag="hblock_tag_2" canDelete="false" classfield_id="2111" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2111" tag="hblock_tag_2" canDelete="false" classfield_id="2111" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2111" tag="hblock_tag_3" canDelete="false" classfield_id="2111" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2111" tag="hblock_tag_3" canDelete="false" classfield_id="2111" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2112" tag="hblock_tag_4" canDelete="false" classfield_id="2112" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2112" tag="hblock_tag_4" canDelete="false" classfield_id="2112" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2112" tag="hblock_tag_5" canDelete="false" classfield_id="2112" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2112" tag="hblock_tag_5" canDelete="false" classfield_id="2112" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2113" tag="hblock_tag_6" canDelete="false" classfield_id="2113" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2113" tag="hblock_tag_6" canDelete="false" classfield_id="2113" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2113" tag="hblock_tag_7" canDelete="false" classfield_id="2113" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2113" tag="hblock_tag_7" canDelete="false" classfield_id="2113" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2114" tag="hblock_tag_8" canDelete="false" classfield_id="2114" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2114" tag="hblock_tag_8" canDelete="false" classfield_id="2114" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2114" tag="hblock_tag_9" canDelete="false" classfield_id="2114" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2114" tag="hblock_tag_9" canDelete="false" classfield_id="2114" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2115" tag="hblock_tag_10" canDelete="false" classfield_id="2115" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2115" tag="hblock_tag_10" canDelete="false" classfield_id="2115" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2115" tag="hblock_tag_11" canDelete="false" classfield_id="2115" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2115" tag="hblock_tag_11" canDelete="false" classfield_id="2115" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2116" tag="hblock_tag_12" canDelete="false" classfield_id="2116" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2116" tag="hblock_tag_12" canDelete="false" classfield_id="2116" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2116" tag="hblock_tag_13" canDelete="false" classfield_id="2116" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2116" tag="hblock_tag_13" canDelete="false" classfield_id="2116" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2117" tag="operation_2117" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2117" tag="operation_2117" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2119" tag="operation_2119" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2119" tag="operation_2119" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2120" tag="operation_2120" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2120" tag="operation_2120" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2121" tag="operation_2121" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2121" tag="operation_2121" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2122" tag="operation_2122" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2122" tag="operation_2122" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2123" tag="operation_2123" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2123" tag="operation_2123" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2124" tag="operation_2124" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2124" tag="operation_2124" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2125" tag="operation_2125" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2125" tag="operation_2125" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2126" tag="operation_2126" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2126" tag="operation_2126" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19142,176 +19142,176 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispattern.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>
-      <codeclassfield tqparent_id="2110" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2110" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2110" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2110" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2110" tag="hblock_tag_0" canDelete="false" classfield_id="2110" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2110" tag="hblock_tag_0" canDelete="false" classfield_id="2110" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2110" tag="hblock_tag_1" canDelete="false" classfield_id="2110" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2110" tag="hblock_tag_1" canDelete="false" classfield_id="2110" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2111" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2111" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2111" tag="hblock_tag_2" canDelete="false" classfield_id="2111" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2111" tag="hblock_tag_2" canDelete="false" classfield_id="2111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2111" tag="hblock_tag_3" canDelete="false" classfield_id="2111" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2111" tag="hblock_tag_3" canDelete="false" classfield_id="2111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2112" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2112" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2112" tag="hblock_tag_4" canDelete="false" classfield_id="2112" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2112" tag="hblock_tag_4" canDelete="false" classfield_id="2112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2112" tag="hblock_tag_5" canDelete="false" classfield_id="2112" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2112" tag="hblock_tag_5" canDelete="false" classfield_id="2112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2113" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2113" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2113" tag="hblock_tag_6" canDelete="false" classfield_id="2113" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2113" tag="hblock_tag_6" canDelete="false" classfield_id="2113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2113" tag="hblock_tag_7" canDelete="false" classfield_id="2113" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2113" tag="hblock_tag_7" canDelete="false" classfield_id="2113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2114" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2114" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2114" tag="hblock_tag_8" canDelete="false" classfield_id="2114" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2114" tag="hblock_tag_8" canDelete="false" classfield_id="2114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2114" tag="hblock_tag_9" canDelete="false" classfield_id="2114" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2114" tag="hblock_tag_9" canDelete="false" classfield_id="2114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2115" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2115" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2115" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2115" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2115" tag="hblock_tag_10" canDelete="false" classfield_id="2115" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2115" tag="hblock_tag_10" canDelete="false" classfield_id="2115" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2115" tag="hblock_tag_11" canDelete="false" classfield_id="2115" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2115" tag="hblock_tag_11" canDelete="false" classfield_id="2115" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2116" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2116" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2116" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2116" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2116" tag="hblock_tag_12" canDelete="false" classfield_id="2116" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2116" tag="hblock_tag_12" canDelete="false" classfield_id="2116" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2116" tag="hblock_tag_13" canDelete="false" classfield_id="2116" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2116" tag="hblock_tag_13" canDelete="false" classfield_id="2116" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2422" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2422" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2422" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2422" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -19319,7 +19319,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2129" tqparent_class="2129" fileExt=".cpp" fileName="plugintype" >
+    <classifiercodedocument writeOutCode="true" package="" id="2129" parent_class="2129" fileExt=".cpp" fileName="plugintype" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -19344,7 +19344,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2135" tqparent_class="2135" fileExt=".cpp" fileName="kistool" >
+    <classifiercodedocument writeOutCode="true" package="" id="2135" parent_class="2135" fileExt=".cpp" fileName="kistool" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -19362,127 +19362,127 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2136" tag="operation_2136" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2136" tag="operation_2136" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2138" tag="operation_2138" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2138" tag="operation_2138" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2139" tag="operation_2139" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2139" tag="operation_2139" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2141" tag="operation_2141" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2141" tag="operation_2141" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2142" tag="operation_2142" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2142" tag="operation_2142" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2144" tag="operation_2144" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2144" tag="operation_2144" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2146" tag="operation_2146" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2146" tag="operation_2146" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2148" tag="operation_2148" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2148" tag="operation_2148" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2150" tag="operation_2150" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2150" tag="operation_2150" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2152" tag="operation_2152" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2152" tag="operation_2152" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2154" tag="operation_2154" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2154" tag="operation_2154" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2156" tag="operation_2156" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2156" tag="operation_2156" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2158" tag="operation_2158" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2158" tag="operation_2158" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2160" tag="operation_2160" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2160" tag="operation_2160" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2162" tag="operation_2162" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2162" tag="operation_2162" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2164" tag="operation_2164" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2164" tag="operation_2164" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2167" tag="operation_2167" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2167" tag="operation_2167" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2169" tag="operation_2169" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2169" tag="operation_2169" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2171" tag="operation_2171" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2171" tag="operation_2171" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2173" tag="operation_2173" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2173" tag="operation_2173" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19494,36 +19494,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistool.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>
-      <codeclassfield tqparent_id="2441" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2441" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2441" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2441" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -19531,7 +19531,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2174" tqparent_class="2174" fileExt=".cpp" fileName="kisundoadapter" >
+    <classifiercodedocument writeOutCode="true" package="" id="2174" parent_class="2174" fileExt=".cpp" fileName="kisundoadapter" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -19549,77 +19549,77 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+        <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+        <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+        <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+        <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+        <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2175" tag="operation_2175" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2175" tag="operation_2175" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2177" tag="operation_2177" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2177" tag="operation_2177" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2178" tag="operation_2178" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2178" tag="operation_2178" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2180" tag="operation_2180" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2180" tag="operation_2180" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2182" tag="operation_2182" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2182" tag="operation_2182" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2184" tag="operation_2184" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2184" tag="operation_2184" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2185" tag="operation_2185" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2185" tag="operation_2185" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2186" tag="operation_2186" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2186" tag="operation_2186" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2188" tag="operation_2188" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2188" tag="operation_2188" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2189" tag="operation_2189" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2189" tag="operation_2189" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19631,36 +19631,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisundoadapter.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>
-      <codeclassfield tqparent_id="2366" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2366" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2366" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2366" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -19668,7 +19668,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2190" tqparent_class="2190" fileExt=".cpp" fileName="kistoolfactory" >
+    <classifiercodedocument writeOutCode="true" package="" id="2190" parent_class="2190" fileExt=".cpp" fileName="kistoolfactory" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;vkistool.h&quot;&amp;#010;" >
        <header>
@@ -19686,67 +19686,67 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2192" tag="hblock_tag_0" canDelete="false" classfield_id="2192" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2192" tag="hblock_tag_0" canDelete="false" classfield_id="2192" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2192" tag="hblock_tag_1" canDelete="false" classfield_id="2192" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2192" tag="hblock_tag_1" canDelete="false" classfield_id="2192" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2191" tag="hblock_tag_7" canDelete="false" classfield_id="2191" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2191" tag="hblock_tag_7" canDelete="false" classfield_id="2191" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2191" tag="hblock_tag_8" canDelete="false" classfield_id="2191" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2191" tag="hblock_tag_8" canDelete="false" classfield_id="2191" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2193" tag="operation_2193" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2193" tag="operation_2193" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2195" tag="operation_2195" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2195" tag="operation_2195" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2196" tag="operation_2196" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2196" tag="operation_2196" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2198" tag="operation_2198" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2198" tag="operation_2198" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2201" tag="operation_2201" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2201" tag="operation_2201" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2202" tag="operation_2202" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2202" tag="operation_2202" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19758,91 +19758,91 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistoolfactory.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>
-      <codeclassfield tqparent_id="2192" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2192" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2192" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2192" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2192" tag="hblock_tag_0" canDelete="false" classfield_id="2192" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2192" tag="hblock_tag_0" canDelete="false" classfield_id="2192" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2192" tag="hblock_tag_1" canDelete="false" classfield_id="2192" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2192" tag="hblock_tag_1" canDelete="false" classfield_id="2192" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2191" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2191" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2191" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2191" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2191" tag="hblock_tag_7" canDelete="false" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2191" tag="hblock_tag_7" canDelete="false" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2191" tag="hblock_tag_8" canDelete="false" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2191" tag="hblock_tag_8" canDelete="false" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2191" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2191" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2191" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2191" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2191" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2191" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2191" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2191" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -19850,7 +19850,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2203" tqparent_class="2203" fileExt=".cpp" fileName="kistoolcontrollerinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="2203" parent_class="2203" fileExt=".cpp" fileName="kistoolcontrollerinterface" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;" >
        <header>
@@ -19868,32 +19868,32 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="2204" tag="operation_2204" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2204" tag="operation_2204" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2206" tag="operation_2206" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2206" tag="operation_2206" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2207" tag="operation_2207" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2207" tag="operation_2207" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2209" tag="operation_2209" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2209" tag="operation_2209" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2210" tag="operation_2210" canDelete="false" writeOutText="false" role_id="-1" >
+        <codeoperation parent_id="2210" tag="operation_2210" canDelete="false" writeOutText="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2212" tag="operation_2212" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2212" tag="operation_2212" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19906,7 +19906,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2218" tqparent_class="2218" fileExt=".cpp" fileName="kisutil" >
+    <classifiercodedocument writeOutCode="true" package="" id="2218" parent_class="2218" fileExt=".cpp" fileName="kisutil" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;int.h&quot;&amp;#010;" >
        <header>
@@ -19924,32 +19924,32 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="2219" tag="operation_2219" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2219" tag="operation_2219" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2222" tag="operation_2222" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2222" tag="operation_2222" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2224" tag="operation_2224" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2224" tag="operation_2224" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2226" tag="operation_2226" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2226" tag="operation_2226" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2229" tag="operation_2229" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2229" tag="operation_2229" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2232" tag="operation_2232" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2232" tag="operation_2232" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19962,7 +19962,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2236" tqparent_class="2236" fileExt=".cpp" fileName="kisvector" >
+    <classifiercodedocument writeOutCode="true" package="" id="2236" parent_class="2236" fileExt=".cpp" fileName="kisvector" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;kisvector.h&quot;&amp;#010;#include &quot;double.h&quot;&amp;#010;#include &quot;int.h&quot;&amp;#010;#include &quot;long.h&quot;&amp;#010;" >
        <header>
@@ -19980,217 +19980,217 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2237" tag="hblock_tag_0" canDelete="false" classfield_id="2237" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2237" tag="hblock_tag_0" canDelete="false" classfield_id="2237" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2237" tag="hblock_tag_1" canDelete="false" classfield_id="2237" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2237" tag="hblock_tag_1" canDelete="false" classfield_id="2237" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2238" tag="hblock_tag_2" canDelete="false" classfield_id="2238" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2238" tag="hblock_tag_2" canDelete="false" classfield_id="2238" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2238" tag="hblock_tag_3" canDelete="false" classfield_id="2238" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2238" tag="hblock_tag_3" canDelete="false" classfield_id="2238" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2239" tag="hblock_tag_4" canDelete="false" classfield_id="2239" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2239" tag="hblock_tag_4" canDelete="false" classfield_id="2239" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2239" tag="hblock_tag_5" canDelete="false" classfield_id="2239" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2239" tag="hblock_tag_5" canDelete="false" classfield_id="2239" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2240" tag="operation_2240" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2240" tag="operation_2240" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2243" tag="operation_2243" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2243" tag="operation_2243" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2246" tag="operation_2246" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2246" tag="operation_2246" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2249" tag="operation_2249" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2249" tag="operation_2249" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2252" tag="operation_2252" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2252" tag="operation_2252" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2255" tag="operation_2255" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2255" tag="operation_2255" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2258" tag="operation_2258" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2258" tag="operation_2258" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2261" tag="operation_2261" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2261" tag="operation_2261" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2263" tag="operation_2263" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2263" tag="operation_2263" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2265" tag="operation_2265" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2265" tag="operation_2265" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2267" tag="operation_2267" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2267" tag="operation_2267" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2270" tag="operation_2270" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2270" tag="operation_2270" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2272" tag="operation_2272" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2272" tag="operation_2272" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2274" tag="operation_2274" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2274" tag="operation_2274" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2277" tag="operation_2277" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2277" tag="operation_2277" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2279" tag="operation_2279" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2279" tag="operation_2279" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2282" tag="operation_2282" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2282" tag="operation_2282" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2285" tag="operation_2285" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2285" tag="operation_2285" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2288" tag="operation_2288" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2288" tag="operation_2288" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2290" tag="operation_2290" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2290" tag="operation_2290" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2292" tag="operation_2292" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2292" tag="operation_2292" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2294" tag="operation_2294" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2294" tag="operation_2294" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2297" tag="operation_2297" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2297" tag="operation_2297" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2298" tag="operation_2298" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2298" tag="operation_2298" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2302" tag="operation_2302" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2302" tag="operation_2302" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2306" tag="operation_2306" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2306" tag="operation_2306" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2310" tag="operation_2310" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2310" tag="operation_2310" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2312" tag="operation_2312" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2312" tag="operation_2312" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2314" tag="operation_2314" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2314" tag="operation_2314" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2315" tag="operation_2315" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2315" tag="operation_2315" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2316" tag="operation_2316" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2316" tag="operation_2316" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2317" tag="operation_2317" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2317" tag="operation_2317" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2319" tag="operation_2319" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2319" tag="operation_2319" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2321" tag="operation_2321" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2321" tag="operation_2321" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2323" tag="operation_2323" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2323" tag="operation_2323" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2324" tag="operation_2324" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2324" tag="operation_2324" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2325" tag="operation_2325" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2325" tag="operation_2325" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -20202,61 +20202,61 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisvector.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>
-      <codeclassfield tqparent_id="2237" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2237" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2237" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2237" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2237" tag="hblock_tag_0" canDelete="false" classfield_id="2237" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2237" tag="hblock_tag_0" canDelete="false" classfield_id="2237" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2237" tag="hblock_tag_1" canDelete="false" classfield_id="2237" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2237" tag="hblock_tag_1" canDelete="false" classfield_id="2237" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2238" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2238" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2238" tag="hblock_tag_2" canDelete="false" classfield_id="2238" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2238" tag="hblock_tag_2" canDelete="false" classfield_id="2238" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2238" tag="hblock_tag_3" canDelete="false" classfield_id="2238" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2238" tag="hblock_tag_3" canDelete="false" classfield_id="2238" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2239" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2239" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2239" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2239" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2239" tag="hblock_tag_4" canDelete="false" classfield_id="2239" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2239" tag="hblock_tag_4" canDelete="false" classfield_id="2239" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2239" tag="hblock_tag_5" canDelete="false" classfield_id="2239" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2239" tag="hblock_tag_5" canDelete="false" classfield_id="2239" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -20264,7 +20264,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2365" tqparent_class="2365" fileExt=".cpp" fileName="kisview" >
+    <classifiercodedocument writeOutCode="true" package="" id="2365" parent_class="2365" fileExt=".cpp" fileName="kisview" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;string&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;double.h&quot;&amp;#010;#include &quot;kisguidesp.h&quot;&amp;#010;#include &quot;vkiscanvasobserver.h&quot;&amp;#010;" >
        <header>
@@ -20282,1317 +20282,1317 @@ in the constructor, you have to call loadAsync.
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="2367" tag="hblock_tag_0" canDelete="false" classfield_id="2367" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2367" tag="hblock_tag_0" canDelete="false" classfield_id="2367" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2367" tag="hblock_tag_1" canDelete="false" classfield_id="2367" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2367" tag="hblock_tag_1" canDelete="false" classfield_id="2367" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2370" tag="hblock_tag_2" canDelete="false" classfield_id="2370" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2370" tag="hblock_tag_2" canDelete="false" classfield_id="2370" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2370" tag="hblock_tag_3" canDelete="false" classfield_id="2370" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2370" tag="hblock_tag_3" canDelete="false" classfield_id="2370" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2371" tag="hblock_tag_4" canDelete="false" classfield_id="2371" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2371" tag="hblock_tag_4" canDelete="false" classfield_id="2371" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2371" tag="hblock_tag_5" canDelete="false" classfield_id="2371" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2371" tag="hblock_tag_5" canDelete="false" classfield_id="2371" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2372" tag="hblock_tag_6" canDelete="false" classfield_id="2372" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2372" tag="hblock_tag_6" canDelete="false" classfield_id="2372" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2372" tag="hblock_tag_7" canDelete="false" classfield_id="2372" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2372" tag="hblock_tag_7" canDelete="false" classfield_id="2372" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2373" tag="hblock_tag_8" canDelete="false" classfield_id="2373" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2373" tag="hblock_tag_8" canDelete="false" classfield_id="2373" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2373" tag="hblock_tag_9" canDelete="false" classfield_id="2373" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2373" tag="hblock_tag_9" canDelete="false" classfield_id="2373" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2374" tag="hblock_tag_10" canDelete="false" classfield_id="2374" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2374" tag="hblock_tag_10" canDelete="false" classfield_id="2374" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2374" tag="hblock_tag_11" canDelete="false" classfield_id="2374" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2374" tag="hblock_tag_11" canDelete="false" classfield_id="2374" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2375" tag="hblock_tag_12" canDelete="false" classfield_id="2375" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2375" tag="hblock_tag_12" canDelete="false" classfield_id="2375" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2375" tag="hblock_tag_13" canDelete="false" classfield_id="2375" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2375" tag="hblock_tag_13" canDelete="false" classfield_id="2375" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2376" tag="hblock_tag_14" canDelete="false" classfield_id="2376" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2376" tag="hblock_tag_14" canDelete="false" classfield_id="2376" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2376" tag="hblock_tag_15" canDelete="false" classfield_id="2376" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2376" tag="hblock_tag_15" canDelete="false" classfield_id="2376" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2377" tag="hblock_tag_16" canDelete="false" classfield_id="2377" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2377" tag="hblock_tag_16" canDelete="false" classfield_id="2377" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2377" tag="hblock_tag_17" canDelete="false" classfield_id="2377" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2377" tag="hblock_tag_17" canDelete="false" classfield_id="2377" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2378" tag="hblock_tag_18" canDelete="false" classfield_id="2378" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2378" tag="hblock_tag_18" canDelete="false" classfield_id="2378" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2378" tag="hblock_tag_19" canDelete="false" classfield_id="2378" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2378" tag="hblock_tag_19" canDelete="false" classfield_id="2378" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2379" tag="hblock_tag_20" canDelete="false" classfield_id="2379" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2379" tag="hblock_tag_20" canDelete="false" classfield_id="2379" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2379" tag="hblock_tag_21" canDelete="false" classfield_id="2379" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2379" tag="hblock_tag_21" canDelete="false" classfield_id="2379" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2380" tag="hblock_tag_22" canDelete="false" classfield_id="2380" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2380" tag="hblock_tag_22" canDelete="false" classfield_id="2380" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2380" tag="hblock_tag_23" canDelete="false" classfield_id="2380" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2380" tag="hblock_tag_23" canDelete="false" classfield_id="2380" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2381" tag="hblock_tag_24" canDelete="false" classfield_id="2381" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2381" tag="hblock_tag_24" canDelete="false" classfield_id="2381" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2381" tag="hblock_tag_25" canDelete="false" classfield_id="2381" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2381" tag="hblock_tag_25" canDelete="false" classfield_id="2381" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2383" tag="hblock_tag_26" canDelete="false" classfield_id="2383" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2383" tag="hblock_tag_26" canDelete="false" classfield_id="2383" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2383" tag="hblock_tag_27" canDelete="false" classfield_id="2383" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2383" tag="hblock_tag_27" canDelete="false" classfield_id="2383" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2384" tag="hblock_tag_28" canDelete="false" classfield_id="2384" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2384" tag="hblock_tag_28" canDelete="false" classfield_id="2384" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2384" tag="hblock_tag_29" canDelete="false" classfield_id="2384" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2384" tag="hblock_tag_29" canDelete="false" classfield_id="2384" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2386" tag="hblock_tag_30" canDelete="false" classfield_id="2386" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2386" tag="hblock_tag_30" canDelete="false" classfield_id="2386" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2386" tag="hblock_tag_31" canDelete="false" classfield_id="2386" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2386" tag="hblock_tag_31" canDelete="false" classfield_id="2386" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2387" tag="hblock_tag_32" canDelete="false" classfield_id="2387" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2387" tag="hblock_tag_32" canDelete="false" classfield_id="2387" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2387" tag="hblock_tag_33" canDelete="false" classfield_id="2387" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2387" tag="hblock_tag_33" canDelete="false" classfield_id="2387" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2388" tag="hblock_tag_34" canDelete="false" classfield_id="2388" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2388" tag="hblock_tag_34" canDelete="false" classfield_id="2388" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2388" tag="hblock_tag_35" canDelete="false" classfield_id="2388" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2388" tag="hblock_tag_35" canDelete="false" classfield_id="2388" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2389" tag="hblock_tag_36" canDelete="false" classfield_id="2389" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2389" tag="hblock_tag_36" canDelete="false" classfield_id="2389" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2389" tag="hblock_tag_37" canDelete="false" classfield_id="2389" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2389" tag="hblock_tag_37" canDelete="false" classfield_id="2389" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2391" tag="hblock_tag_38" canDelete="false" classfield_id="2391" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2391" tag="hblock_tag_38" canDelete="false" classfield_id="2391" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2391" tag="hblock_tag_39" canDelete="false" classfield_id="2391" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2391" tag="hblock_tag_39" canDelete="false" classfield_id="2391" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2392" tag="hblock_tag_40" canDelete="false" classfield_id="2392" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2392" tag="hblock_tag_40" canDelete="false" classfield_id="2392" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2392" tag="hblock_tag_41" canDelete="false" classfield_id="2392" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2392" tag="hblock_tag_41" canDelete="false" classfield_id="2392" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2393" tag="hblock_tag_42" canDelete="false" classfield_id="2393" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2393" tag="hblock_tag_42" canDelete="false" classfield_id="2393" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2393" tag="hblock_tag_43" canDelete="false" classfield_id="2393" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2393" tag="hblock_tag_43" canDelete="false" classfield_id="2393" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2394" tag="hblock_tag_44" canDelete="false" classfield_id="2394" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2394" tag="hblock_tag_44" canDelete="false" classfield_id="2394" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2394" tag="hblock_tag_45" canDelete="false" classfield_id="2394" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2394" tag="hblock_tag_45" canDelete="false" classfield_id="2394" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2395" tag="hblock_tag_46" canDelete="false" classfield_id="2395" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2395" tag="hblock_tag_46" canDelete="false" classfield_id="2395" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2395" tag="hblock_tag_47" canDelete="false" classfield_id="2395" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2395" tag="hblock_tag_47" canDelete="false" classfield_id="2395" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2396" tag="hblock_tag_48" canDelete="false" classfield_id="2396" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2396" tag="hblock_tag_48" canDelete="false" classfield_id="2396" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2396" tag="hblock_tag_49" canDelete="false" classfield_id="2396" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2396" tag="hblock_tag_49" canDelete="false" classfield_id="2396" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2397" tag="hblock_tag_50" canDelete="false" classfield_id="2397" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2397" tag="hblock_tag_50" canDelete="false" classfield_id="2397" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2397" tag="hblock_tag_51" canDelete="false" classfield_id="2397" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2397" tag="hblock_tag_51" canDelete="false" classfield_id="2397" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2398" tag="hblock_tag_52" canDelete="false" classfield_id="2398" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2398" tag="hblock_tag_52" canDelete="false" classfield_id="2398" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2398" tag="hblock_tag_53" canDelete="false" classfield_id="2398" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2398" tag="hblock_tag_53" canDelete="false" classfield_id="2398" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2399" tag="hblock_tag_54" canDelete="false" classfield_id="2399" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2399" tag="hblock_tag_54" canDelete="false" classfield_id="2399" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2399" tag="hblock_tag_55" canDelete="false" classfield_id="2399" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2399" tag="hblock_tag_55" canDelete="false" classfield_id="2399" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2400" tag="hblock_tag_56" canDelete="false" classfield_id="2400" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2400" tag="hblock_tag_56" canDelete="false" classfield_id="2400" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2400" tag="hblock_tag_57" canDelete="false" classfield_id="2400" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2400" tag="hblock_tag_57" canDelete="false" classfield_id="2400" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2401" tag="hblock_tag_58" canDelete="false" classfield_id="2401" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2401" tag="hblock_tag_58" canDelete="false" classfield_id="2401" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2401" tag="hblock_tag_59" canDelete="false" classfield_id="2401" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2401" tag="hblock_tag_59" canDelete="false" classfield_id="2401" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2402" tag="hblock_tag_60" canDelete="false" classfield_id="2402" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2402" tag="hblock_tag_60" canDelete="false" classfield_id="2402" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2402" tag="hblock_tag_61" canDelete="false" classfield_id="2402" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2402" tag="hblock_tag_61" canDelete="false" classfield_id="2402" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2403" tag="hblock_tag_62" canDelete="false" classfield_id="2403" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2403" tag="hblock_tag_62" canDelete="false" classfield_id="2403" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2403" tag="hblock_tag_63" canDelete="false" classfield_id="2403" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2403" tag="hblock_tag_63" canDelete="false" classfield_id="2403" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2404" tag="hblock_tag_64" canDelete="false" classfield_id="2404" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2404" tag="hblock_tag_64" canDelete="false" classfield_id="2404" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2404" tag="hblock_tag_65" canDelete="false" classfield_id="2404" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2404" tag="hblock_tag_65" canDelete="false" classfield_id="2404" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2405" tag="hblock_tag_66" canDelete="false" classfield_id="2405" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2405" tag="hblock_tag_66" canDelete="false" classfield_id="2405" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2405" tag="hblock_tag_67" canDelete="false" classfield_id="2405" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2405" tag="hblock_tag_67" canDelete="false" classfield_id="2405" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2406" tag="hblock_tag_68" canDelete="false" classfield_id="2406" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2406" tag="hblock_tag_68" canDelete="false" classfield_id="2406" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2406" tag="hblock_tag_69" canDelete="false" classfield_id="2406" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2406" tag="hblock_tag_69" canDelete="false" classfield_id="2406" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2407" tag="hblock_tag_70" canDelete="false" classfield_id="2407" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2407" tag="hblock_tag_70" canDelete="false" classfield_id="2407" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2407" tag="hblock_tag_71" canDelete="false" classfield_id="2407" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2407" tag="hblock_tag_71" canDelete="false" classfield_id="2407" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2408" tag="hblock_tag_72" canDelete="false" classfield_id="2408" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2408" tag="hblock_tag_72" canDelete="false" classfield_id="2408" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2408" tag="hblock_tag_73" canDelete="false" classfield_id="2408" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2408" tag="hblock_tag_73" canDelete="false" classfield_id="2408" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2409" tag="hblock_tag_74" canDelete="false" classfield_id="2409" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2409" tag="hblock_tag_74" canDelete="false" classfield_id="2409" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2409" tag="hblock_tag_75" canDelete="false" classfield_id="2409" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2409" tag="hblock_tag_75" canDelete="false" classfield_id="2409" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2410" tag="hblock_tag_76" canDelete="false" classfield_id="2410" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2410" tag="hblock_tag_76" canDelete="false" classfield_id="2410" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2410" tag="hblock_tag_77" canDelete="false" classfield_id="2410" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2410" tag="hblock_tag_77" canDelete="false" classfield_id="2410" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2411" tag="hblock_tag_78" canDelete="false" classfield_id="2411" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2411" tag="hblock_tag_78" canDelete="false" classfield_id="2411" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2411" tag="hblock_tag_79" canDelete="false" classfield_id="2411" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2411" tag="hblock_tag_79" canDelete="false" classfield_id="2411" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2412" tag="hblock_tag_80" canDelete="false" classfield_id="2412" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2412" tag="hblock_tag_80" canDelete="false" classfield_id="2412" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2412" tag="hblock_tag_81" canDelete="false" classfield_id="2412" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2412" tag="hblock_tag_81" canDelete="false" classfield_id="2412" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2413" tag="hblock_tag_82" canDelete="false" classfield_id="2413" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2413" tag="hblock_tag_82" canDelete="false" classfield_id="2413" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2413" tag="hblock_tag_83" canDelete="false" classfield_id="2413" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2413" tag="hblock_tag_83" canDelete="false" classfield_id="2413" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2414" tag="hblock_tag_84" canDelete="false" classfield_id="2414" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2414" tag="hblock_tag_84" canDelete="false" classfield_id="2414" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2414" tag="hblock_tag_85" canDelete="false" classfield_id="2414" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2414" tag="hblock_tag_85" canDelete="false" classfield_id="2414" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2415" tag="hblock_tag_86" canDelete="false" classfield_id="2415" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2415" tag="hblock_tag_86" canDelete="false" classfield_id="2415" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2415" tag="hblock_tag_87" canDelete="false" classfield_id="2415" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2415" tag="hblock_tag_87" canDelete="false" classfield_id="2415" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2416" tag="hblock_tag_88" canDelete="false" classfield_id="2416" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2416" tag="hblock_tag_88" canDelete="false" classfield_id="2416" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2416" tag="hblock_tag_89" canDelete="false" classfield_id="2416" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2416" tag="hblock_tag_89" canDelete="false" classfield_id="2416" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2417" tag="hblock_tag_90" canDelete="false" classfield_id="2417" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2417" tag="hblock_tag_90" canDelete="false" classfield_id="2417" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2417" tag="hblock_tag_91" canDelete="false" classfield_id="2417" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2417" tag="hblock_tag_91" canDelete="false" classfield_id="2417" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2418" tag="hblock_tag_92" canDelete="false" classfield_id="2418" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2418" tag="hblock_tag_92" canDelete="false" classfield_id="2418" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2418" tag="hblock_tag_93" canDelete="false" classfield_id="2418" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2418" tag="hblock_tag_93" canDelete="false" classfield_id="2418" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2419" tag="hblock_tag_94" canDelete="false" classfield_id="2419" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2419" tag="hblock_tag_94" canDelete="false" classfield_id="2419" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2419" tag="hblock_tag_95" canDelete="false" classfield_id="2419" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2419" tag="hblock_tag_95" canDelete="false" classfield_id="2419" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2420" tag="hblock_tag_96" canDelete="false" classfield_id="2420" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2420" tag="hblock_tag_96" canDelete="false" classfield_id="2420" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2420" tag="hblock_tag_97" canDelete="false" classfield_id="2420" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2420" tag="hblock_tag_97" canDelete="false" classfield_id="2420" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2421" tag="hblock_tag_98" canDelete="false" classfield_id="2421" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2421" tag="hblock_tag_98" canDelete="false" classfield_id="2421" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2421" tag="hblock_tag_99" canDelete="false" classfield_id="2421" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2421" tag="hblock_tag_99" canDelete="false" classfield_id="2421" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2424" tag="hblock_tag_100" canDelete="false" classfield_id="2424" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2424" tag="hblock_tag_100" canDelete="false" classfield_id="2424" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2424" tag="hblock_tag_101" canDelete="false" classfield_id="2424" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2424" tag="hblock_tag_101" canDelete="false" classfield_id="2424" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2425" tag="hblock_tag_102" canDelete="false" classfield_id="2425" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2425" tag="hblock_tag_102" canDelete="false" classfield_id="2425" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2425" tag="hblock_tag_103" canDelete="false" classfield_id="2425" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2425" tag="hblock_tag_103" canDelete="false" classfield_id="2425" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2426" tag="hblock_tag_104" canDelete="false" classfield_id="2426" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2426" tag="hblock_tag_104" canDelete="false" classfield_id="2426" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2426" tag="hblock_tag_105" canDelete="false" classfield_id="2426" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2426" tag="hblock_tag_105" canDelete="false" classfield_id="2426" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2427" tag="hblock_tag_106" canDelete="false" classfield_id="2427" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2427" tag="hblock_tag_106" canDelete="false" classfield_id="2427" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2427" tag="hblock_tag_107" canDelete="false" classfield_id="2427" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2427" tag="hblock_tag_107" canDelete="false" classfield_id="2427" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2428" tag="hblock_tag_108" canDelete="false" classfield_id="2428" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2428" tag="hblock_tag_108" canDelete="false" classfield_id="2428" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2428" tag="hblock_tag_109" canDelete="false" classfield_id="2428" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2428" tag="hblock_tag_109" canDelete="false" classfield_id="2428" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2429" tag="hblock_tag_110" canDelete="false" classfield_id="2429" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2429" tag="hblock_tag_110" canDelete="false" classfield_id="2429" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2429" tag="hblock_tag_111" canDelete="false" classfield_id="2429" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2429" tag="hblock_tag_111" canDelete="false" classfield_id="2429" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2430" tag="hblock_tag_112" canDelete="false" classfield_id="2430" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2430" tag="hblock_tag_112" canDelete="false" classfield_id="2430" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2430" tag="hblock_tag_113" canDelete="false" classfield_id="2430" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2430" tag="hblock_tag_113" canDelete="false" classfield_id="2430" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2431" tag="hblock_tag_114" canDelete="false" classfield_id="2431" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2431" tag="hblock_tag_114" canDelete="false" classfield_id="2431" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2431" tag="hblock_tag_115" canDelete="false" classfield_id="2431" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2431" tag="hblock_tag_115" canDelete="false" classfield_id="2431" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2432" tag="hblock_tag_116" canDelete="false" classfield_id="2432" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2432" tag="hblock_tag_116" canDelete="false" classfield_id="2432" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2432" tag="hblock_tag_117" canDelete="false" classfield_id="2432" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2432" tag="hblock_tag_117" canDelete="false" classfield_id="2432" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2433" tag="hblock_tag_118" canDelete="false" classfield_id="2433" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2433" tag="hblock_tag_118" canDelete="false" classfield_id="2433" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2433" tag="hblock_tag_119" canDelete="false" classfield_id="2433" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2433" tag="hblock_tag_119" canDelete="false" classfield_id="2433" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2434" tag="hblock_tag_120" canDelete="false" classfield_id="2434" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2434" tag="hblock_tag_120" canDelete="false" classfield_id="2434" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2434" tag="hblock_tag_121" canDelete="false" classfield_id="2434" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2434" tag="hblock_tag_121" canDelete="false" classfield_id="2434" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2435" tag="hblock_tag_122" canDelete="false" classfield_id="2435" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2435" tag="hblock_tag_122" canDelete="false" classfield_id="2435" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2435" tag="hblock_tag_123" canDelete="false" classfield_id="2435" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2435" tag="hblock_tag_123" canDelete="false" classfield_id="2435" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2436" tag="hblock_tag_124" canDelete="false" classfield_id="2436" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2436" tag="hblock_tag_124" canDelete="false" classfield_id="2436" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2436" tag="hblock_tag_125" canDelete="false" classfield_id="2436" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2436" tag="hblock_tag_125" canDelete="false" classfield_id="2436" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2437" tag="hblock_tag_126" canDelete="false" classfield_id="2437" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2437" tag="hblock_tag_126" canDelete="false" classfield_id="2437" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2437" tag="hblock_tag_127" canDelete="false" classfield_id="2437" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2437" tag="hblock_tag_127" canDelete="false" classfield_id="2437" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2438" tag="hblock_tag_128" canDelete="false" classfield_id="2438" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2438" tag="hblock_tag_128" canDelete="false" classfield_id="2438" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2438" tag="hblock_tag_129" canDelete="false" classfield_id="2438" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2438" tag="hblock_tag_129" canDelete="false" classfield_id="2438" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2439" tag="hblock_tag_130" canDelete="false" classfield_id="2439" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2439" tag="hblock_tag_130" canDelete="false" classfield_id="2439" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2439" tag="hblock_tag_131" canDelete="false" classfield_id="2439" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2439" tag="hblock_tag_131" canDelete="false" classfield_id="2439" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2440" tag="hblock_tag_132" canDelete="false" classfield_id="2440" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2440" tag="hblock_tag_132" canDelete="false" classfield_id="2440" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2440" tag="hblock_tag_133" canDelete="false" classfield_id="2440" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2440" tag="hblock_tag_133" canDelete="false" classfield_id="2440" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2442" tag="hblock_tag_134" canDelete="false" classfield_id="2442" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2442" tag="hblock_tag_134" canDelete="false" classfield_id="2442" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2442" tag="hblock_tag_135" canDelete="false" classfield_id="2442" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2442" tag="hblock_tag_135" canDelete="false" classfield_id="2442" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2443" tag="hblock_tag_136" canDelete="false" classfield_id="2443" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2443" tag="hblock_tag_136" canDelete="false" classfield_id="2443" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2443" tag="hblock_tag_137" canDelete="false" classfield_id="2443" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2443" tag="hblock_tag_137" canDelete="false" classfield_id="2443" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2444" tag="hblock_tag_138" canDelete="false" classfield_id="2444" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2444" tag="hblock_tag_138" canDelete="false" classfield_id="2444" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2444" tag="hblock_tag_139" canDelete="false" classfield_id="2444" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2444" tag="hblock_tag_139" canDelete="false" classfield_id="2444" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2445" tag="hblock_tag_140" canDelete="false" classfield_id="2445" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2445" tag="hblock_tag_140" canDelete="false" classfield_id="2445" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2445" tag="hblock_tag_141" canDelete="false" classfield_id="2445" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2445" tag="hblock_tag_141" canDelete="false" classfield_id="2445" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2446" tag="hblock_tag_142" canDelete="false" classfield_id="2446" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2446" tag="hblock_tag_142" canDelete="false" classfield_id="2446" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2446" tag="hblock_tag_143" canDelete="false" classfield_id="2446" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2446" tag="hblock_tag_143" canDelete="false" classfield_id="2446" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2447" tag="hblock_tag_144" canDelete="false" classfield_id="2447" role_id="-1" >
+        <codeaccessormethod accessType="0" parent_id="2447" tag="hblock_tag_144" canDelete="false" classfield_id="2447" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2447" tag="hblock_tag_145" canDelete="false" classfield_id="2447" role_id="-1" >
+        <codeaccessormethod accessType="1" parent_id="2447" tag="hblock_tag_145" canDelete="false" classfield_id="2447" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_146" canDelete="false" classfield_id="2366" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_146" canDelete="false" classfield_id="2366" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_147" canDelete="false" classfield_id="2366" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_147" canDelete="false" classfield_id="2366" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_148" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_148" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_149" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_149" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_150" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_150" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_151" canDelete="false" classfield_id="2368" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_151" canDelete="false" classfield_id="2368" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_152" canDelete="false" classfield_id="2368" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_152" canDelete="false" classfield_id="2368" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_153" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_153" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_154" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_154" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_155" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_155" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_156" canDelete="false" classfield_id="2369" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_156" canDelete="false" classfield_id="2369" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_157" canDelete="false" classfield_id="2369" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_157" canDelete="false" classfield_id="2369" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_158" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_158" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_159" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_159" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_160" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_160" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_161" canDelete="false" classfield_id="2382" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_161" canDelete="false" classfield_id="2382" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_162" canDelete="false" classfield_id="2382" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_162" canDelete="false" classfield_id="2382" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_163" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_163" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_164" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_164" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_165" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_165" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_166" canDelete="false" classfield_id="2385" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_166" canDelete="false" classfield_id="2385" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_167" canDelete="false" classfield_id="2385" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_167" canDelete="false" classfield_id="2385" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_168" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_168" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_169" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_169" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_170" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_170" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_171" canDelete="false" classfield_id="2390" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_171" canDelete="false" classfield_id="2390" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_172" canDelete="false" classfield_id="2390" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_172" canDelete="false" classfield_id="2390" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_173" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_173" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_174" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_174" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_175" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_175" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_176" canDelete="false" classfield_id="2422" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_176" canDelete="false" classfield_id="2422" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_177" canDelete="false" classfield_id="2422" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_177" canDelete="false" classfield_id="2422" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_178" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_178" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_179" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_179" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_180" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_180" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_181" canDelete="false" classfield_id="2423" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_181" canDelete="false" classfield_id="2423" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_182" canDelete="false" classfield_id="2423" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_182" canDelete="false" classfield_id="2423" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_183" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_183" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_184" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_184" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_185" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_185" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_186" canDelete="false" classfield_id="2441" role_id="0" >
+        <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_186" canDelete="false" classfield_id="2441" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_187" canDelete="false" classfield_id="2441" role_id="0" >
+        <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_187" canDelete="false" classfield_id="2441" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_188" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
+        <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_188" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_189" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
+        <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_189" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_190" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
+        <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_190" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="2448" tag="operation_2448" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2448" tag="operation_2448" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2453" tag="operation_2453" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2453" tag="operation_2453" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2455" tag="operation_2455" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2455" tag="operation_2455" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2456" tag="operation_2456" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2456" tag="operation_2456" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2457" tag="operation_2457" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2457" tag="operation_2457" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2458" tag="operation_2458" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2458" tag="operation_2458" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2459" tag="operation_2459" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2459" tag="operation_2459" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2460" tag="operation_2460" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2460" tag="operation_2460" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2462" tag="operation_2462" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2462" tag="operation_2462" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2463" tag="operation_2463" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2463" tag="operation_2463" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2464" tag="operation_2464" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2464" tag="operation_2464" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2465" tag="operation_2465" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2465" tag="operation_2465" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2466" tag="operation_2466" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2466" tag="operation_2466" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2467" tag="operation_2467" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2467" tag="operation_2467" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2468" tag="operation_2468" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2468" tag="operation_2468" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2469" tag="operation_2469" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2469" tag="operation_2469" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2470" tag="operation_2470" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2470" tag="operation_2470" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2472" tag="operation_2472" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2472" tag="operation_2472" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2473" tag="operation_2473" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2473" tag="operation_2473" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2474" tag="operation_2474" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2474" tag="operation_2474" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2475" tag="operation_2475" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2475" tag="operation_2475" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2476" tag="operation_2476" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2476" tag="operation_2476" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2477" tag="operation_2477" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2477" tag="operation_2477" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2480" tag="operation_2480" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2480" tag="operation_2480" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2481" tag="operation_2481" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2481" tag="operation_2481" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2484" tag="operation_2484" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2484" tag="operation_2484" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2486" tag="operation_2486" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2486" tag="operation_2486" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2487" tag="operation_2487" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2487" tag="operation_2487" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2488" tag="operation_2488" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2488" tag="operation_2488" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2492" tag="operation_2492" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2492" tag="operation_2492" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2494" tag="operation_2494" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2494" tag="operation_2494" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2495" tag="operation_2495" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2495" tag="operation_2495" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2496" tag="operation_2496" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2496" tag="operation_2496" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2498" tag="operation_2498" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2498" tag="operation_2498" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2500" tag="operation_2500" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2500" tag="operation_2500" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2502" tag="operation_2502" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2502" tag="operation_2502" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2504" tag="operation_2504" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2504" tag="operation_2504" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2506" tag="operation_2506" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2506" tag="operation_2506" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2508" tag="operation_2508" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2508" tag="operation_2508" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2510" tag="operation_2510" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2510" tag="operation_2510" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2512" tag="operation_2512" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2512" tag="operation_2512" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2514" tag="operation_2514" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2514" tag="operation_2514" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2515" tag="operation_2515" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2515" tag="operation_2515" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2516" tag="operation_2516" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2516" tag="operation_2516" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2517" tag="operation_2517" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2517" tag="operation_2517" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2519" tag="operation_2519" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2519" tag="operation_2519" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2520" tag="operation_2520" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2520" tag="operation_2520" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2521" tag="operation_2521" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2521" tag="operation_2521" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2522" tag="operation_2522" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2522" tag="operation_2522" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2523" tag="operation_2523" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2523" tag="operation_2523" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2524" tag="operation_2524" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2524" tag="operation_2524" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2525" tag="operation_2525" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2525" tag="operation_2525" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2526" tag="operation_2526" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2526" tag="operation_2526" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2527" tag="operation_2527" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2527" tag="operation_2527" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2528" tag="operation_2528" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2528" tag="operation_2528" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2533" tag="operation_2533" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2533" tag="operation_2533" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2535" tag="operation_2535" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2535" tag="operation_2535" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2536" tag="operation_2536" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2536" tag="operation_2536" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2538" tag="operation_2538" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2538" tag="operation_2538" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2539" tag="operation_2539" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2539" tag="operation_2539" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2542" tag="operation_2542" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2542" tag="operation_2542" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2544" tag="operation_2544" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2544" tag="operation_2544" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2546" tag="operation_2546" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2546" tag="operation_2546" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2549" tag="operation_2549" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2549" tag="operation_2549" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2551" tag="operation_2551" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2551" tag="operation_2551" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2553" tag="operation_2553" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2553" tag="operation_2553" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2554" tag="operation_2554" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2554" tag="operation_2554" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2555" tag="operation_2555" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2555" tag="operation_2555" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2558" tag="operation_2558" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2558" tag="operation_2558" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2559" tag="operation_2559" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2559" tag="operation_2559" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2562" tag="operation_2562" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2562" tag="operation_2562" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="2566" tag="operation_2566" canDelete="false" role_id="-1" >
+        <codeoperation parent_id="2566" tag="operation_2566" canDelete="false" role_id="-1" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -21604,1776 +21604,1776 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisview.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>
-      <codeclassfield tqparent_id="2367" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2367" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2367" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2367" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2367" tag="hblock_tag_0" canDelete="false" classfield_id="2367" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2367" tag="hblock_tag_0" canDelete="false" classfield_id="2367" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2367" tag="hblock_tag_1" canDelete="false" classfield_id="2367" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2367" tag="hblock_tag_1" canDelete="false" classfield_id="2367" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2370" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2370" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2370" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2370" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2370" tag="hblock_tag_2" canDelete="false" classfield_id="2370" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2370" tag="hblock_tag_2" canDelete="false" classfield_id="2370" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2370" tag="hblock_tag_3" canDelete="false" classfield_id="2370" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2370" tag="hblock_tag_3" canDelete="false" classfield_id="2370" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2371" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2371" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2371" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2371" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2371" tag="hblock_tag_4" canDelete="false" classfield_id="2371" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2371" tag="hblock_tag_4" canDelete="false" classfield_id="2371" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2371" tag="hblock_tag_5" canDelete="false" classfield_id="2371" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2371" tag="hblock_tag_5" canDelete="false" classfield_id="2371" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2372" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2372" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2372" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2372" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2372" tag="hblock_tag_6" canDelete="false" classfield_id="2372" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2372" tag="hblock_tag_6" canDelete="false" classfield_id="2372" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2372" tag="hblock_tag_7" canDelete="false" classfield_id="2372" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2372" tag="hblock_tag_7" canDelete="false" classfield_id="2372" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2373" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2373" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2373" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2373" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2373" tag="hblock_tag_8" canDelete="false" classfield_id="2373" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2373" tag="hblock_tag_8" canDelete="false" classfield_id="2373" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2373" tag="hblock_tag_9" canDelete="false" classfield_id="2373" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2373" tag="hblock_tag_9" canDelete="false" classfield_id="2373" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2374" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2374" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2374" tag="hblock_tag_10" canDelete="false" classfield_id="2374" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2374" tag="hblock_tag_10" canDelete="false" classfield_id="2374" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2374" tag="hblock_tag_11" canDelete="false" classfield_id="2374" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2374" tag="hblock_tag_11" canDelete="false" classfield_id="2374" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2375" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2375" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2375" tag="hblock_tag_12" canDelete="false" classfield_id="2375" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2375" tag="hblock_tag_12" canDelete="false" classfield_id="2375" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2375" tag="hblock_tag_13" canDelete="false" classfield_id="2375" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2375" tag="hblock_tag_13" canDelete="false" classfield_id="2375" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2376" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2376" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2376" tag="hblock_tag_14" canDelete="false" classfield_id="2376" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2376" tag="hblock_tag_14" canDelete="false" classfield_id="2376" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2376" tag="hblock_tag_15" canDelete="false" classfield_id="2376" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2376" tag="hblock_tag_15" canDelete="false" classfield_id="2376" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2377" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2377" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2377" tag="hblock_tag_16" canDelete="false" classfield_id="2377" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2377" tag="hblock_tag_16" canDelete="false" classfield_id="2377" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2377" tag="hblock_tag_17" canDelete="false" classfield_id="2377" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2377" tag="hblock_tag_17" canDelete="false" classfield_id="2377" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2378" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2378" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2378" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2378" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2378" tag="hblock_tag_18" canDelete="false" classfield_id="2378" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2378" tag="hblock_tag_18" canDelete="false" classfield_id="2378" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2378" tag="hblock_tag_19" canDelete="false" classfield_id="2378" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2378" tag="hblock_tag_19" canDelete="false" classfield_id="2378" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2379" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2379" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2379" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2379" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2379" tag="hblock_tag_20" canDelete="false" classfield_id="2379" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2379" tag="hblock_tag_20" canDelete="false" classfield_id="2379" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2379" tag="hblock_tag_21" canDelete="false" classfield_id="2379" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2379" tag="hblock_tag_21" canDelete="false" classfield_id="2379" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2380" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2380" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2380" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2380" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2380" tag="hblock_tag_22" canDelete="false" classfield_id="2380" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2380" tag="hblock_tag_22" canDelete="false" classfield_id="2380" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2380" tag="hblock_tag_23" canDelete="false" classfield_id="2380" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2380" tag="hblock_tag_23" canDelete="false" classfield_id="2380" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2381" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2381" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2381" tag="hblock_tag_24" canDelete="false" classfield_id="2381" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2381" tag="hblock_tag_24" canDelete="false" classfield_id="2381" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2381" tag="hblock_tag_25" canDelete="false" classfield_id="2381" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2381" tag="hblock_tag_25" canDelete="false" classfield_id="2381" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2383" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2383" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2383" tag="hblock_tag_26" canDelete="false" classfield_id="2383" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2383" tag="hblock_tag_26" canDelete="false" classfield_id="2383" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2383" tag="hblock_tag_27" canDelete="false" classfield_id="2383" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2383" tag="hblock_tag_27" canDelete="false" classfield_id="2383" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2384" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2384" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2384" tag="hblock_tag_28" canDelete="false" classfield_id="2384" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2384" tag="hblock_tag_28" canDelete="false" classfield_id="2384" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2384" tag="hblock_tag_29" canDelete="false" classfield_id="2384" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2384" tag="hblock_tag_29" canDelete="false" classfield_id="2384" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2386" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2386" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2386" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2386" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2386" tag="hblock_tag_30" canDelete="false" classfield_id="2386" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2386" tag="hblock_tag_30" canDelete="false" classfield_id="2386" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2386" tag="hblock_tag_31" canDelete="false" classfield_id="2386" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2386" tag="hblock_tag_31" canDelete="false" classfield_id="2386" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2387" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2387" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2387" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2387" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2387" tag="hblock_tag_32" canDelete="false" classfield_id="2387" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2387" tag="hblock_tag_32" canDelete="false" classfield_id="2387" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2387" tag="hblock_tag_33" canDelete="false" classfield_id="2387" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2387" tag="hblock_tag_33" canDelete="false" classfield_id="2387" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2388" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2388" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2388" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2388" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2388" tag="hblock_tag_34" canDelete="false" classfield_id="2388" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2388" tag="hblock_tag_34" canDelete="false" classfield_id="2388" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2388" tag="hblock_tag_35" canDelete="false" classfield_id="2388" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2388" tag="hblock_tag_35" canDelete="false" classfield_id="2388" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2389" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2389" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2389" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2389" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2389" tag="hblock_tag_36" canDelete="false" classfield_id="2389" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2389" tag="hblock_tag_36" canDelete="false" classfield_id="2389" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2389" tag="hblock_tag_37" canDelete="false" classfield_id="2389" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2389" tag="hblock_tag_37" canDelete="false" classfield_id="2389" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2391" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2391" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2391" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2391" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2391" tag="hblock_tag_38" canDelete="false" classfield_id="2391" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2391" tag="hblock_tag_38" canDelete="false" classfield_id="2391" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2391" tag="hblock_tag_39" canDelete="false" classfield_id="2391" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2391" tag="hblock_tag_39" canDelete="false" classfield_id="2391" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2392" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2392" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2392" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2392" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2392" tag="hblock_tag_40" canDelete="false" classfield_id="2392" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2392" tag="hblock_tag_40" canDelete="false" classfield_id="2392" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2392" tag="hblock_tag_41" canDelete="false" classfield_id="2392" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2392" tag="hblock_tag_41" canDelete="false" classfield_id="2392" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2393" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2393" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2393" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2393" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2393" tag="hblock_tag_42" canDelete="false" classfield_id="2393" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2393" tag="hblock_tag_42" canDelete="false" classfield_id="2393" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2393" tag="hblock_tag_43" canDelete="false" classfield_id="2393" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2393" tag="hblock_tag_43" canDelete="false" classfield_id="2393" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2394" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2394" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2394" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2394" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2394" tag="hblock_tag_44" canDelete="false" classfield_id="2394" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2394" tag="hblock_tag_44" canDelete="false" classfield_id="2394" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2394" tag="hblock_tag_45" canDelete="false" classfield_id="2394" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2394" tag="hblock_tag_45" canDelete="false" classfield_id="2394" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2395" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2395" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2395" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2395" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2395" tag="hblock_tag_46" canDelete="false" classfield_id="2395" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2395" tag="hblock_tag_46" canDelete="false" classfield_id="2395" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2395" tag="hblock_tag_47" canDelete="false" classfield_id="2395" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2395" tag="hblock_tag_47" canDelete="false" classfield_id="2395" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2396" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2396" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2396" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2396" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2396" tag="hblock_tag_48" canDelete="false" classfield_id="2396" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2396" tag="hblock_tag_48" canDelete="false" classfield_id="2396" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2396" tag="hblock_tag_49" canDelete="false" classfield_id="2396" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2396" tag="hblock_tag_49" canDelete="false" classfield_id="2396" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2397" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2397" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2397" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2397" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2397" tag="hblock_tag_50" canDelete="false" classfield_id="2397" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2397" tag="hblock_tag_50" canDelete="false" classfield_id="2397" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2397" tag="hblock_tag_51" canDelete="false" classfield_id="2397" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2397" tag="hblock_tag_51" canDelete="false" classfield_id="2397" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2398" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2398" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2398" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2398" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2398" tag="hblock_tag_52" canDelete="false" classfield_id="2398" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2398" tag="hblock_tag_52" canDelete="false" classfield_id="2398" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2398" tag="hblock_tag_53" canDelete="false" classfield_id="2398" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2398" tag="hblock_tag_53" canDelete="false" classfield_id="2398" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2399" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2399" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2399" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2399" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2399" tag="hblock_tag_54" canDelete="false" classfield_id="2399" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2399" tag="hblock_tag_54" canDelete="false" classfield_id="2399" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2399" tag="hblock_tag_55" canDelete="false" classfield_id="2399" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2399" tag="hblock_tag_55" canDelete="false" classfield_id="2399" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2400" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2400" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2400" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2400" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2400" tag="hblock_tag_56" canDelete="false" classfield_id="2400" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2400" tag="hblock_tag_56" canDelete="false" classfield_id="2400" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2400" tag="hblock_tag_57" canDelete="false" classfield_id="2400" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2400" tag="hblock_tag_57" canDelete="false" classfield_id="2400" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2401" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2401" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2401" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2401" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2401" tag="hblock_tag_58" canDelete="false" classfield_id="2401" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2401" tag="hblock_tag_58" canDelete="false" classfield_id="2401" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2401" tag="hblock_tag_59" canDelete="false" classfield_id="2401" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2401" tag="hblock_tag_59" canDelete="false" classfield_id="2401" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2402" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2402" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2402" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2402" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2402" tag="hblock_tag_60" canDelete="false" classfield_id="2402" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2402" tag="hblock_tag_60" canDelete="false" classfield_id="2402" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2402" tag="hblock_tag_61" canDelete="false" classfield_id="2402" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2402" tag="hblock_tag_61" canDelete="false" classfield_id="2402" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2403" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2403" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2403" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2403" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2403" tag="hblock_tag_62" canDelete="false" classfield_id="2403" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2403" tag="hblock_tag_62" canDelete="false" classfield_id="2403" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2403" tag="hblock_tag_63" canDelete="false" classfield_id="2403" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2403" tag="hblock_tag_63" canDelete="false" classfield_id="2403" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2404" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2404" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2404" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2404" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2404" tag="hblock_tag_64" canDelete="false" classfield_id="2404" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2404" tag="hblock_tag_64" canDelete="false" classfield_id="2404" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2404" tag="hblock_tag_65" canDelete="false" classfield_id="2404" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2404" tag="hblock_tag_65" canDelete="false" classfield_id="2404" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2405" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2405" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2405" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2405" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2405" tag="hblock_tag_66" canDelete="false" classfield_id="2405" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2405" tag="hblock_tag_66" canDelete="false" classfield_id="2405" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2405" tag="hblock_tag_67" canDelete="false" classfield_id="2405" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2405" tag="hblock_tag_67" canDelete="false" classfield_id="2405" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2406" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2406" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2406" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2406" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2406" tag="hblock_tag_68" canDelete="false" classfield_id="2406" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2406" tag="hblock_tag_68" canDelete="false" classfield_id="2406" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2406" tag="hblock_tag_69" canDelete="false" classfield_id="2406" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2406" tag="hblock_tag_69" canDelete="false" classfield_id="2406" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2407" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2407" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2407" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2407" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2407" tag="hblock_tag_70" canDelete="false" classfield_id="2407" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2407" tag="hblock_tag_70" canDelete="false" classfield_id="2407" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2407" tag="hblock_tag_71" canDelete="false" classfield_id="2407" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2407" tag="hblock_tag_71" canDelete="false" classfield_id="2407" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2408" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2408" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2408" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2408" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2408" tag="hblock_tag_72" canDelete="false" classfield_id="2408" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2408" tag="hblock_tag_72" canDelete="false" classfield_id="2408" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2408" tag="hblock_tag_73" canDelete="false" classfield_id="2408" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2408" tag="hblock_tag_73" canDelete="false" classfield_id="2408" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2409" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2409" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2409" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2409" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2409" tag="hblock_tag_74" canDelete="false" classfield_id="2409" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2409" tag="hblock_tag_74" canDelete="false" classfield_id="2409" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2409" tag="hblock_tag_75" canDelete="false" classfield_id="2409" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2409" tag="hblock_tag_75" canDelete="false" classfield_id="2409" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2410" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2410" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2410" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2410" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2410" tag="hblock_tag_76" canDelete="false" classfield_id="2410" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2410" tag="hblock_tag_76" canDelete="false" classfield_id="2410" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2410" tag="hblock_tag_77" canDelete="false" classfield_id="2410" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2410" tag="hblock_tag_77" canDelete="false" classfield_id="2410" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2411" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2411" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2411" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2411" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2411" tag="hblock_tag_78" canDelete="false" classfield_id="2411" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2411" tag="hblock_tag_78" canDelete="false" classfield_id="2411" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2411" tag="hblock_tag_79" canDelete="false" classfield_id="2411" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2411" tag="hblock_tag_79" canDelete="false" classfield_id="2411" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2412" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2412" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2412" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2412" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2412" tag="hblock_tag_80" canDelete="false" classfield_id="2412" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2412" tag="hblock_tag_80" canDelete="false" classfield_id="2412" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2412" tag="hblock_tag_81" canDelete="false" classfield_id="2412" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2412" tag="hblock_tag_81" canDelete="false" classfield_id="2412" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2413" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2413" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2413" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2413" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2413" tag="hblock_tag_82" canDelete="false" classfield_id="2413" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2413" tag="hblock_tag_82" canDelete="false" classfield_id="2413" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2413" tag="hblock_tag_83" canDelete="false" classfield_id="2413" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2413" tag="hblock_tag_83" canDelete="false" classfield_id="2413" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2414" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2414" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2414" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2414" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2414" tag="hblock_tag_84" canDelete="false" classfield_id="2414" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2414" tag="hblock_tag_84" canDelete="false" classfield_id="2414" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2414" tag="hblock_tag_85" canDelete="false" classfield_id="2414" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2414" tag="hblock_tag_85" canDelete="false" classfield_id="2414" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2415" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2415" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2415" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2415" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2415" tag="hblock_tag_86" canDelete="false" classfield_id="2415" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2415" tag="hblock_tag_86" canDelete="false" classfield_id="2415" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2415" tag="hblock_tag_87" canDelete="false" classfield_id="2415" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2415" tag="hblock_tag_87" canDelete="false" classfield_id="2415" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2416" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2416" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2416" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2416" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2416" tag="hblock_tag_88" canDelete="false" classfield_id="2416" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2416" tag="hblock_tag_88" canDelete="false" classfield_id="2416" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2416" tag="hblock_tag_89" canDelete="false" classfield_id="2416" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2416" tag="hblock_tag_89" canDelete="false" classfield_id="2416" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2417" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2417" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2417" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2417" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2417" tag="hblock_tag_90" canDelete="false" classfield_id="2417" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2417" tag="hblock_tag_90" canDelete="false" classfield_id="2417" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2417" tag="hblock_tag_91" canDelete="false" classfield_id="2417" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2417" tag="hblock_tag_91" canDelete="false" classfield_id="2417" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2418" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2418" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2418" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2418" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2418" tag="hblock_tag_92" canDelete="false" classfield_id="2418" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2418" tag="hblock_tag_92" canDelete="false" classfield_id="2418" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2418" tag="hblock_tag_93" canDelete="false" classfield_id="2418" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2418" tag="hblock_tag_93" canDelete="false" classfield_id="2418" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2419" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2419" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2419" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2419" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2419" tag="hblock_tag_94" canDelete="false" classfield_id="2419" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2419" tag="hblock_tag_94" canDelete="false" classfield_id="2419" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2419" tag="hblock_tag_95" canDelete="false" classfield_id="2419" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2419" tag="hblock_tag_95" canDelete="false" classfield_id="2419" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2420" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2420" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2420" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2420" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2420" tag="hblock_tag_96" canDelete="false" classfield_id="2420" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2420" tag="hblock_tag_96" canDelete="false" classfield_id="2420" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2420" tag="hblock_tag_97" canDelete="false" classfield_id="2420" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2420" tag="hblock_tag_97" canDelete="false" classfield_id="2420" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2421" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2421" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2421" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2421" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2421" tag="hblock_tag_98" canDelete="false" classfield_id="2421" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2421" tag="hblock_tag_98" canDelete="false" classfield_id="2421" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2421" tag="hblock_tag_99" canDelete="false" classfield_id="2421" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2421" tag="hblock_tag_99" canDelete="false" classfield_id="2421" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2424" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2424" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2424" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2424" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2424" tag="hblock_tag_100" canDelete="false" classfield_id="2424" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2424" tag="hblock_tag_100" canDelete="false" classfield_id="2424" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2424" tag="hblock_tag_101" canDelete="false" classfield_id="2424" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2424" tag="hblock_tag_101" canDelete="false" classfield_id="2424" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2425" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2425" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2425" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2425" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2425" tag="hblock_tag_102" canDelete="false" classfield_id="2425" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2425" tag="hblock_tag_102" canDelete="false" classfield_id="2425" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2425" tag="hblock_tag_103" canDelete="false" classfield_id="2425" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2425" tag="hblock_tag_103" canDelete="false" classfield_id="2425" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2426" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2426" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2426" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2426" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2426" tag="hblock_tag_104" canDelete="false" classfield_id="2426" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2426" tag="hblock_tag_104" canDelete="false" classfield_id="2426" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2426" tag="hblock_tag_105" canDelete="false" classfield_id="2426" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2426" tag="hblock_tag_105" canDelete="false" classfield_id="2426" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2427" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2427" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2427" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2427" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2427" tag="hblock_tag_106" canDelete="false" classfield_id="2427" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2427" tag="hblock_tag_106" canDelete="false" classfield_id="2427" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2427" tag="hblock_tag_107" canDelete="false" classfield_id="2427" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2427" tag="hblock_tag_107" canDelete="false" classfield_id="2427" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2428" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2428" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2428" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2428" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2428" tag="hblock_tag_108" canDelete="false" classfield_id="2428" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2428" tag="hblock_tag_108" canDelete="false" classfield_id="2428" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2428" tag="hblock_tag_109" canDelete="false" classfield_id="2428" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2428" tag="hblock_tag_109" canDelete="false" classfield_id="2428" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2429" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2429" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2429" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2429" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2429" tag="hblock_tag_110" canDelete="false" classfield_id="2429" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2429" tag="hblock_tag_110" canDelete="false" classfield_id="2429" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2429" tag="hblock_tag_111" canDelete="false" classfield_id="2429" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2429" tag="hblock_tag_111" canDelete="false" classfield_id="2429" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2430" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2430" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2430" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2430" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2430" tag="hblock_tag_112" canDelete="false" classfield_id="2430" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2430" tag="hblock_tag_112" canDelete="false" classfield_id="2430" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2430" tag="hblock_tag_113" canDelete="false" classfield_id="2430" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2430" tag="hblock_tag_113" canDelete="false" classfield_id="2430" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2431" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2431" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2431" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2431" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2431" tag="hblock_tag_114" canDelete="false" classfield_id="2431" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2431" tag="hblock_tag_114" canDelete="false" classfield_id="2431" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2431" tag="hblock_tag_115" canDelete="false" classfield_id="2431" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2431" tag="hblock_tag_115" canDelete="false" classfield_id="2431" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2432" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2432" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2432" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2432" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2432" tag="hblock_tag_116" canDelete="false" classfield_id="2432" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2432" tag="hblock_tag_116" canDelete="false" classfield_id="2432" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2432" tag="hblock_tag_117" canDelete="false" classfield_id="2432" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2432" tag="hblock_tag_117" canDelete="false" classfield_id="2432" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2433" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2433" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2433" tag="hblock_tag_118" canDelete="false" classfield_id="2433" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2433" tag="hblock_tag_118" canDelete="false" classfield_id="2433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2433" tag="hblock_tag_119" canDelete="false" classfield_id="2433" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2433" tag="hblock_tag_119" canDelete="false" classfield_id="2433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2434" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2434" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2434" tag="hblock_tag_120" canDelete="false" classfield_id="2434" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2434" tag="hblock_tag_120" canDelete="false" classfield_id="2434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2434" tag="hblock_tag_121" canDelete="false" classfield_id="2434" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2434" tag="hblock_tag_121" canDelete="false" classfield_id="2434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2435" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2435" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2435" tag="hblock_tag_122" canDelete="false" classfield_id="2435" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2435" tag="hblock_tag_122" canDelete="false" classfield_id="2435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2435" tag="hblock_tag_123" canDelete="false" classfield_id="2435" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2435" tag="hblock_tag_123" canDelete="false" classfield_id="2435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2436" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2436" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2436" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2436" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2436" tag="hblock_tag_124" canDelete="false" classfield_id="2436" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2436" tag="hblock_tag_124" canDelete="false" classfield_id="2436" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2436" tag="hblock_tag_125" canDelete="false" classfield_id="2436" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2436" tag="hblock_tag_125" canDelete="false" classfield_id="2436" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2437" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2437" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2437" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2437" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2437" tag="hblock_tag_126" canDelete="false" classfield_id="2437" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2437" tag="hblock_tag_126" canDelete="false" classfield_id="2437" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2437" tag="hblock_tag_127" canDelete="false" classfield_id="2437" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2437" tag="hblock_tag_127" canDelete="false" classfield_id="2437" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2438" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2438" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2438" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2438" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2438" tag="hblock_tag_128" canDelete="false" classfield_id="2438" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2438" tag="hblock_tag_128" canDelete="false" classfield_id="2438" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2438" tag="hblock_tag_129" canDelete="false" classfield_id="2438" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2438" tag="hblock_tag_129" canDelete="false" classfield_id="2438" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2439" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2439" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2439" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2439" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2439" tag="hblock_tag_130" canDelete="false" classfield_id="2439" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2439" tag="hblock_tag_130" canDelete="false" classfield_id="2439" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2439" tag="hblock_tag_131" canDelete="false" classfield_id="2439" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2439" tag="hblock_tag_131" canDelete="false" classfield_id="2439" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2440" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2440" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2440" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2440" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2440" tag="hblock_tag_132" canDelete="false" classfield_id="2440" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2440" tag="hblock_tag_132" canDelete="false" classfield_id="2440" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2440" tag="hblock_tag_133" canDelete="false" classfield_id="2440" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2440" tag="hblock_tag_133" canDelete="false" classfield_id="2440" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2442" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2442" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2442" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2442" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2442" tag="hblock_tag_134" canDelete="false" classfield_id="2442" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2442" tag="hblock_tag_134" canDelete="false" classfield_id="2442" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2442" tag="hblock_tag_135" canDelete="false" classfield_id="2442" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2442" tag="hblock_tag_135" canDelete="false" classfield_id="2442" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2443" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2443" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2443" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2443" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2443" tag="hblock_tag_136" canDelete="false" classfield_id="2443" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2443" tag="hblock_tag_136" canDelete="false" classfield_id="2443" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2443" tag="hblock_tag_137" canDelete="false" classfield_id="2443" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2443" tag="hblock_tag_137" canDelete="false" classfield_id="2443" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2444" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2444" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2444" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2444" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2444" tag="hblock_tag_138" canDelete="false" classfield_id="2444" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2444" tag="hblock_tag_138" canDelete="false" classfield_id="2444" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2444" tag="hblock_tag_139" canDelete="false" classfield_id="2444" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2444" tag="hblock_tag_139" canDelete="false" classfield_id="2444" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2445" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2445" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2445" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2445" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2445" tag="hblock_tag_140" canDelete="false" classfield_id="2445" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2445" tag="hblock_tag_140" canDelete="false" classfield_id="2445" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2445" tag="hblock_tag_141" canDelete="false" classfield_id="2445" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2445" tag="hblock_tag_141" canDelete="false" classfield_id="2445" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2446" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2446" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2446" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2446" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2446" tag="hblock_tag_142" canDelete="false" classfield_id="2446" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2446" tag="hblock_tag_142" canDelete="false" classfield_id="2446" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2446" tag="hblock_tag_143" canDelete="false" classfield_id="2446" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2446" tag="hblock_tag_143" canDelete="false" classfield_id="2446" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2447" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2447" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2447" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2447" tag="" canDelete="false" indentLevel="1" role_id="-1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2447" tag="hblock_tag_144" canDelete="false" classfield_id="2447" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2447" tag="hblock_tag_144" canDelete="false" classfield_id="2447" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2447" tag="hblock_tag_145" canDelete="false" classfield_id="2447" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2447" tag="hblock_tag_145" canDelete="false" classfield_id="2447" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2366" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2366" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2366" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2366" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_146" canDelete="false" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_146" canDelete="false" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_147" canDelete="false" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_147" canDelete="false" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_148" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_148" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_149" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_149" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_150" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_150" canDelete="false" writeOutText="false" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2368" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2368" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2368" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2368" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_151" canDelete="false" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_151" canDelete="false" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_152" canDelete="false" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_152" canDelete="false" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_153" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_153" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_154" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_154" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_155" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_155" canDelete="false" writeOutText="false" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2369" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2369" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2369" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2369" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_156" canDelete="false" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_156" canDelete="false" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_157" canDelete="false" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_157" canDelete="false" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_158" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_158" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_159" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_159" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_160" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_160" canDelete="false" writeOutText="false" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2382" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2382" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2382" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2382" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_161" canDelete="false" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_161" canDelete="false" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_162" canDelete="false" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_162" canDelete="false" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_163" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_163" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_164" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_164" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_165" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_165" canDelete="false" writeOutText="false" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2385" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2385" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2385" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2385" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_166" canDelete="false" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_166" canDelete="false" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_167" canDelete="false" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_167" canDelete="false" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_168" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_168" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_169" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_169" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_170" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_170" canDelete="false" writeOutText="false" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2390" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2390" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2390" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2390" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_171" canDelete="false" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_171" canDelete="false" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_172" canDelete="false" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_172" canDelete="false" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_173" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_173" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_174" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_174" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_175" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_175" canDelete="false" writeOutText="false" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2422" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2422" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2422" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2422" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_176" canDelete="false" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_176" canDelete="false" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_177" canDelete="false" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_177" canDelete="false" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_178" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_178" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_179" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_179" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_180" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_180" canDelete="false" writeOutText="false" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2423" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2423" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2423" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2423" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_181" canDelete="false" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_181" canDelete="false" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_182" canDelete="false" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_182" canDelete="false" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_183" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_183" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_184" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_184" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_185" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_185" canDelete="false" writeOutText="false" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2441" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2441" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2441" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="2441" tag="" canDelete="false" indentLevel="1" role_id="0" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_186" canDelete="false" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_186" canDelete="false" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_187" canDelete="false" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_187" canDelete="false" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_188" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_188" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_189" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_189" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_190" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_190" canDelete="false" writeOutText="false" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -23387,7 +23387,7 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" />
      </header>
     </codedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader9" tqparent_class="9" fileExt=".h" fileName="kisbuildersubject" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader9" parent_class="9" fileExt=".h" fileName="kisbuildersubject" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISBUILDERSUBJECT_H&amp;#010;#define KISBUILDERSUBJECT_H" >
        <header>
@@ -23414,7 +23414,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="9" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="9" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisBuilderSubject&amp;#010;" />
          </header>
@@ -23471,7 +23471,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="10" tag="operation_10" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="10" tag="operation_10" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -23528,7 +23528,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="11" tag="operation_11" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="11" tag="operation_11" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -23605,7 +23605,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader12" tqparent_class="12" fileExt=".h" fileName="kisimagemagickconverter" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader12" parent_class="12" fileExt=".h" fileName="kisimagemagickconverter" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISIMAGEMAGICKCONVERTER_H&amp;#010;#define KISIMAGEMAGICKCONVERTER_H" >
        <header>
@@ -23632,7 +23632,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="12" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="12" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisImageMagickConverter&amp;#010;Build a KisImage representation of an image file." />
          </header>
@@ -23689,47 +23689,47 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="20" tag="operation_20" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="20" tag="operation_20" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param doc &amp;#010;@param adapter " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="25" tag="operation_25" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="25" tag="operation_25" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param uri &amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="28" tag="operation_28" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="28" tag="operation_28" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param uri &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="31" tag="operation_31" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="31" tag="operation_31" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param uri " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="36" tag="operation_36" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="36" tag="operation_36" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="40" tag="operation_40" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="40" tag="operation_40" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="41" tag="operation_41" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="41" tag="operation_41" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="42" tag="operation_42" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="42" tag="operation_42" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="43" tag="operation_43" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="43" tag="operation_43" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -23786,22 +23786,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="18" tag="operation_18" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="18" tag="operation_18" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="23" tag="operation_23" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="23" tag="operation_23" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="33" tag="operation_33" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="33" tag="operation_33" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param uri &amp;#010;@param isBlob " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="37" tag="operation_37" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="37" tag="operation_37" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param doc &amp;#010;@param adapter " />
                  </header>
@@ -23822,27 +23822,27 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="13" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
+              <ccfdeclarationcodeblock parent_id="13" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="14" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+              <ccfdeclarationcodeblock parent_id="14" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="15" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
+              <ccfdeclarationcodeblock parent_id="15" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="16" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
+              <ccfdeclarationcodeblock parent_id="16" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="17" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_stop;" >
+              <ccfdeclarationcodeblock parent_id="17" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_stop;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -23876,52 +23876,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="13" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="13" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="13" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="13" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="14" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="14" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="14" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="14" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="15" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="15" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="15" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="15" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="16" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="16" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="16" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="16" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="17" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="17" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="17" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="17" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -23954,101 +23954,101 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimagemagickconverter.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:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="13" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="13" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="13" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
+       <ccfdeclarationcodeblock parent_id="13" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="13" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="13" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="13" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="13" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="13" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="14" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="14" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="14" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+       <ccfdeclarationcodeblock parent_id="14" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="14" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="14" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="14" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="14" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="14" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="15" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="15" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="15" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
+       <ccfdeclarationcodeblock parent_id="15" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="15" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="15" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="15" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="15" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="15" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="16" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="16" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="16" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
+       <ccfdeclarationcodeblock parent_id="16" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="16" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="16" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="16" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="16" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="16" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="17" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="17" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="17" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_stop;" >
+       <ccfdeclarationcodeblock parent_id="17" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_stop;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="17" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="17" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="17" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="17" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="17" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -24056,7 +24056,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader44" tqparent_class="44" fileExt=".h" fileName="kisbuildermonitor" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader44" parent_class="44" fileExt=".h" fileName="kisbuildermonitor" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISBUILDERMONITOR_H&amp;#010;#define KISBUILDERMONITOR_H" >
        <header>
@@ -24083,7 +24083,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="44" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="44" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisBuilderMonitor&amp;#010;" />
          </header>
@@ -24098,7 +24098,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2390" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2390" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -24138,27 +24138,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -24172,22 +24172,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="46" tag="operation_46" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="49" tag="operation_49" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="49" tag="operation_49" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param subject " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="51" tag="operation_51" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="51" tag="operation_51" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param subject " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="53" tag="operation_53" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="53" tag="operation_53" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -24259,7 +24259,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="45" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" vKisBuilderSubject m_subjects;" >
+              <ccfdeclarationcodeblock parent_id="45" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" vKisBuilderSubject m_subjects;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -24293,12 +24293,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="45" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="45" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="45" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="45" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -24331,56 +24331,56 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisbuildermonitor.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:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="45" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="45" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="45" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" vKisBuilderSubject m_subjects;" >
+       <ccfdeclarationcodeblock parent_id="45" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" vKisBuilderSubject m_subjects;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="45" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="45" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="45" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="45" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="45" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2390" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2390" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2390" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2390" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -24388,7 +24388,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader55" tqparent_class="55" fileExt=".h" fileName="kisimagebuilder_result" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader55" parent_class="55" fileExt=".h" fileName="kisimagebuilder_result" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISIMAGEBUILDER_RESULT_H&amp;#010;#define KISIMAGEBUILDER_RESULT_H" >
        <header>
@@ -24415,7 +24415,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="55" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="55" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisImageBuilder_Result&amp;#010;" />
          </header>
@@ -24594,7 +24594,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader69" tqparent_class="69" fileExt=".h" fileName="kisimagebuilder_step" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader69" parent_class="69" fileExt=".h" fileName="kisimagebuilder_step" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISIMAGEBUILDER_STEP_H&amp;#010;#define KISIMAGEBUILDER_STEP_H" >
        <header>
@@ -24621,7 +24621,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="69" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="69" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisImageBuilder_Step&amp;#010;" />
          </header>
@@ -24800,7 +24800,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader81" tqparent_class="81" fileExt=".h" fileName="kisstrategycolorspacecmyk" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader81" parent_class="81" fileExt=".h" fileName="kisstrategycolorspacecmyk" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISSTRATEGYCOLORSPACECMYK_H&amp;#010;#define KISSTRATEGYCOLORSPACECMYK_H" >
        <header>
@@ -24827,7 +24827,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="81" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="81" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisStrategyColorSpaceCMYK&amp;#010;" />
          </header>
@@ -24884,57 +24884,57 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="86" tag="operation_86" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="86" tag="operation_86" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="87" tag="operation_87" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="87" tag="operation_87" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="90" tag="operation_90" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="90" tag="operation_90" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="94" tag="operation_94" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="94" tag="operation_94" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="97" tag="operation_97" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="97" tag="operation_97" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="101" tag="operation_101" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="101" tag="operation_101" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="104" tag="operation_104" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="104" tag="operation_104" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="108" tag="operation_108" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="108" tag="operation_108" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param projection &amp;#010;@param painter &amp;#010;@param x &amp;#010;@param y &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="115" tag="operation_115" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="115" tag="operation_115" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param stride &amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcstride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="125" tag="operation_125" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="125" tag="operation_125" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param stride &amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcstride &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="134" tag="operation_134" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="134" tag="operation_134" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -25006,22 +25006,22 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="82" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
+              <ccfdeclarationcodeblock parent_id="82" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="83" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
+              <ccfdeclarationcodeblock parent_id="83" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="84" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
+              <ccfdeclarationcodeblock parent_id="84" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="85" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" ColorLUT m_rgbLUT;" >
+              <ccfdeclarationcodeblock parent_id="85" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" ColorLUT m_rgbLUT;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -25055,42 +25055,42 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="82" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="82" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="82" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="82" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="83" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="83" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="83" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="83" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="84" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="84" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="84" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="84" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="85" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="85" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="85" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="85" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -25123,81 +25123,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisstrategycolorspacecmyk.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:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="82" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="82" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="82" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
+       <ccfdeclarationcodeblock parent_id="82" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="82" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="82" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="82" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="82" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="82" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="83" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="83" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="83" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
+       <ccfdeclarationcodeblock parent_id="83" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="83" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="83" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="83" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="83" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="83" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="84" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="84" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="84" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
+       <ccfdeclarationcodeblock parent_id="84" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="84" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="84" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="84" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="84" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="84" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="85" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="85" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="85" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" ColorLUT m_rgbLUT;" >
+       <ccfdeclarationcodeblock parent_id="85" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" ColorLUT m_rgbLUT;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="85" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="85" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="85" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="85" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="85" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -25205,7 +25205,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader135" tqparent_class="135" fileExt=".h" fileName="rgb" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader135" parent_class="135" fileExt=".h" fileName="rgb" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef RGB_H&amp;#010;#define RGB_H" >
        <header>
@@ -25232,7 +25232,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="135" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="135" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class RGB&amp;#010;" />
          </header>
@@ -25247,17 +25247,17 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="136" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM b;" >
+              <ccfdeclarationcodeblock parent_id="136" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM b;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="137" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM g;" >
+              <ccfdeclarationcodeblock parent_id="137" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM g;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="138" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM r;" >
+              <ccfdeclarationcodeblock parent_id="138" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM r;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -25297,32 +25297,32 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="136" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="136" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="137" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="137" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="137" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="137" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="138" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="138" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -25457,61 +25457,61 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			rgb.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:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="136" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="136" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="136" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM b;" >
+       <ccfdeclarationcodeblock parent_id="136" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM b;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="136" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="136" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="136" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="137" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="137" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="137" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM g;" >
+       <ccfdeclarationcodeblock parent_id="137" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM g;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="137" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="137" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="137" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="137" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="137" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="138" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM r;" >
+       <ccfdeclarationcodeblock parent_id="138" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM r;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="138" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="138" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="138" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -25519,7 +25519,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader139" tqparent_class="139" fileExt=".h" fileName="kisstrategycolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader139" parent_class="139" fileExt=".h" fileName="kisstrategycolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISSTRATEGYCOLORSPACE_H&amp;#010;#define KISSTRATEGYCOLORSPACE_H" >
        <header>
@@ -25546,7 +25546,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="139" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="139" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisStrategyColorSpace&amp;#010;" />
          </header>
@@ -25603,57 +25603,57 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="142" tag="operation_142" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="142" tag="operation_142" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="145" tag="operation_145" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="145" tag="operation_145" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="148" tag="operation_148" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="148" tag="operation_148" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="152" tag="operation_152" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="152" tag="operation_152" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="155" tag="operation_155" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="155" tag="operation_155" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="159" tag="operation_159" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="159" tag="operation_159" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="162" tag="operation_162" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="162" tag="operation_162" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="166" tag="operation_166" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="166" tag="operation_166" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param projection &amp;#010;@param painter &amp;#010;@param x &amp;#010;@param y &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="173" tag="operation_173" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="173" tag="operation_173" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param stride &amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcstride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="183" tag="operation_183" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="183" tag="operation_183" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param stride &amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcstride &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="192" tag="operation_192" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="192" tag="operation_192" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -25710,12 +25710,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="140" tag="operation_140" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="140" tag="operation_140" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="143" tag="operation_143" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="143" tag="operation_143" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -25792,7 +25792,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader193" tqparent_class="193" fileExt=".h" fileName="kiscolorspacefactoryinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader193" parent_class="193" fileExt=".h" fileName="kiscolorspacefactoryinterface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCOLORSPACEFACTORYINTERFACE_H&amp;#010;#define KISCOLORSPACEFACTORYINTERFACE_H" >
        <header>
@@ -25819,7 +25819,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="193" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="193" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisColorSpaceFactoryInterface&amp;#010;" />
          </header>
@@ -25834,7 +25834,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="194" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisColorSpaceFactoryInterface m_singleton;" >
+              <ccfdeclarationcodeblock parent_id="194" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisColorSpaceFactoryInterface m_singleton;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -25874,27 +25874,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="194" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="194" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="194" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="194" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="194" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="194" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -25908,27 +25908,27 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="197" tag="operation_197" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="197" tag="operation_197" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="200" tag="operation_200" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="200" tag="operation_200" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="202" tag="operation_202" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="202" tag="operation_202" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param imgType " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="204" tag="operation_204" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="204" tag="operation_204" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="205" tag="operation_205" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="205" tag="operation_205" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -25985,12 +25985,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="195" tag="operation_195" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="195" tag="operation_195" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="198" tag="operation_198" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="198" tag="operation_198" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -26066,71 +26066,71 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kiscolorspacefactoryinterface.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:49:16&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="194" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="194" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="194" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisColorSpaceFactoryInterface m_singleton;" >
+       <ccfdeclarationcodeblock parent_id="194" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisColorSpaceFactoryInterface m_singleton;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="194" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="194" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="194" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="194" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="194" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="194" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="194" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="194" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="194" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisColorSpaceFactoryInterface ;" >
+       <ccfdeclarationcodeblock parent_id="194" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisColorSpaceFactoryInterface ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="194" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="194" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="194" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="194" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="194" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="194" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="194" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="194" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -26138,7 +26138,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader206" tqparent_class="206" fileExt=".h" fileName="kisstrategycolorspacergb" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader206" parent_class="206" fileExt=".h" fileName="kisstrategycolorspacergb" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISSTRATEGYCOLORSPACERGB_H&amp;#010;#define KISSTRATEGYCOLORSPACERGB_H" >
        <header>
@@ -26165,7 +26165,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="206" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="206" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisStrategyColorSpaceRGB&amp;#010;" />
          </header>
@@ -26222,57 +26222,57 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="210" tag="operation_210" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="210" tag="operation_210" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="211" tag="operation_211" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="211" tag="operation_211" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="214" tag="operation_214" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="214" tag="operation_214" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="218" tag="operation_218" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="218" tag="operation_218" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="221" tag="operation_221" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="221" tag="operation_221" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="225" tag="operation_225" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="225" tag="operation_225" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="228" tag="operation_228" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="228" tag="operation_228" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="232" tag="operation_232" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="232" tag="operation_232" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param projection &amp;#010;@param painter &amp;#010;@param x &amp;#010;@param y &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="239" tag="operation_239" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="239" tag="operation_239" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param stride &amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcstride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="249" tag="operation_249" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="249" tag="operation_249" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param stride &amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcstride &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="258" tag="operation_258" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="258" tag="operation_258" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -26344,17 +26344,17 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="207" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
+              <ccfdeclarationcodeblock parent_id="207" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="208" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
+              <ccfdeclarationcodeblock parent_id="208" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="209" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
+              <ccfdeclarationcodeblock parent_id="209" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -26388,32 +26388,32 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="207" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="207" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="207" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="207" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="208" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="208" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="208" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="208" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="209" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="209" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="209" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="209" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -26446,61 +26446,61 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisstrategycolorspacergb.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:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="207" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="207" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="207" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
+       <ccfdeclarationcodeblock parent_id="207" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_buf;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="207" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="207" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="207" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="207" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="207" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="208" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="208" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="208" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
+       <ccfdeclarationcodeblock parent_id="208" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KPixmapIO m_pixio;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="208" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="208" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="208" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="208" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="208" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="209" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="209" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="209" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
+       <ccfdeclarationcodeblock parent_id="209" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pixmap;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="209" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="209" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="209" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="209" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="209" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -26508,7 +26508,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader259" tqparent_class="259" fileExt=".h" fileName="cmyk" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader259" parent_class="259" fileExt=".h" fileName="cmyk" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef CMYK_H&amp;#010;#define CMYK_H" >
        <header>
@@ -26535,7 +26535,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="259" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="259" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class CMYK&amp;#010;This class implements the conversion of the Chalk images that contain cmy + transparency&amp;#010;data to rbg for screen rendering." />
          </header>
@@ -26550,22 +26550,22 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="260" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM c;" >
+              <ccfdeclarationcodeblock parent_id="260" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM c;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="261" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM k;" >
+              <ccfdeclarationcodeblock parent_id="261" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM k;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="262" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m;" >
+              <ccfdeclarationcodeblock parent_id="262" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="263" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM y;" >
+              <ccfdeclarationcodeblock parent_id="263" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM y;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -26605,42 +26605,42 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="260" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="260" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="260" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="260" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="261" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="261" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="261" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="261" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="262" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="262" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="262" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="262" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="263" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="263" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="263" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="263" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -26654,7 +26654,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="264" tag="operation_264" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="264" tag="operation_264" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -26781,81 +26781,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			cmyk.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:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="260" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM c;" >
+       <ccfdeclarationcodeblock parent_id="260" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM c;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="260" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="260" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="260" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="260" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="261" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM k;" >
+       <ccfdeclarationcodeblock parent_id="261" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM k;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="261" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="261" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="261" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="261" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="262" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m;" >
+       <ccfdeclarationcodeblock parent_id="262" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="262" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="262" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="262" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="262" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="263" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM y;" >
+       <ccfdeclarationcodeblock parent_id="263" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM y;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="263" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="263" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="263" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="263" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -26863,7 +26863,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader266" tqparent_class="266" fileExt=".h" fileName="kiscolorspacefactoryflyweight" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader266" parent_class="266" fileExt=".h" fileName="kiscolorspacefactoryflyweight" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCOLORSPACEFACTORYFLYWEIGHT_H&amp;#010;#define KISCOLORSPACEFACTORYFLYWEIGHT_H" >
        <header>
@@ -26890,7 +26890,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="266" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="266" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisColorSpaceFactoryFlyweight&amp;#010;" />
          </header>
@@ -26947,22 +26947,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="268" tag="operation_268" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="268" tag="operation_268" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="269" tag="operation_269" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="269" tag="operation_269" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="271" tag="operation_271" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="271" tag="operation_271" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param imgType " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="275" tag="operation_275" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="275" tag="operation_275" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -27019,7 +27019,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="273" tag="operation_273" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="273" tag="operation_273" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param imgType " />
                  </header>
@@ -27040,7 +27040,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="267" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" acFlyweights m_flyweights;" >
+              <ccfdeclarationcodeblock parent_id="267" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" acFlyweights m_flyweights;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -27074,12 +27074,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="267" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="267" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="267" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="267" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -27112,21 +27112,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kiscolorspacefactoryflyweight.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:17&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="267" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" acFlyweights m_flyweights;" >
+       <ccfdeclarationcodeblock parent_id="267" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" acFlyweights m_flyweights;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="267" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="267" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="267" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="267" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -27134,7 +27134,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader283" tqparent_class="283" fileExt=".h" fileName="kisscopedlock" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader283" parent_class="283" fileExt=".h" fileName="kisscopedlock" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISSCOPEDLOCK_H&amp;#010;#define KISSCOPEDLOCK_H" >
        <header>
@@ -27161,7 +27161,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="283" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="283" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisScopedLock&amp;#010;" />
          </header>
@@ -27218,27 +27218,27 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="285" tag="operation_285" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="285" tag="operation_285" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param lock &amp;#010;@param initialLock " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="288" tag="operation_288" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="288" tag="operation_288" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="289" tag="operation_289" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="289" tag="operation_289" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="290" tag="operation_290" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="290" tag="operation_290" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="291" tag="operation_291" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="291" tag="operation_291" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -27310,7 +27310,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="284" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex * m_mutex;" >
+              <ccfdeclarationcodeblock parent_id="284" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex * m_mutex;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -27344,12 +27344,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="284" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="284" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="284" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="284" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -27382,21 +27382,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisscopedlock.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:49:09&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="284" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex * m_mutex;" >
+       <ccfdeclarationcodeblock parent_id="284" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex * m_mutex;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="284" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="284" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="284" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="284" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -27404,7 +27404,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader292" tqparent_class="292" fileExt=".h" fileName="kisstrategymove" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader292" parent_class="292" fileExt=".h" fileName="kisstrategymove" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISSTRATEGYMOVE_H&amp;#010;#define KISSTRATEGYMOVE_H" >
        <header>
@@ -27431,7 +27431,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="292" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="292" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisStrategyMove&amp;#010;" />
          </header>
@@ -27488,47 +27488,47 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="302" tag="operation_302" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="302" tag="operation_302" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="303" tag="operation_303" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="303" tag="operation_303" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param subject " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="307" tag="operation_307" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="307" tag="operation_307" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="309" tag="operation_309" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="309" tag="operation_309" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos &amp;#010;@param undo " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="312" tag="operation_312" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="312" tag="operation_312" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param subject " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="314" tag="operation_314" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="314" tag="operation_314" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x1 &amp;#010;@param y1 &amp;#010;@param x2 &amp;#010;@param y2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="319" tag="operation_319" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="319" tag="operation_319" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt1 &amp;#010;@param pt2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="322" tag="operation_322" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="322" tag="operation_322" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="324" tag="operation_324" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="324" tag="operation_324" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -27585,12 +27585,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="300" tag="operation_300" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="300" tag="operation_300" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="305" tag="operation_305" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="305" tag="operation_305" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -27611,37 +27611,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="293" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasControllerInterface * m_controller;" >
+              <ccfdeclarationcodeblock parent_id="293" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasControllerInterface * m_controller;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="294" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KoDocument * m_doc;" >
+              <ccfdeclarationcodeblock parent_id="294" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KoDocument * m_doc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="295" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_dragStart;" >
+              <ccfdeclarationcodeblock parent_id="295" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_dragStart;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="296" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dragging;" >
+              <ccfdeclarationcodeblock parent_id="296" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dragging;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="297" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerPosition;" >
+              <ccfdeclarationcodeblock parent_id="297" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerPosition;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="298" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerStart;" >
+              <ccfdeclarationcodeblock parent_id="298" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerStart;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="299" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasSubject * m_subject;" >
+              <ccfdeclarationcodeblock parent_id="299" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasSubject * m_subject;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -27675,72 +27675,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="293" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="293" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="293" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="293" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="294" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="294" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="294" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="294" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="295" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="295" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="295" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="295" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="296" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="296" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="296" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="296" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="297" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="297" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="297" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="297" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="298" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="298" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="298" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="298" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="299" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="299" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="299" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="299" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -27773,141 +27773,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisstrategymove.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:47:15&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="293" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="293" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="293" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasControllerInterface * m_controller;" >
+       <ccfdeclarationcodeblock parent_id="293" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasControllerInterface * m_controller;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="293" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="293" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="293" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="293" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="293" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="294" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="294" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="294" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KoDocument * m_doc;" >
+       <ccfdeclarationcodeblock parent_id="294" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KoDocument * m_doc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="294" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="294" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="294" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="294" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="294" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="295" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="295" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="295" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_dragStart;" >
+       <ccfdeclarationcodeblock parent_id="295" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_dragStart;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="295" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="295" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="295" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="295" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="295" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="296" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="296" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="296" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dragging;" >
+       <ccfdeclarationcodeblock parent_id="296" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dragging;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="296" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="296" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="296" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="296" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="296" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="297" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="297" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="297" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerPosition;" >
+       <ccfdeclarationcodeblock parent_id="297" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerPosition;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="297" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="297" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="297" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="297" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="297" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="298" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="298" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="298" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerStart;" >
+       <ccfdeclarationcodeblock parent_id="298" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_layerStart;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="298" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="298" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="298" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="298" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="298" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="299" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="299" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="299" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasSubject * m_subject;" >
+       <ccfdeclarationcodeblock parent_id="299" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvasSubject * m_subject;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="299" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="299" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="299" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="299" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="299" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -27915,7 +27915,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader325" tqparent_class="325" fileExt=".h" fileName="kistilemgr" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader325" parent_class="325" fileExt=".h" fileName="kistilemgr" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTILEMGR_H&amp;#010;#define KISTILEMGR_H" >
        <header>
@@ -27942,7 +27942,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="325" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="325" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisTileMgr&amp;#010;KisTileMgr manages the imagedata that for implementations of KisRenderInterface.&amp;#010;Those are:&amp;#010;&amp;#010;KisPaintDevices&amp;#010;   KisLayer&amp;#010;      KisBackround&amp;#010;      KisSelection&amp;#010;   KisChannel&amp;#010;      KisMask&amp;#010;&amp;#010;and&amp;#010;&amp;#010;KisImage&amp;#010;&amp;#010;Imagedata is structured in the form of tiles, by default 64 by 64&amp;#010;pixels big. The KisTileMgr is smart enough to hide most of the&amp;#010;details of reading on and writing from tiles.&amp;#010;&amp;#010;@short KisTileMgr manages the pixels for every layer.&amp;#010;" />
          </header>
@@ -27957,7 +27957,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="329" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileMediator m_mediator;" >
+              <ccfdeclarationcodeblock parent_id="329" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileMediator m_mediator;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -27997,27 +27997,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -28031,152 +28031,152 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="337" tag="operation_337" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="337" tag="operation_337" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Create a new KisTileMgr of width and height with the&amp;#010;specified colour depth. Deep copies the tiles of tm to the&amp;#010;new KisTileMgr.&amp;#010;&amp;#010;XXX: I am not sure what happens when tm is bigger or smaller&amp;#010;than width and height, nor what happens when tm has a&amp;#010;different depth.&amp;#010;@param tm &amp;#010;@param depth &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="342" tag="operation_342" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="342" tag="operation_342" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Create a KisTileMgr of width and height with the specified&amp;#010;colour depth.&amp;#010;@param depth &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="346" tag="operation_346" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="346" tag="operation_346" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Creates a new KisTileMgr based on rhs, shares a reference&amp;#010;to the tiles of rhs.&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="350" tag="operation_350" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="350" tag="operation_350" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX?&amp;#010;@param tile &amp;#010;@param tilenum &amp;#010;@param keepold " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="354" tag="operation_354" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="354" tag="operation_354" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Color-depth of the KisRenderInterface implementation&amp;#010;managed by this KisTileMgr" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="355" tag="operation_355" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="355" tag="operation_355" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX?&amp;#010;@param tile &amp;#010;@param tilenum &amp;#010;@param keepold " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="362" tag="operation_362" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="362" tag="operation_362" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Returns true if this KisTileMgr does not manage any&amp;#010;tiles." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="363" tag="operation_363" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="363" tag="operation_363" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Height in pixels of the total area managed by this KisTileMgr" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="364" tag="operation_364" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="364" tag="operation_364" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX&amp;#010;@param tile &amp;#010;@param xpix &amp;#010;@param ypix " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="368" tag="operation_368" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="368" tag="operation_368" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX&amp;#010;@param tileno " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="370" tag="operation_370" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="370" tag="operation_370" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX&amp;#010;@param xpix &amp;#010;@param ypix " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="376" tag="operation_376" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="376" tag="operation_376" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="378" tag="operation_378" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="378" tag="operation_378" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Total size in memory the data managed by this KisTileMgr " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="379" tag="operation_379" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="379" tag="operation_379" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Number of columns of tiles managed by this KisTileMgr" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="380" tag="operation_380" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="380" tag="operation_380" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Number of rows of tiles managed by this KisTileMgr" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="381" tag="operation_381" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="381" tag="operation_381" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Returns the KisPixelData defined by the rectangle x1, y1,&amp;#010;x2, y2. Depending on mode, this data is readable, writable&amp;#010;or both.&amp;#010;@param x1 &amp;#010;@param y1 &amp;#010;@param x2 &amp;#010;@param y2 &amp;#010;@param mode " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="387" tag="operation_387" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="387" tag="operation_387" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="389" tag="operation_389" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="389" tag="operation_389" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Read the area defined by x1, y2, x2, y2 into the buffer. Stride is number of bytes&amp;#010;that a pixel takes in the buffer.&amp;#010;@param x1 &amp;#010;@param y1 &amp;#010;@param x2 &amp;#010;@param y2 &amp;#010;@param buffer &amp;#010;@param stride " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="396" tag="operation_396" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="396" tag="operation_396" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Not sure what this does... Perhaps write changed data if&amp;#010;owner, else mark something invalid. XXX&amp;#010;@param pd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="398" tag="operation_398" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="398" tag="operation_398" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Create or duplicate a tile with identity tilenum; tilenum&amp;#010;is computed from the x/y coordinates of the tile in the&amp;#010;image&amp;#010;&amp;#010;XXX: Not sure what 'mode' is. Presumbly related to the&amp;#010;TILEMODE constants.&amp;#010;@param tilenum &amp;#010;@param mode " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="401" tag="operation_401" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="401" tag="operation_401" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Create or duplicate a tile at location xpix/ypix.&amp;#010;&amp;#010;XXX: Not sure what 'mode' is. Presumbly related to the&amp;#010;TILEMODE constants.&amp;#010;@param xpix &amp;#010;@param ypix &amp;#010;@param mode " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="405" tag="operation_405" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="405" tag="operation_405" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Puts the x/y coordinates of the top left (?) corner&amp;#010;of tile in coord.&amp;#010;@param tile &amp;#010;@param coord " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="408" tag="operation_408" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="408" tag="operation_408" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Puts the x/y coordinates of the top left (?) corner&amp;#010;of tile in x and y.&amp;#010;@param tile &amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="412" tag="operation_412" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="412" tag="operation_412" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX&amp;#010;@param tilenum &amp;#010;@param src " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="415" tag="operation_415" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="415" tag="operation_415" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="XXX&amp;#010;@param xpix &amp;#010;@param ypix &amp;#010;@param src " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="419" tag="operation_419" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="419" tag="operation_419" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xpix &amp;#010;@param ypix " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="422" tag="operation_422" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="422" tag="operation_422" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Width in pixels of the total area managed by this KisTileMgr" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="423" tag="operation_423" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="423" tag="operation_423" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="425" tag="operation_425" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="425" tag="operation_425" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Commit the pixel data in buffer.&amp;#010;@param x1 &amp;#010;@param y1 &amp;#010;@param x2 &amp;#010;@param y2 &amp;#010;@param buffer &amp;#010;@param stride " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="432" tag="operation_432" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="432" tag="operation_432" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -28233,22 +28233,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="335" tag="operation_335" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="335" tag="operation_335" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="348" tag="operation_348" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="348" tag="operation_348" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param ntiles " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="359" tag="operation_359" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="359" tag="operation_359" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param ntiles &amp;#010;@param tm " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="373" tag="operation_373" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="373" tag="operation_373" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile &amp;#010;@param tilenum " />
                  </header>
@@ -28269,37 +28269,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="326" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
+              <ccfdeclarationcodeblock parent_id="326" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="327" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
+              <ccfdeclarationcodeblock parent_id="327" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="330" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
+              <ccfdeclarationcodeblock parent_id="330" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="331" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileCols;" >
+              <ccfdeclarationcodeblock parent_id="331" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileCols;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="332" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileRows;" >
+              <ccfdeclarationcodeblock parent_id="332" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileRows;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="333" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTileSP m_tiles;" >
+              <ccfdeclarationcodeblock parent_id="333" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTileSP m_tiles;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="334" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
+              <ccfdeclarationcodeblock parent_id="334" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -28333,72 +28333,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="326" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="326" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="326" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="326" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="327" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="327" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="327" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="327" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="330" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="330" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="330" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="330" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="331" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="331" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="331" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="331" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="332" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="332" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="332" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="332" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="333" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="333" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="333" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="333" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="334" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="334" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="334" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="334" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -28431,176 +28431,176 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilemgr.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>
-      <codeclassfield tqparent_id="326" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="326" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="326" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
+       <ccfdeclarationcodeblock parent_id="326" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="326" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="326" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="326" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="326" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="326" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="327" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="327" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="327" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="327" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="327" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="327" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="327" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="327" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="327" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="330" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="330" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="330" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
+       <ccfdeclarationcodeblock parent_id="330" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="330" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="330" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="330" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="330" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="330" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="331" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="331" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="331" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileCols;" >
+       <ccfdeclarationcodeblock parent_id="331" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileCols;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="331" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="331" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="331" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="331" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="331" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="332" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="332" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="332" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileRows;" >
+       <ccfdeclarationcodeblock parent_id="332" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_ntileRows;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="332" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="332" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="332" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="332" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="332" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="333" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="333" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="333" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTileSP m_tiles;" >
+       <ccfdeclarationcodeblock parent_id="333" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTileSP m_tiles;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="333" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="333" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="333" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="333" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="333" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="334" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="334" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="334" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="334" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="334" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="334" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="334" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="334" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="334" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="329" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="329" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="329" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileMediator m_mediator;" >
+       <ccfdeclarationcodeblock parent_id="329" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileMediator m_mediator;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -28608,7 +28608,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader328" tqparent_class="328" fileExt=".h" fileName="kistilemediator" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader328" parent_class="328" fileExt=".h" fileName="kistilemediator" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTILEMEDIATOR_H&amp;#010;#define KISTILEMEDIATOR_H" >
        <header>
@@ -28635,7 +28635,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="328" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="328" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisTileMediator&amp;#010;" />
          </header>
@@ -28650,7 +28650,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="329" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTileMgr ;" >
+              <ccfdeclarationcodeblock parent_id="329" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTileMgr ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -28690,27 +28690,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -28724,32 +28724,32 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="438" tag="operation_438" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="438" tag="operation_438" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="441" tag="operation_441" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="441" tag="operation_441" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile &amp;#010;@param mgr &amp;#010;@param tilenum " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="445" tag="operation_445" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="445" tag="operation_445" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile &amp;#010;@param mgr &amp;#010;@param tilenum " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="449" tag="operation_449" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="449" tag="operation_449" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mgr " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="451" tag="operation_451" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="451" tag="operation_451" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile &amp;#010;@param mgr " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="454" tag="operation_454" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="454" tag="operation_454" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -28806,12 +28806,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="436" tag="operation_436" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="436" tag="operation_436" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="439" tag="operation_439" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="439" tag="operation_439" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -28832,17 +28832,17 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="433" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMediatorSingleton * m_instance;" >
+              <ccfdeclarationcodeblock parent_id="433" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMediatorSingleton * m_instance;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="434" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
+              <ccfdeclarationcodeblock parent_id="434" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="435" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ref;" >
+              <ccfdeclarationcodeblock parent_id="435" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ref;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -28876,32 +28876,32 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="433" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="433" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="433" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="433" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="434" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="434" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="434" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="434" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="435" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="435" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="435" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="435" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -28934,96 +28934,96 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilemediator.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>
-      <codeclassfield tqparent_id="433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="433" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMediatorSingleton * m_instance;" >
+       <ccfdeclarationcodeblock parent_id="433" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMediatorSingleton * m_instance;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="433" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="433" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="433" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="433" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="434" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
+       <ccfdeclarationcodeblock parent_id="434" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="434" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="434" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="434" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="434" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="435" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ref;" >
+       <ccfdeclarationcodeblock parent_id="435" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ref;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="435" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="435" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="435" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="435" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="329" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="329" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="329" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTileMgr ;" >
+       <ccfdeclarationcodeblock parent_id="329" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTileMgr ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="329" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="329" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="329" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="329" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="329" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="329" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="329" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="329" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="329" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -29031,7 +29031,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader455" tqparent_class="455" fileExt=".h" fileName="kistileswapinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader455" parent_class="455" fileExt=".h" fileName="kistileswapinterface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTILESWAPINTERFACE_H&amp;#010;#define KISTILESWAPINTERFACE_H" >
        <header>
@@ -29058,7 +29058,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="455" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="455" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisTileSwapInterface&amp;#010;" />
          </header>
@@ -29073,7 +29073,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="492" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
+              <ccfdeclarationcodeblock parent_id="492" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -29113,27 +29113,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -29147,47 +29147,47 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="456" tag="operation_456" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="456" tag="operation_456" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="457" tag="operation_457" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="457" tag="operation_457" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="459" tag="operation_459" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="459" tag="operation_459" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param swapNo " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="461" tag="operation_461" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="461" tag="operation_461" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="463" tag="operation_463" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="463" tag="operation_463" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="465" tag="operation_465" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="465" tag="operation_465" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="467" tag="operation_467" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="467" tag="operation_467" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="469" tag="operation_469" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="469" tag="operation_469" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="471" tag="operation_471" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="471" tag="operation_471" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -29314,36 +29314,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistileswapinterface.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>
-      <codeclassfield tqparent_id="492" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="492" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="492" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
+       <ccfdeclarationcodeblock parent_id="492" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -29351,7 +29351,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader472" tqparent_class="472" fileExt=".h" fileName="kistilecacheinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader472" parent_class="472" fileExt=".h" fileName="kistilecacheinterface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTILECACHEINTERFACE_H&amp;#010;#define KISTILECACHEINTERFACE_H" >
        <header>
@@ -29378,7 +29378,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="472" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="472" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisTileCacheInterface&amp;#010;" />
          </header>
@@ -29393,7 +29393,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="482" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
+              <ccfdeclarationcodeblock parent_id="482" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -29433,27 +29433,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -29467,27 +29467,27 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="473" tag="operation_473" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="473" tag="operation_473" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="474" tag="operation_474" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="474" tag="operation_474" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="476" tag="operation_476" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="476" tag="operation_476" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="478" tag="operation_478" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="478" tag="operation_478" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param nelements " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="480" tag="operation_480" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="480" tag="operation_480" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -29614,36 +29614,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilecacheinterface.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:47:01&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="482" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="482" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="482" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
+       <ccfdeclarationcodeblock parent_id="482" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisTile ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -29651,7 +29651,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader481" tqparent_class="481" fileExt=".h" fileName="kistile" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader481" parent_class="481" fileExt=".h" fileName="kistile" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTILE_H&amp;#010;#define KISTILE_H" >
        <header>
@@ -29678,7 +29678,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="481" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="481" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisTile&amp;#010;Provides abstraction to a tile.  A tile tqcontains&amp;#010;a part of a layer.  Layers form an image." />
          </header>
@@ -29693,12 +29693,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="482" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileCacheInterface m_cache;" >
+              <ccfdeclarationcodeblock parent_id="482" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileCacheInterface m_cache;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="492" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisTileSwapInterface m_swap;" >
+              <ccfdeclarationcodeblock parent_id="492" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisTileSwapInterface m_swap;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -29738,52 +29738,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -29797,147 +29797,147 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="498" tag="operation_498" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="498" tag="operation_498" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="500" tag="operation_500" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="500" tag="operation_500" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param depth &amp;#010;@param cache &amp;#010;@param swap " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="504" tag="operation_504" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="504" tag="operation_504" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="505" tag="operation_505" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="505" tag="operation_505" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xoff &amp;#010;@param yoff " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="508" tag="operation_508" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="508" tag="operation_508" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="509" tag="operation_509" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="509" tag="operation_509" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="510" tag="operation_510" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="510" tag="operation_510" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param val " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="512" tag="operation_512" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="512" tag="operation_512" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="514" tag="operation_514" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="514" tag="operation_514" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="515" tag="operation_515" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="515" tag="operation_515" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="522" tag="operation_522" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="522" tag="operation_522" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="523" tag="operation_523" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="523" tag="operation_523" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="524" tag="operation_524" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="524" tag="operation_524" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="525" tag="operation_525" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="525" tag="operation_525" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="526" tag="operation_526" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="526" tag="operation_526" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="527" tag="operation_527" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="527" tag="operation_527" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="528" tag="operation_528" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="528" tag="operation_528" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param row " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="530" tag="operation_530" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="530" tag="operation_530" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param row &amp;#010;@param hint " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="533" tag="operation_533" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="533" tag="operation_533" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="534" tag="operation_534" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="534" tag="operation_534" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="535" tag="operation_535" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="535" tag="operation_535" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="536" tag="operation_536" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="536" tag="operation_536" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="537" tag="operation_537" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="537" tag="operation_537" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="538" tag="operation_538" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="538" tag="operation_538" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param valid " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="540" tag="operation_540" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="540" tag="operation_540" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="541" tag="operation_541" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="541" tag="operation_541" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="543" tag="operation_543" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="543" tag="operation_543" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="544" tag="operation_544" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="544" tag="operation_544" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="545" tag="operation_545" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="545" tag="operation_545" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -29994,17 +29994,17 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="496" tag="operation_496" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="496" tag="operation_496" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="517" tag="operation_517" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="517" tag="operation_517" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param depth &amp;#010;@param cache &amp;#010;@param swap " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="521" tag="operation_521" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="521" tag="operation_521" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -30025,62 +30025,62 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="483" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_data;" >
+              <ccfdeclarationcodeblock parent_id="483" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_data;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="484" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
+              <ccfdeclarationcodeblock parent_id="484" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="485" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
+              <ccfdeclarationcodeblock parent_id="485" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="486" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+              <ccfdeclarationcodeblock parent_id="486" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="487" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_hints;" >
+              <ccfdeclarationcodeblock parent_id="487" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_hints;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="488" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
+              <ccfdeclarationcodeblock parent_id="488" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="489" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nref;" >
+              <ccfdeclarationcodeblock parent_id="489" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nref;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="490" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nshare;" >
+              <ccfdeclarationcodeblock parent_id="490" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nshare;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="491" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nwrite;" >
+              <ccfdeclarationcodeblock parent_id="491" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nwrite;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="493" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_swapNo;" >
+              <ccfdeclarationcodeblock parent_id="493" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_swapNo;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="494" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
+              <ccfdeclarationcodeblock parent_id="494" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="495" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+              <ccfdeclarationcodeblock parent_id="495" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -30114,122 +30114,122 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="483" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="483" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="483" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="483" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="484" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="484" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="484" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="484" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="485" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="485" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="485" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="485" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="486" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="486" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="486" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="486" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="487" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="487" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="487" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="487" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="488" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="488" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="488" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="488" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="489" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="489" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="489" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="489" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="490" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="490" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="490" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="490" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="491" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="491" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="491" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="491" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="493" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="493" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="493" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="493" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="494" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="494" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="494" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="494" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="495" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="495" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="495" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="495" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -30262,311 +30262,311 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistile.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:47:10&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="483" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="483" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="483" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_data;" >
+       <ccfdeclarationcodeblock parent_id="483" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM * m_data;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="483" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="483" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="483" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="483" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="483" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="484" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="484" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="484" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
+       <ccfdeclarationcodeblock parent_id="484" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="484" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="484" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="484" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="484" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="484" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="485" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="485" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="485" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
+       <ccfdeclarationcodeblock parent_id="485" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="485" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="485" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="485" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="485" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="485" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="486" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="486" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="486" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="486" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="486" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="486" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="486" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="486" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="486" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="487" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="487" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="487" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_hints;" >
+       <ccfdeclarationcodeblock parent_id="487" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_hints;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="487" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="487" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="487" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="487" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="487" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="488" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="488" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="488" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
+       <ccfdeclarationcodeblock parent_id="488" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QMutex m_mutex;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="488" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="488" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="488" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="488" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="488" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="489" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="489" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="489" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nref;" >
+       <ccfdeclarationcodeblock parent_id="489" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nref;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="489" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="489" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="489" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="489" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="489" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="490" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="490" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="490" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nshare;" >
+       <ccfdeclarationcodeblock parent_id="490" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nshare;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="490" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="490" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="490" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="490" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="490" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="491" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="491" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="491" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nwrite;" >
+       <ccfdeclarationcodeblock parent_id="491" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_nwrite;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="491" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="491" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="491" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="491" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="491" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="493" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="493" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="493" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_swapNo;" >
+       <ccfdeclarationcodeblock parent_id="493" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_swapNo;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="493" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="493" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="493" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="493" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="493" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="494" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="494" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="494" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
+       <ccfdeclarationcodeblock parent_id="494" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="494" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="494" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="494" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="494" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="494" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="495" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="495" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="495" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="495" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="495" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="495" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="495" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="495" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="495" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="482" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="482" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="482" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileCacheInterface m_cache;" >
+       <ccfdeclarationcodeblock parent_id="482" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisTileCacheInterface m_cache;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="482" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="482" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="482" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="482" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="482" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="482" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="482" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="482" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="482" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="482" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="482" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="492" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="492" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="492" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisTileSwapInterface m_swap;" >
+       <ccfdeclarationcodeblock parent_id="492" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisTileSwapInterface m_swap;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="492" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="492" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="492" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="492" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="492" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="492" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="492" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="492" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="492" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="492" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="492" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -30574,7 +30574,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader546" tqparent_class="546" fileExt=".h" fileName="drawinghints" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader546" parent_class="546" fileExt=".h" fileName="drawinghints" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef DRAWINGHINTS_H&amp;#010;#define DRAWINGHINTS_H" >
        <header>
@@ -30601,7 +30601,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="546" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="546" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class drawingHints&amp;#010;" />
          </header>
@@ -30780,7 +30780,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader560" tqparent_class="560" fileExt=".h" fileName="kismerge" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader560" parent_class="560" fileExt=".h" fileName="kismerge" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISMERGE_H&amp;#010;#define KISMERGE_H" >
        <header>
@@ -30807,7 +30807,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="560" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="560" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisMerge&amp;#010;" />
          </header>
@@ -30864,32 +30864,32 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="565" tag="operation_565" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="565" tag="operation_565" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param keepOld " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="568" tag="operation_568" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="568" tag="operation_568" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="571" tag="operation_571" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="571" tag="operation_571" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="574" tag="operation_574" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="574" tag="operation_574" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="577" tag="operation_577" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="577" tag="operation_577" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="580" tag="operation_580" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="580" tag="operation_580" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layers " />
                  </header>
@@ -30961,22 +30961,22 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="561" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
+              <ccfdeclarationcodeblock parent_id="561" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="562" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_keepOld;" >
+              <ccfdeclarationcodeblock parent_id="562" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_keepOld;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="563" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+              <ccfdeclarationcodeblock parent_id="563" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="564" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
+              <ccfdeclarationcodeblock parent_id="564" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -31010,42 +31010,42 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="561" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="561" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="561" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="561" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="562" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="562" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="562" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="562" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="563" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="563" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="563" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="563" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="564" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="564" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="564" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="564" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -31078,81 +31078,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kismerge.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>
-      <codeclassfield tqparent_id="561" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="561" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="561" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
+       <ccfdeclarationcodeblock parent_id="561" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="561" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="561" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="561" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="561" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="561" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="562" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="562" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="562" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_keepOld;" >
+       <ccfdeclarationcodeblock parent_id="562" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_keepOld;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="562" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="562" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="562" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="562" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="562" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="563" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="563" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="563" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+       <ccfdeclarationcodeblock parent_id="563" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="563" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="563" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="563" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="563" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="563" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="564" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="564" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="564" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
+       <ccfdeclarationcodeblock parent_id="564" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="564" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="564" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="564" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="564" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="564" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -31160,7 +31160,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader583" tqparent_class="583" fileExt=".h" fileName="kisflatten" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader583" parent_class="583" fileExt=".h" fileName="kisflatten" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISFLATTEN_H&amp;#010;#define KISFLATTEN_H" >
        <header>
@@ -31187,7 +31187,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="583" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="583" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisFlatten&amp;#010;" />
          </header>
@@ -31244,42 +31244,42 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="586" tag="operation_586" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="586" tag="operation_586" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="588" tag="operation_588" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="588" tag="operation_588" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="593" tag="operation_593" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="593" tag="operation_593" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="596" tag="operation_596" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="596" tag="operation_596" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param dev " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="603" tag="operation_603" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="603" tag="operation_603" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param selection " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="606" tag="operation_606" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="606" tag="operation_606" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layers " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="609" tag="operation_609" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="609" tag="operation_609" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param devs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="612" tag="operation_612" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="612" tag="operation_612" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -31336,7 +31336,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="599" tag="operation_599" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="599" tag="operation_599" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param dev &amp;#010;@param opacity " />
                  </header>
@@ -31357,12 +31357,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="584" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+              <ccfdeclarationcodeblock parent_id="584" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="585" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
+              <ccfdeclarationcodeblock parent_id="585" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -31396,22 +31396,22 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="584" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="584" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="584" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="584" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="585" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="585" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="585" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="585" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -31444,41 +31444,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisflatten.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>
-      <codeclassfield tqparent_id="584" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="584" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="584" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+       <ccfdeclarationcodeblock parent_id="584" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="584" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="584" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="584" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="584" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="584" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="585" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="585" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="585" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
+       <ccfdeclarationcodeblock parent_id="585" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" cond_t m_test;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="585" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="585" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="585" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="585" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="585" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -31486,7 +31486,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader613" tqparent_class="613" fileExt=".h" fileName="kisdociface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader613" parent_class="613" fileExt=".h" fileName="kisdociface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISDOCIFACE_H&amp;#010;#define KISDOCIFACE_H" >
        <header>
@@ -31513,7 +31513,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="613" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="613" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KIsDocIface&amp;#010;" />
          </header>
@@ -31621,27 +31621,27 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="615" tag="operation_615" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="615" tag="operation_615" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="616" tag="operation_616" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="616" tag="operation_616" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param oldName &amp;#010;@param newName " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="619" tag="operation_619" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="619" tag="operation_619" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param limit " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="621" tag="operation_621" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="621" tag="operation_621" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param limit " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="623" tag="operation_623" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="623" tag="operation_623" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -31662,7 +31662,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="614" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
+              <ccfdeclarationcodeblock parent_id="614" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -31696,12 +31696,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="614" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="614" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="614" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="614" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -31734,21 +31734,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisdociface.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:49:51&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="614" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="614" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="614" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
+       <ccfdeclarationcodeblock parent_id="614" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisDoc * m_doc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="614" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="614" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="614" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="614" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="614" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -31756,7 +31756,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader624" tqparent_class="624" fileExt=".h" fileName="kisalphatqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader624" parent_class="624" fileExt=".h" fileName="kisalphatqmask" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISALPHAMASK_H&amp;#010;#define KISALPHAMASK_H" >
        <header>
@@ -31783,7 +31783,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="624" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="624" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisAlphaMask&amp;#010;" />
          </header>
@@ -31840,37 +31840,37 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="629" tag="operation_629" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="631" tag="operation_631" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="634" tag="operation_634" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 tqmasking.&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 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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="641" tag="operation_641" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="641" tag="operation_641" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="@return the number of alpha values in a scanline." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="642" tag="operation_642" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="642" tag="operation_642" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="@return the scale factor." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="643" tag="operation_643" canDelete="false" indentLevel="1" role_id="-1" >
+                <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." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="644" tag="operation_644" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="644" tag="operation_644" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -31927,12 +31927,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="637" tag="operation_637" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="637" tag="operation_637" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="639" tag="operation_639" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="639" tag="operation_639" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
@@ -31953,22 +31953,22 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="625" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+              <ccfdeclarationcodeblock parent_id="625" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="626" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_scale;" >
+              <ccfdeclarationcodeblock parent_id="626" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_scale;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="627" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledHeight;" >
+              <ccfdeclarationcodeblock parent_id="627" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledHeight;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="628" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledWidth;" >
+              <ccfdeclarationcodeblock parent_id="628" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledWidth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -32002,42 +32002,42 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="625" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="625" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="625" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="625" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="626" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="626" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="626" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="626" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="627" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="627" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="627" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="627" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="628" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="628" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="628" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="628" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -32070,81 +32070,81 @@ in the constructor, you have to call loadAsync.
       <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;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="625" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+       <ccfdeclarationcodeblock parent_id="625" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="625" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="625" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="625" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="625" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="626" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_scale;" >
+       <ccfdeclarationcodeblock parent_id="626" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_scale;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="626" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="626" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="626" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="626" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="627" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledHeight;" >
+       <ccfdeclarationcodeblock parent_id="627" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledHeight;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="627" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="627" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="627" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="627" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="628" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="628" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="628" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledWidth;" >
+       <ccfdeclarationcodeblock parent_id="628" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_scaledWidth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="628" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="628" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="628" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="628" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="628" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -32152,7 +32152,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader645" tqparent_class="645" fileExt=".h" fileName="krayonviewiface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader645" parent_class="645" fileExt=".h" fileName="krayonviewiface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KRAYONVIEWIFACE_H&amp;#010;#define KRAYONVIEWIFACE_H" >
        <header>
@@ -32179,7 +32179,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="645" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="645" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KRayonViewIface&amp;#010;This is the definition of the interface Chalk presents to&amp;#010;dcop." />
          </header>
@@ -32287,112 +32287,112 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="647" tag="operation_647" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="647" tag="operation_647" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param view_ " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="649" tag="operation_649" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="649" tag="operation_649" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="650" tag="operation_650" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="650" tag="operation_650" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="651" tag="operation_651" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="651" tag="operation_651" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="652" tag="operation_652" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="652" tag="operation_652" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="653" tag="operation_653" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="653" tag="operation_653" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="654" tag="operation_654" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="654" tag="operation_654" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="655" tag="operation_655" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="655" tag="operation_655" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="656" tag="operation_656" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="656" tag="operation_656" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="657" tag="operation_657" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="657" tag="operation_657" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="658" tag="operation_658" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="658" tag="operation_658" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="659" tag="operation_659" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="659" tag="operation_659" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="660" tag="operation_660" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="660" tag="operation_660" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="661" tag="operation_661" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="661" tag="operation_661" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="662" tag="operation_662" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="662" tag="operation_662" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="663" tag="operation_663" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="663" tag="operation_663" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="664" tag="operation_664" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="664" tag="operation_664" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="665" tag="operation_665" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="665" tag="operation_665" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="666" tag="operation_666" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="666" tag="operation_666" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="667" tag="operation_667" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="667" tag="operation_667" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="668" tag="operation_668" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="668" tag="operation_668" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="669" tag="operation_669" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="669" tag="operation_669" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -32413,7 +32413,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="646" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisView * m_view;" >
+              <ccfdeclarationcodeblock parent_id="646" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisView * m_view;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -32447,12 +32447,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="646" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="646" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="646" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="646" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -32485,21 +32485,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			krayonviewiface.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>
-      <codeclassfield tqparent_id="646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="646" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisView * m_view;" >
+       <ccfdeclarationcodeblock parent_id="646" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisView * m_view;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="646" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="646" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="646" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="646" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="646" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -32507,7 +32507,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader670" tqparent_class="670" fileExt=".h" fileName="kisimageiface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader670" parent_class="670" fileExt=".h" fileName="kisimageiface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISIMAGEIFACE_H&amp;#010;#define KISIMAGEIFACE_H" >
        <header>
@@ -32534,7 +32534,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="670" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="670" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KIsImageIface&amp;#010;" />
          </header>
@@ -32642,37 +32642,37 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="672" tag="operation_672" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="672" tag="operation_672" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img_ " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="674" tag="operation_674" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="674" tag="operation_674" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="675" tag="operation_675" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="675" tag="operation_675" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="676" tag="operation_676" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="676" tag="operation_676" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="677" tag="operation_677" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="677" tag="operation_677" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="678" tag="operation_678" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="678" tag="operation_678" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="680" tag="operation_680" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="680" tag="operation_680" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -32693,7 +32693,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="671" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImage * m_img;" >
+              <ccfdeclarationcodeblock parent_id="671" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImage * m_img;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -32727,12 +32727,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -32765,21 +32765,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimageiface.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:49:42&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="671" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImage * m_img;" >
+       <ccfdeclarationcodeblock parent_id="671" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisImage * m_img;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="671" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -32787,7 +32787,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader681" tqparent_class="681" fileExt=".h" fileName="kisbrush" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader681" parent_class="681" fileExt=".h" fileName="kisbrush" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISBRUSH_H&amp;#010;#define KISBRUSH_H" >
        <header>
@@ -32814,7 +32814,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="681" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="681" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisBrush&amp;#010;" />
          </header>
@@ -32829,12 +32829,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1769" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
+              <ccfdeclarationcodeblock parent_id="1769" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2368" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2368" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -32874,52 +32874,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -32933,52 +32933,52 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="693" tag="operation_693" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="693" tag="operation_693" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param filename " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="695" tag="operation_695" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="695" tag="operation_695" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param filename &amp;#010;@param data &amp;#010;@param dataPos " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="699" tag="operation_699" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="699" tag="operation_699" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="702" tag="operation_702" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="702" tag="operation_702" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="703" tag="operation_703" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="703" tag="operation_703" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="704" tag="operation_704" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="704" tag="operation_704" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="705" tag="operation_705" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="707" tag="operation_707" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="707" tag="operation_707" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="708" tag="operation_708" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="708" tag="operation_708" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="710" tag="operation_710" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="710" tag="operation_710" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -33035,7 +33035,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="700" tag="operation_700" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="700" tag="operation_700" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
@@ -33056,57 +33056,57 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="682" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" enumBrushType m_brushType;" >
+              <ccfdeclarationcodeblock parent_id="682" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" enumBrushType m_brushType;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="683" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_bytes;" >
+              <ccfdeclarationcodeblock parent_id="683" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_bytes;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="684" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+              <ccfdeclarationcodeblock parent_id="684" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="685" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_header_size;" >
+              <ccfdeclarationcodeblock parent_id="685" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_header_size;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="686" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
+              <ccfdeclarationcodeblock parent_id="686" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="687" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+              <ccfdeclarationcodeblock parent_id="687" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
+              <ccfdeclarationcodeblock parent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="689" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_magic_number;" >
+              <ccfdeclarationcodeblock parent_id="689" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_magic_number;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="690" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_tqmasks;" >
+              <ccfdeclarationcodeblock parent_id="690" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_masks;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="691" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_version;" >
+              <ccfdeclarationcodeblock parent_id="691" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_version;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="692" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
+              <ccfdeclarationcodeblock parent_id="692" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -33140,112 +33140,112 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="682" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="682" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="682" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="682" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="683" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="683" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="683" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="683" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="684" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="684" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="684" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="684" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="685" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="685" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="685" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="685" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="686" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="686" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="686" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="686" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="687" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="687" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="687" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="687" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="688" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="688" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="688" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="688" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="689" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="689" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="689" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="689" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="690" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="690" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="690" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="690" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="691" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="691" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="691" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="691" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="692" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="692" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="692" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="692" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -33278,291 +33278,291 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisbrush.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>
-      <codeclassfield tqparent_id="682" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="682" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="682" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" enumBrushType m_brushType;" >
+       <ccfdeclarationcodeblock parent_id="682" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" enumBrushType m_brushType;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="682" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="682" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="682" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="682" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="682" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="683" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="683" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="683" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_bytes;" >
+       <ccfdeclarationcodeblock parent_id="683" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_bytes;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="683" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="683" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="683" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="683" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="683" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="684" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="684" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="684" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+       <ccfdeclarationcodeblock parent_id="684" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="684" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="684" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="684" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="684" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="684" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="685" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="685" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="685" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_header_size;" >
+       <ccfdeclarationcodeblock parent_id="685" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_header_size;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="685" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="685" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="685" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="685" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="685" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="686" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="686" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="686" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="686" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_height;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="686" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="686" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="686" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="686" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="686" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="687" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="687" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="687" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+       <ccfdeclarationcodeblock parent_id="687" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="687" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="687" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="687" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="687" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="687" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="688" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="688" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
+       <ccfdeclarationcodeblock parent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="688" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="688" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="688" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="688" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="688" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="689" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="689" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="689" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_magic_number;" >
+       <ccfdeclarationcodeblock parent_id="689" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_magic_number;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="689" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="689" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="689" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="689" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="689" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="690" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="690" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="690" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_tqmasks;" >
+       <ccfdeclarationcodeblock parent_id="690" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_masks;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="690" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="690" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="690" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="690" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="690" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="691" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="691" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="691" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_version;" >
+       <ccfdeclarationcodeblock parent_id="691" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_version;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="691" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="691" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="691" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="691" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="691" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="692" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="692" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="692" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="692" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_width;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="692" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="692" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="692" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="692" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="692" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1769" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1769" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1769" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
+       <ccfdeclarationcodeblock parent_id="1769" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2368" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2368" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2368" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2368" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_20" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -33570,7 +33570,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader711" tqparent_class="711" fileExt=".h" fileName="kisbackground" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader711" parent_class="711" fileExt=".h" fileName="kisbackground" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISBACKGROUND_H&amp;#010;#define KISBACKGROUND_H" >
        <header>
@@ -33597,7 +33597,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="711" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="711" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisBackground&amp;#010;" />
          </header>
@@ -33654,17 +33654,17 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="712" tag="operation_712" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="712" tag="operation_712" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="716" tag="operation_716" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="716" tag="operation_716" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xpix &amp;#010;@param ypix " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="719" tag="operation_719" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="719" tag="operation_719" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -33792,7 +33792,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader720" tqparent_class="720" fileExt=".h" fileName="enumbrushtype" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader720" parent_class="720" fileExt=".h" fileName="enumbrushtype" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef ENUMBRUSHTYPE_H&amp;#010;#define ENUMBRUSHTYPE_H" >
        <header>
@@ -33819,7 +33819,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="720" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="720" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class enumBrushType&amp;#010;" />
          </header>
@@ -33834,7 +33834,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1742" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImagePipeBrush ;" >
+              <ccfdeclarationcodeblock parent_id="1742" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImagePipeBrush ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -33874,27 +33874,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -34029,36 +34029,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			enumbrushtype.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>
-      <codeclassfield tqparent_id="1742" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1742" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1742" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImagePipeBrush ;" >
+       <ccfdeclarationcodeblock parent_id="1742" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImagePipeBrush ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -34066,7 +34066,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader727" tqparent_class="727" fileExt=".h" fileName="kiscommand" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader727" parent_class="727" fileExt=".h" fileName="kiscommand" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCOMMAND_H&amp;#010;#define KISCOMMAND_H" >
        <header>
@@ -34093,7 +34093,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="727" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="727" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisCommand&amp;#010;" />
          </header>
@@ -34150,32 +34150,32 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="730" tag="operation_730" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="730" tag="operation_730" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param undoAdapter " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="732" tag="operation_732" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="732" tag="operation_732" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@param undoAdapter " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="736" tag="operation_736" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="736" tag="operation_736" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="737" tag="operation_737" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="737" tag="operation_737" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="738" tag="operation_738" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="738" tag="operation_738" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="739" tag="operation_739" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="739" tag="operation_739" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -34232,7 +34232,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="735" tag="operation_735" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="735" tag="operation_735" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -34253,12 +34253,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="728" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="728" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="729" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_undoAdapter;" >
+              <ccfdeclarationcodeblock parent_id="729" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_undoAdapter;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -34292,22 +34292,22 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="728" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="728" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="728" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="728" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="729" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="729" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="729" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="729" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -34340,41 +34340,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kiscommand.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>
-      <codeclassfield tqparent_id="728" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="728" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="728" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="728" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="728" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="728" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="728" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="728" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="728" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="729" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="729" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="729" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_undoAdapter;" >
+       <ccfdeclarationcodeblock parent_id="729" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_undoAdapter;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="729" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="729" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="729" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="729" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="729" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -34382,7 +34382,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader740" tqparent_class="740" fileExt=".h" fileName="kisguide" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader740" parent_class="740" fileExt=".h" fileName="kisguide" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISGUIDE_H&amp;#010;#define KISGUIDE_H" >
        <header>
@@ -34409,7 +34409,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="740" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="740" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisGuide&amp;#010;" />
          </header>
@@ -34424,22 +34424,22 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="741" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap buffer;" >
+              <ccfdeclarationcodeblock parent_id="741" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap buffer;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="742" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool hasBuffer;" >
+              <ccfdeclarationcodeblock parent_id="742" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool hasBuffer;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="743" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double pos;" >
+              <ccfdeclarationcodeblock parent_id="743" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double pos;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="744" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool selected;" >
+              <ccfdeclarationcodeblock parent_id="744" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool selected;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -34479,42 +34479,42 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="741" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="741" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="741" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="741" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="742" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="742" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="742" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="742" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="743" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="743" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="743" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="743" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="744" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="744" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="744" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="744" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -34528,22 +34528,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="745" tag="operation_745" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="745" tag="operation_745" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param o " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="747" tag="operation_747" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="747" tag="operation_747" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="748" tag="operation_748" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="748" tag="operation_748" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="749" tag="operation_749" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="749" tag="operation_749" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -34670,81 +34670,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisguide.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>
-      <codeclassfield tqparent_id="741" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="741" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="741" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap buffer;" >
+       <ccfdeclarationcodeblock parent_id="741" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap buffer;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="741" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="741" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="741" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="741" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="741" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="742" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="742" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="742" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool hasBuffer;" >
+       <ccfdeclarationcodeblock parent_id="742" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" bool hasBuffer;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="742" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="742" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="742" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="742" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="742" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="743" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double pos;" >
+       <ccfdeclarationcodeblock parent_id="743" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double pos;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="743" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="743" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="743" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="743" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="744" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool selected;" >
+       <ccfdeclarationcodeblock parent_id="744" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool selected;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="744" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="744" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="744" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="744" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -34752,7 +34752,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader750" tqparent_class="750" fileExt=".h" fileName="kiscanvascontrollerinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader750" parent_class="750" fileExt=".h" fileName="kiscanvascontrollerinterface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCANVASCONTROLLERINTERFACE_H&amp;#010;#define KISCANVASCONTROLLERINTERFACE_H" >
        <header>
@@ -34779,7 +34779,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="750" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="750" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisCanvasControllerInterface&amp;#010;" />
          </header>
@@ -34836,92 +34836,92 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="753" tag="operation_753" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="753" tag="operation_753" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="756" tag="operation_756" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="756" tag="operation_756" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="757" tag="operation_757" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="757" tag="operation_757" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="758" tag="operation_758" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="758" tag="operation_758" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="759" tag="operation_759" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="759" tag="operation_759" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="764" tag="operation_764" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="764" tag="operation_764" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="766" tag="operation_766" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="766" tag="operation_766" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="767" tag="operation_767" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="767" tag="operation_767" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="770" tag="operation_770" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="770" tag="operation_770" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="772" tag="operation_772" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="772" tag="operation_772" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="774" tag="operation_774" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="774" tag="operation_774" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="777" tag="operation_777" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="777" tag="operation_777" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="779" tag="operation_779" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="779" tag="operation_779" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="781" tag="operation_781" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="781" tag="operation_781" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="782" tag="operation_782" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="782" tag="operation_782" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="785" tag="operation_785" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="785" tag="operation_785" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="786" tag="operation_786" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="786" tag="operation_786" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="789" tag="operation_789" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="789" tag="operation_789" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -34978,12 +34978,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="751" tag="operation_751" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="751" tag="operation_751" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="754" tag="operation_754" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="754" tag="operation_754" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -35060,7 +35060,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader790" tqparent_class="790" fileExt=".h" fileName="kisguidemgr" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader790" parent_class="790" fileExt=".h" fileName="kisguidemgr" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISGUIDEMGR_H&amp;#010;#define KISGUIDEMGR_H" >
        <header>
@@ -35087,7 +35087,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="790" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="790" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisGuideMgr&amp;#010;" />
          </header>
@@ -35102,7 +35102,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1270" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
+              <ccfdeclarationcodeblock parent_id="1270" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -35142,27 +35142,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -35176,112 +35176,112 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="802" tag="operation_802" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="802" tag="operation_802" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="803" tag="operation_803" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="803" tag="operation_803" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos &amp;#010;@param o " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="806" tag="operation_806" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="806" tag="operation_806" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device &amp;#010;@param w &amp;#010;@param xOffset &amp;#010;@param yOffset &amp;#010;@param zoom " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="812" tag="operation_812" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="812" tag="operation_812" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param d " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="816" tag="operation_816" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="816" tag="operation_816" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param y &amp;#010;@param d " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="819" tag="operation_819" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="819" tag="operation_819" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param d " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="822" tag="operation_822" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="822" tag="operation_822" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="823" tag="operation_823" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="823" tag="operation_823" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param element " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="825" tag="operation_825" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="825" tag="operation_825" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param d " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="827" tag="operation_827" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="827" tag="operation_827" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param d " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="829" tag="operation_829" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="829" tag="operation_829" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device &amp;#010;@param w &amp;#010;@param xOffset &amp;#010;@param yOffset &amp;#010;@param zoom " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="835" tag="operation_835" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="835" tag="operation_835" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="837" tag="operation_837" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="837" tag="operation_837" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="838" tag="operation_838" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="838" tag="operation_838" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="839" tag="operation_839" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="839" tag="operation_839" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param size " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="846" tag="operation_846" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="846" tag="operation_846" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param element " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="848" tag="operation_848" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="848" tag="operation_848" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="850" tag="operation_850" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="850" tag="operation_850" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="851" tag="operation_851" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="851" tag="operation_851" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="852" tag="operation_852" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="852" tag="operation_852" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="854" tag="operation_854" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="854" tag="operation_854" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="855" tag="operation_855" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="855" tag="operation_855" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -35338,7 +35338,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="841" tag="operation_841" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="841" tag="operation_841" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param size &amp;#010;@param vLine &amp;#010;@param hLine &amp;#010;@param linePattern " />
                  </header>
@@ -35359,57 +35359,57 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="791" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLines;" >
+              <ccfdeclarationcodeblock parent_id="791" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLines;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="792" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLinesSelected;" >
+              <ccfdeclarationcodeblock parent_id="792" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLinesSelected;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="793" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_lines;" >
+              <ccfdeclarationcodeblock parent_id="793" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_lines;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="794" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pattern;" >
+              <ccfdeclarationcodeblock parent_id="794" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pattern;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="795" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_patternSelected;" >
+              <ccfdeclarationcodeblock parent_id="795" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_patternSelected;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="796" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QSize m_size;" >
+              <ccfdeclarationcodeblock parent_id="796" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QSize m_size;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="797" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_slines;" >
+              <ccfdeclarationcodeblock parent_id="797" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_slines;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="798" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLines;" >
+              <ccfdeclarationcodeblock parent_id="798" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLines;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="799" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLinesSelected;" >
+              <ccfdeclarationcodeblock parent_id="799" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLinesSelected;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="800" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm;" >
+              <ccfdeclarationcodeblock parent_id="800" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="801" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm_selected;" >
+              <ccfdeclarationcodeblock parent_id="801" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm_selected;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -35443,112 +35443,112 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="791" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="791" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="791" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="791" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="792" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="792" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="792" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="792" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="793" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="793" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="793" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="793" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="794" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="794" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="794" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="794" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="795" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="795" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="795" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="795" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="796" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="796" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="796" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="796" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="797" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="797" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="797" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="797" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="798" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="798" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="798" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="798" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="799" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="799" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="799" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="799" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="800" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="800" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="800" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="800" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="801" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="801" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="801" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="801" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -35581,256 +35581,256 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisguidemgr.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>
-      <codeclassfield tqparent_id="791" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="791" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="791" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLines;" >
+       <ccfdeclarationcodeblock parent_id="791" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLines;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="791" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="791" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="791" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="791" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="791" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="792" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="792" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="792" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLinesSelected;" >
+       <ccfdeclarationcodeblock parent_id="792" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_hGuideLinesSelected;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="792" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="792" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="792" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="792" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="792" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="793" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="793" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="793" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_lines;" >
+       <ccfdeclarationcodeblock parent_id="793" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_lines;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="793" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="793" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="793" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="793" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="793" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="794" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="794" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="794" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pattern;" >
+       <ccfdeclarationcodeblock parent_id="794" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_pattern;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="794" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="794" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="794" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="794" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="794" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="795" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="795" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="795" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_patternSelected;" >
+       <ccfdeclarationcodeblock parent_id="795" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_patternSelected;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="795" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="795" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="795" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="795" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="795" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="796" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="796" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="796" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QSize m_size;" >
+       <ccfdeclarationcodeblock parent_id="796" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QSize m_size;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="796" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="796" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="796" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="796" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="796" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="797" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="797" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="797" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_slines;" >
+       <ccfdeclarationcodeblock parent_id="797" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisGuideSP m_slines;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="797" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="797" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="797" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="797" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="797" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="798" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="798" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="798" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLines;" >
+       <ccfdeclarationcodeblock parent_id="798" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLines;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="798" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="798" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="798" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="798" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="798" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="799" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="799" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="799" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLinesSelected;" >
+       <ccfdeclarationcodeblock parent_id="799" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_vGuideLinesSelected;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="799" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="799" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="799" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="799" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="799" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="800" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="800" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="800" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm;" >
+       <ccfdeclarationcodeblock parent_id="800" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="800" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="800" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="800" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="800" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="800" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="801" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="801" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="801" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm_selected;" >
+       <ccfdeclarationcodeblock parent_id="801" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" const char * [] s_xbm_selected;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="801" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="801" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="801" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="801" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="801" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1270" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1270" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1270" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
+       <ccfdeclarationcodeblock parent_id="1270" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -35838,7 +35838,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader856" tqparent_class="856" fileExt=".h" fileName="kisgradient" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader856" parent_class="856" fileExt=".h" fileName="kisgradient" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISGRADIENT_H&amp;#010;#define KISGRADIENT_H" >
        <header>
@@ -35865,7 +35865,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="856" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="856" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisGradient&amp;#010;" />
          </header>
@@ -35880,12 +35880,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1776" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
+              <ccfdeclarationcodeblock parent_id="1776" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2385" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2385" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -35925,52 +35925,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -35984,72 +35984,72 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="861" tag="operation_861" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="861" tag="operation_861" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="862" tag="operation_862" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="862" tag="operation_862" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="865" tag="operation_865" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="865" tag="operation_865" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param palette &amp;#010;@param size " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="869" tag="operation_869" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="869" tag="operation_869" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param size &amp;#010;@param ca &amp;#010;@param cb &amp;#010;@param eff &amp;#010;@param ncols " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="875" tag="operation_875" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="875" tag="operation_875" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="876" tag="operation_876" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="876" tag="operation_876" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="879" tag="operation_879" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="879" tag="operation_879" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gradR &amp;#010;@param startColor &amp;#010;@param endColor " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="883" tag="operation_883" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="883" tag="operation_883" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gradR &amp;#010;@param startColor &amp;#010;@param endColor " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="887" tag="operation_887" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="887" tag="operation_887" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gradR &amp;#010;@param startColor &amp;#010;@param endColor " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="891" tag="operation_891" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="891" tag="operation_891" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@param g &amp;#010;@param b &amp;#010;@param palette &amp;#010;@param size " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="897" tag="operation_897" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="897" tag="operation_897" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param _effect " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="899" tag="operation_899" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="899" tag="operation_899" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="900" tag="operation_900" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="900" tag="operation_900" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="901" tag="operation_901" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="901" tag="operation_901" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -36121,22 +36121,22 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="857" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMemArray gradArray;" >
+              <ccfdeclarationcodeblock parent_id="857" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMemArray gradArray;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="858" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage gradImage;" >
+              <ccfdeclarationcodeblock parent_id="858" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage gradImage;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="859" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientHeight;" >
+              <ccfdeclarationcodeblock parent_id="859" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientHeight;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="860" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientWidth;" >
+              <ccfdeclarationcodeblock parent_id="860" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientWidth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -36170,42 +36170,42 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="857" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="857" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="857" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="857" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="858" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="858" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="858" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="858" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="859" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="859" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="859" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="859" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -36238,151 +36238,151 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisgradient.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>
-      <codeclassfield tqparent_id="857" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="857" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="857" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMemArray gradArray;" >
+       <ccfdeclarationcodeblock parent_id="857" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QMemArray gradArray;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="857" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="857" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="857" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="857" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="857" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="858" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="858" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="858" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage gradImage;" >
+       <ccfdeclarationcodeblock parent_id="858" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage gradImage;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="858" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="858" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="858" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="858" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="858" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="859" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="859" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="859" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientHeight;" >
+       <ccfdeclarationcodeblock parent_id="859" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientHeight;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="859" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="859" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="859" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="859" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="859" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="860" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientWidth;" >
+       <ccfdeclarationcodeblock parent_id="860" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" int mGradientWidth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="860" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1776" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1776" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1776" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
+       <ccfdeclarationcodeblock parent_id="1776" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPainter ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2385" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2385" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2385" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2385" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -36390,7 +36390,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader902" tqparent_class="902" fileExt=".h" fileName="kisdoc" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader902" parent_class="902" fileExt=".h" fileName="kisdoc" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISDOC_H&amp;#010;#define KISDOC_H" >
        <header>
@@ -36417,7 +36417,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="902" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="902" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisDoc&amp;#010;" />
          </header>
@@ -36432,7 +36432,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2382" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2382" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -36472,27 +36472,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -36506,222 +36506,222 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="914" tag="operation_914" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="914" tag="operation_914" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparentWidget &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 tqparent &amp;#010;@param name &amp;#010;@param singleViewMode " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="922" tag="operation_922" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="922" tag="operation_922" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="926" tag="operation_926" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="926" tag="operation_926" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="927" tag="operation_927" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="927" tag="operation_927" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param store " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="929" tag="operation_929" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="929" tag="operation_929" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="931" tag="operation_931" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="931" tag="operation_931" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="936" tag="operation_936" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="936" tag="operation_936" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="937" tag="operation_937" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="937" tag="operation_937" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="939" tag="operation_939" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="939" tag="operation_939" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="941" tag="operation_941" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="941" tag="operation_941" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="943" tag="operation_943" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="943" tag="operation_943" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param num " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="945" tag="operation_945" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="945" tag="operation_945" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="946" tag="operation_946" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="946" tag="operation_946" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param filename " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="950" tag="operation_950" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="950" tag="operation_950" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="951" tag="operation_951" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="951" tag="operation_951" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="952" tag="operation_952" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="952" tag="operation_952" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer &amp;#010;@param position " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="956" tag="operation_956" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="956" tag="operation_956" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param width &amp;#010;@param height &amp;#010;@param name &amp;#010;@param compositeOp &amp;#010;@param opacity &amp;#010;@param pos &amp;#010;@param type " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="965" tag="operation_965" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="965" tag="operation_965" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param width &amp;#010;@param height &amp;#010;@param name &amp;#010;@param devOpacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="971" tag="operation_971" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="971" tag="operation_971" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param name &amp;#010;@param selection " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="975" tag="operation_975" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="975" tag="operation_975" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="978" tag="operation_978" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="978" tag="operation_978" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="981" tag="operation_981" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="981" tag="operation_981" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="984" tag="operation_984" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="984" tag="operation_984" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="987" tag="operation_987" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="987" tag="operation_987" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="998" tag="operation_998" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="998" tag="operation_998" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1001" tag="operation_1001" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1001" tag="operation_1001" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param doc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1005" tag="operation_1005" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1005" tag="operation_1005" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1007" tag="operation_1007" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1007" tag="operation_1007" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@param width &amp;#010;@param height &amp;#010;@param type " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1012" tag="operation_1012" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1012" tag="operation_1012" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1013" tag="operation_1013" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1013" tag="operation_1013" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param painter &amp;#010;@param rect &amp;#010;@param transparent &amp;#010;@param zoomX &amp;#010;@param zoomY " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1020" tag="operation_1020" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1020" tag="operation_1020" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1021" tag="operation_1021" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1021" tag="operation_1021" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1023" tag="operation_1023" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1023" tag="operation_1023" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1025" tag="operation_1025" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1025" tag="operation_1025" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param oldName &amp;#010;@param newName " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1037" tag="operation_1037" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1037" tag="operation_1037" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1038" tag="operation_1038" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1038" tag="operation_1038" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param selection " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1040" tag="operation_1040" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1040" tag="operation_1040" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer &amp;#010;@param opacity &amp;#010;@param compositeOp &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1046" tag="operation_1046" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1046" tag="operation_1046" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1048" tag="operation_1048" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1048" tag="operation_1048" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param limit " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1052" tag="operation_1052" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1052" tag="operation_1052" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param limit " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1056" tag="operation_1056" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1056" tag="operation_1056" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1057" tag="operation_1057" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1057" tag="operation_1057" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -36778,77 +36778,77 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="920" tag="operation_920" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="920" tag="operation_920" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param cmd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="924" tag="operation_924" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="924" tag="operation_924" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param macroName " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="933" tag="operation_933" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="938" tag="operation_938" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="938" tag="operation_938" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="948" tag="operation_948" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="948" tag="operation_948" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="949" tag="operation_949" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="949" tag="operation_949" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="990" tag="operation_990" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="990" tag="operation_990" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param elem &amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="993" tag="operation_993" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="993" tag="operation_993" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param elem " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="995" tag="operation_995" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="995" tag="operation_995" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param elem &amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1028" tag="operation_1028" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1028" tag="operation_1028" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param doc &amp;#010;@param channel " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1031" tag="operation_1031" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1031" tag="operation_1031" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param doc &amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param doc &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1050" tag="operation_1050" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1050" tag="operation_1050" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param undo " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1055" tag="operation_1055" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1055" tag="operation_1055" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -36869,57 +36869,57 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="903" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_clipboard;" >
+              <ccfdeclarationcodeblock parent_id="903" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_clipboard;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_cmdHistory;" >
+              <ccfdeclarationcodeblock parent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_cmdHistory;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="905" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisStrategyColorSpaceMap m_colorspaces;" >
+              <ccfdeclarationcodeblock parent_id="905" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisStrategyColorSpaceMap m_colorspaces;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="906" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_conversionDepth;" >
+              <ccfdeclarationcodeblock parent_id="906" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_conversionDepth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KMacroCommand * m_currentMacro;" >
+              <ccfdeclarationcodeblock parent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KMacroCommand * m_currentMacro;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="908" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
+              <ccfdeclarationcodeblock parent_id="908" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="909" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisImageSP m_images;" >
+              <ccfdeclarationcodeblock parent_id="909" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisImageSP m_images;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="910" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
+              <ccfdeclarationcodeblock parent_id="910" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="911" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_projection;" >
+              <ccfdeclarationcodeblock parent_id="911" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_projection;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="912" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_pushedClipboard;" >
+              <ccfdeclarationcodeblock parent_id="912" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_pushedClipboard;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="913" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_undo;" >
+              <ccfdeclarationcodeblock parent_id="913" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_undo;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -36953,112 +36953,112 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="903" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="903" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="903" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="903" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="904" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="904" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="904" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="904" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="905" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="905" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="905" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="905" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="906" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="906" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="906" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="906" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="907" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="907" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="907" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="907" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="908" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="908" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="908" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="908" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="909" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="909" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="909" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="909" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="910" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="910" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="910" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="910" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="911" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="911" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="911" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="911" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="912" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="912" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="912" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="912" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="913" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="913" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="913" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="913" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -37091,256 +37091,256 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisdoc.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>
-      <codeclassfield tqparent_id="903" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="903" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="903" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_clipboard;" >
+       <ccfdeclarationcodeblock parent_id="903" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_clipboard;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="903" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="903" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="903" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="903" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="903" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_cmdHistory;" >
+       <ccfdeclarationcodeblock parent_id="904" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_cmdHistory;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="904" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="904" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="904" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="904" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="905" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisStrategyColorSpaceMap m_colorspaces;" >
+       <ccfdeclarationcodeblock parent_id="905" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisStrategyColorSpaceMap m_colorspaces;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="905" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="905" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="905" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="905" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="906" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_conversionDepth;" >
+       <ccfdeclarationcodeblock parent_id="906" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_conversionDepth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="906" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="906" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="906" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="906" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KMacroCommand * m_currentMacro;" >
+       <ccfdeclarationcodeblock parent_id="907" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KMacroCommand * m_currentMacro;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="907" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="907" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="907" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="907" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="908" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
+       <ccfdeclarationcodeblock parent_id="908" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="908" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="908" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="908" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="908" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="909" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisImageSP m_images;" >
+       <ccfdeclarationcodeblock parent_id="909" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" vKisImageSP m_images;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="909" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="909" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="909" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="909" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="910" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
+       <ccfdeclarationcodeblock parent_id="910" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="910" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="910" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="910" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="910" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="911" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="911" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="911" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_projection;" >
+       <ccfdeclarationcodeblock parent_id="911" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_projection;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="911" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="911" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="911" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="911" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="911" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="912" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="912" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="912" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_pushedClipboard;" >
+       <ccfdeclarationcodeblock parent_id="912" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_pushedClipboard;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="912" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="912" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="912" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="912" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="912" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="913" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="913" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="913" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_undo;" >
+       <ccfdeclarationcodeblock parent_id="913" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_undo;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="913" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="913" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="913" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="913" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="913" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2382" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2382" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2382" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2382" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -37348,7 +37348,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1058" tqparent_class="1058" fileExt=".h" fileName="kiscursor" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1058" parent_class="1058" fileExt=".h" fileName="kiscursor" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCURSOR_H&amp;#010;#define KISCURSOR_H" >
        <header>
@@ -37375,7 +37375,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1058" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1058" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisCursor&amp;#010;" />
          </header>
@@ -37432,132 +37432,132 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1059" tag="operation_1059" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1059" tag="operation_1059" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1060" tag="operation_1060" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1060" tag="operation_1060" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1061" tag="operation_1061" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1061" tag="operation_1061" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1062" tag="operation_1062" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1062" tag="operation_1062" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1063" tag="operation_1063" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1063" tag="operation_1063" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1065" tag="operation_1065" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1065" tag="operation_1065" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1066" tag="operation_1066" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1066" tag="operation_1066" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1067" tag="operation_1067" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1067" tag="operation_1067" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1068" tag="operation_1068" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1068" tag="operation_1068" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1069" tag="operation_1069" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1069" tag="operation_1069" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1070" tag="operation_1070" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1070" tag="operation_1070" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1071" tag="operation_1071" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1071" tag="operation_1071" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1072" tag="operation_1072" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1072" tag="operation_1072" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1073" tag="operation_1073" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1073" tag="operation_1073" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1075" tag="operation_1075" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1075" tag="operation_1075" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1076" tag="operation_1076" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1076" tag="operation_1076" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1077" tag="operation_1077" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1077" tag="operation_1077" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1078" tag="operation_1078" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1078" tag="operation_1078" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1079" tag="operation_1079" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1079" tag="operation_1079" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1080" tag="operation_1080" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1080" tag="operation_1080" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1081" tag="operation_1081" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1081" tag="operation_1081" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1082" tag="operation_1082" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1082" tag="operation_1082" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1083" tag="operation_1083" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1083" tag="operation_1083" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -37685,7 +37685,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1085" tqparent_class="1085" fileExt=".h" fileName="kisconfig" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1085" parent_class="1085" fileExt=".h" fileName="kisconfig" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCONFIG_H&amp;#010;#define KISCONFIG_H" >
        <header>
@@ -37712,7 +37712,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1085" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1085" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisConfig&amp;#010;" />
          </header>
@@ -37769,52 +37769,52 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1089" tag="operation_1089" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1089" tag="operation_1089" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1092" tag="operation_1092" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1092" tag="operation_1092" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1093" tag="operation_1093" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1093" tag="operation_1093" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1095" tag="operation_1095" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1095" tag="operation_1095" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1096" tag="operation_1096" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1096" tag="operation_1096" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1097" tag="operation_1097" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1097" tag="operation_1097" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1098" tag="operation_1098" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1098" tag="operation_1098" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1099" tag="operation_1099" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1099" tag="operation_1099" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1100" tag="operation_1100" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1100" tag="operation_1100" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -37871,12 +37871,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1087" tag="operation_1087" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1087" tag="operation_1087" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1090" tag="operation_1090" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1090" tag="operation_1090" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -37897,7 +37897,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KConfig * m_cfg;" >
+              <ccfdeclarationcodeblock parent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KConfig * m_cfg;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -37931,12 +37931,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1086" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1086" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1086" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1086" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -37969,21 +37969,21 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisconfig.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>
-      <codeclassfield tqparent_id="1086" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1086" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KConfig * m_cfg;" >
+       <ccfdeclarationcodeblock parent_id="1086" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KConfig * m_cfg;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1086" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1086" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1086" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1086" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1086" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -37991,7 +37991,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1101" tqparent_class="1101" fileExt=".h" fileName="kiscanvasobserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1101" parent_class="1101" fileExt=".h" fileName="kiscanvasobserver" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCANVASOBSERVER_H&amp;#010;#define KISCANVASOBSERVER_H" >
        <header>
@@ -38018,7 +38018,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1101" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1101" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisCanvasObserver&amp;#010;" />
          </header>
@@ -38075,17 +38075,17 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1107" tag="operation_1107" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1107" tag="operation_1107" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param subject " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1109" tag="operation_1109" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1109" tag="operation_1109" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -38142,12 +38142,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1102" tag="operation_1102" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1102" tag="operation_1102" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1105" tag="operation_1105" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1105" tag="operation_1105" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -38224,7 +38224,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1110" tqparent_class="1110" fileExt=".h" fileName="kisfactory" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1110" parent_class="1110" fileExt=".h" fileName="kisfactory" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISFACTORY_H&amp;#010;#define KISFACTORY_H" >
        <header>
@@ -38251,7 +38251,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1110" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1110" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisFactory&amp;#010;" />
          </header>
@@ -38308,37 +38308,37 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1115" tag="operation_1115" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1118" tag="operation_1118" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1118" tag="operation_1118" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1119" tag="operation_1119" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1119" tag="operation_1119" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparentWidget &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 tqparent &amp;#010;@param name &amp;#010;@param classname &amp;#010;@param args " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1126" tag="operation_1126" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1126" tag="operation_1126" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1127" tag="operation_1127" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1127" tag="operation_1127" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1128" tag="operation_1128" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1128" tag="operation_1128" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1129" tag="operation_1129" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1129" tag="operation_1129" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -38410,22 +38410,22 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
+              <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
+              <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1113" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisPluginServer * s_pserver;" >
+              <ccfdeclarationcodeblock parent_id="1113" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisPluginServer * s_pserver;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1114" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisResourceServer * s_rserver;" >
+              <ccfdeclarationcodeblock parent_id="1114" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisResourceServer * s_rserver;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -38459,42 +38459,42 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1111" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1111" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1111" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1111" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1112" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1112" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1112" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1112" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1113" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1113" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1113" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1113" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1114" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1114" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1114" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1114" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -38527,81 +38527,81 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisfactory.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>
-      <codeclassfield tqparent_id="1111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
+       <ccfdeclarationcodeblock parent_id="1111" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KAboutData * s_aboutData;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1111" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1111" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1111" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1111" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
+       <ccfdeclarationcodeblock parent_id="1112" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" KInstance * s_global;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1112" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1112" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1112" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1112" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1113" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisPluginServer * s_pserver;" >
+       <ccfdeclarationcodeblock parent_id="1113" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KisPluginServer * s_pserver;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1113" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1113" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1113" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1113" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1114" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisResourceServer * s_rserver;" >
+       <ccfdeclarationcodeblock parent_id="1114" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisResourceServer * s_rserver;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1114" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1114" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1114" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1114" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -38609,7 +38609,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1130" tqparent_class="1130" fileExt=".h" fileName="kischannel" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1130" parent_class="1130" fileExt=".h" fileName="kischannel" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCHANNEL_H&amp;#010;#define KISCHANNEL_H" >
        <header>
@@ -38636,7 +38636,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1130" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1130" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisChannel&amp;#010;" />
          </header>
@@ -38693,92 +38693,92 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1131" tag="operation_1131" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1131" tag="operation_1131" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param width &amp;#010;@param height &amp;#010;@param name &amp;#010;@param color " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1137" tag="operation_1137" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1137" tag="operation_1137" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1139" tag="operation_1139" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1139" tag="operation_1139" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xradius &amp;#010;@param yradius " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1142" tag="operation_1142" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1142" tag="operation_1142" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1144" tag="operation_1144" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1144" tag="operation_1144" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1145" tag="operation_1145" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1145" tag="operation_1145" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1146" tag="operation_1146" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1146" tag="operation_1146" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param clr " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1148" tag="operation_1148" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1148" tag="operation_1148" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1151" tag="operation_1151" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1151" tag="operation_1151" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1152" tag="operation_1152" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1152" tag="operation_1152" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1153" tag="operation_1153" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1153" tag="operation_1153" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xradius &amp;#010;@param yradius " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1156" tag="operation_1156" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1156" tag="operation_1156" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1157" tag="operation_1157" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1157" tag="operation_1157" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1158" tag="operation_1158" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1158" tag="operation_1158" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param val " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1160" tag="operation_1160" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1160" tag="operation_1160" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xradius &amp;#010;@param yradius " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1163" tag="operation_1163" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1163" tag="operation_1163" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1166" tag="operation_1166" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1166" tag="operation_1166" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1169" tag="operation_1169" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1169" tag="operation_1169" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -38906,7 +38906,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1170" tqparent_class="1170" fileExt=".h" fileName="kiscanvassubject" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1170" parent_class="1170" fileExt=".h" fileName="kiscanvassubject" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCANVASSUBJECT_H&amp;#010;#define KISCANVASSUBJECT_H" >
        <header>
@@ -38933,7 +38933,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1170" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1170" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisCanvasSubject&amp;#010;" />
          </header>
@@ -38990,97 +38990,97 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1173" tag="operation_1173" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1173" tag="operation_1173" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1176" tag="operation_1176" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1176" tag="operation_1176" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param observer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1178" tag="operation_1178" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1178" tag="operation_1178" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1179" tag="operation_1179" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1179" tag="operation_1179" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1180" tag="operation_1180" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1180" tag="operation_1180" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1181" tag="operation_1181" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1181" tag="operation_1181" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1183" tag="operation_1183" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1183" tag="operation_1183" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1184" tag="operation_1184" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1184" tag="operation_1184" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1185" tag="operation_1185" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1185" tag="operation_1185" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param observer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1187" tag="operation_1187" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1187" tag="operation_1187" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1188" tag="operation_1188" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1188" tag="operation_1188" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1189" tag="operation_1189" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1189" tag="operation_1189" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1190" tag="operation_1190" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1190" tag="operation_1190" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1192" tag="operation_1192" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1192" tag="operation_1192" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1195" tag="operation_1195" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1195" tag="operation_1195" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1197" tag="operation_1197" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1197" tag="operation_1197" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -39137,12 +39137,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1171" tag="operation_1171" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1171" tag="operation_1171" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1174" tag="operation_1174" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1174" tag="operation_1174" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -39219,7 +39219,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1198" tqparent_class="1198" fileExt=".h" fileName="compositeop" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1198" parent_class="1198" fileExt=".h" fileName="compositeop" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef COMPOSITEOP_H&amp;#010;#define COMPOSITEOP_H" >
        <header>
@@ -39246,7 +39246,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1198" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1198" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class CompositeOp&amp;#010;" />
          </header>
@@ -39261,7 +39261,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1455" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
+              <ccfdeclarationcodeblock parent_id="1455" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -39301,27 +39301,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -39456,36 +39456,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			compositeop.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>
-      <codeclassfield tqparent_id="1455" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1455" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1455" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
+       <ccfdeclarationcodeblock parent_id="1455" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -39493,7 +39493,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1237" tqparent_class="1237" fileExt=".h" fileName="enumimgtype" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1237" parent_class="1237" fileExt=".h" fileName="enumimgtype" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef ENUMIMGTYPE_H&amp;#010;#define ENUMIMGTYPE_H" >
        <header>
@@ -39520,7 +39520,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1237" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1237" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class enumImgType&amp;#010;" />
          </header>
@@ -39535,12 +39535,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1285" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
+              <ccfdeclarationcodeblock parent_id="1285" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1458" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
+              <ccfdeclarationcodeblock parent_id="1458" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -39580,52 +39580,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -39760,71 +39760,71 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			enumimgtype.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>
-      <codeclassfield tqparent_id="1285" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1285" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1285" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
+       <ccfdeclarationcodeblock parent_id="1285" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisImage ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1458" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1458" field_type="4" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1458" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
+       <ccfdeclarationcodeblock parent_id="1458" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisPaintDevice ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -39832,7 +39832,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1259" tqparent_class="1259" fileExt=".h" fileName="kisimage" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1259" parent_class="1259" fileExt=".h" fileName="kisimage" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISIMAGE_H&amp;#010;#define KISIMAGE_H" >
        <header>
@@ -39859,7 +39859,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1259" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1259" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisImage&amp;#010;" />
          </header>
@@ -39874,12 +39874,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1270" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisGuideMgr m_guides;" >
+              <ccfdeclarationcodeblock parent_id="1270" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisGuideMgr m_guides;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1285" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_type;" >
+              <ccfdeclarationcodeblock parent_id="1285" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_type;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -39919,52 +39919,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_33" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_33" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_34" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_34" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_35" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_35" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_38" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_38" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_39" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_39" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_40" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_40" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -39978,402 +39978,402 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1294" tag="operation_1294" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1294" tag="operation_1294" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param undoAdapter &amp;#010;@param width &amp;#010;@param height &amp;#010;@param imgType &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1302" tag="operation_1302" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1302" tag="operation_1302" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channel " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1304" tag="operation_1304" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1304" tag="operation_1304" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1306" tag="operation_1306" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1306" tag="operation_1306" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param n " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1308" tag="operation_1308" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1308" tag="operation_1308" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param n " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1311" tag="operation_1311" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1311" tag="operation_1311" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param type " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1313" tag="operation_1313" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1313" tag="operation_1313" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param type &amp;#010;@param active " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1316" tag="operation_1316" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1316" tag="operation_1316" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1317" tag="operation_1317" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1317" tag="operation_1317" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1318" tag="operation_1318" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1318" tag="operation_1318" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channel &amp;#010;@param position " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1321" tag="operation_1321" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1321" tag="operation_1321" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@param position " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1324" tag="operation_1324" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1324" tag="operation_1324" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1325" tag="operation_1325" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1325" tag="operation_1325" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1327" tag="operation_1327" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1327" tag="operation_1327" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1328" tag="operation_1328" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1328" tag="operation_1328" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1329" tag="operation_1329" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1329" tag="operation_1329" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param npos " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1331" tag="operation_1331" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1331" tag="operation_1331" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1333" tag="operation_1333" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1333" tag="operation_1333" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1334" tag="operation_1334" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1334" tag="operation_1334" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1335" tag="operation_1335" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1335" tag="operation_1335" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param cm " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1337" tag="operation_1337" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1337" tag="operation_1337" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1341" tag="operation_1341" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1341" tag="operation_1341" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1342" tag="operation_1342" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1342" tag="operation_1342" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param history " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1346" tag="operation_1346" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1346" tag="operation_1346" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1347" tag="operation_1347" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1347" tag="operation_1347" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1348" tag="operation_1348" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1348" tag="operation_1348" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1349" tag="operation_1349" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1349" tag="operation_1349" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1351" tag="operation_1351" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1351" tag="operation_1351" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channel " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1353" tag="operation_1353" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1353" tag="operation_1353" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1361" tag="operation_1361" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1361" tag="operation_1361" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1362" tag="operation_1362" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1362" tag="operation_1362" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tileno " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1364" tag="operation_1364" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1364" tag="operation_1364" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1369" tag="operation_1369" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1369" tag="operation_1369" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1371" tag="operation_1371" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1371" tag="operation_1371" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param npos " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1373" tag="operation_1373" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1373" tag="operation_1373" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1375" tag="operation_1375" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1375" tag="operation_1375" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1376" tag="operation_1376" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1376" tag="operation_1376" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channel " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1378" tag="operation_1378" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1378" tag="operation_1378" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1380" tag="operation_1380" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1380" tag="operation_1380" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1381" tag="operation_1381" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1381" tag="operation_1381" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1382" tag="operation_1382" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1382" tag="operation_1382" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1383" tag="operation_1383" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1383" tag="operation_1383" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1384" tag="operation_1384" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1384" tag="operation_1384" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1385" tag="operation_1385" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1385" tag="operation_1385" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1386" tag="operation_1386" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1386" tag="operation_1386" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1387" tag="operation_1387" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1387" tag="operation_1387" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1392" tag="operation_1392" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1392" tag="operation_1392" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1396" tag="operation_1396" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1396" tag="operation_1396" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channel &amp;#010;@param position " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1399" tag="operation_1399" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1399" tag="operation_1399" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@param position " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1402" tag="operation_1402" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1402" tag="operation_1402" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channel " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1404" tag="operation_1404" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1404" tag="operation_1404" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1406" tag="operation_1406" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1406" tag="operation_1406" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1409" tag="operation_1409" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1409" tag="operation_1409" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1411" tag="operation_1411" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1411" tag="operation_1411" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xres &amp;#010;@param yres " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1414" tag="operation_1414" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1414" tag="operation_1414" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xres &amp;#010;@param yres " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1417" tag="operation_1417" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1417" tag="operation_1417" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channel " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1419" tag="operation_1419" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1419" tag="operation_1419" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1421" tag="operation_1421" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1421" tag="operation_1421" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1422" tag="operation_1422" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1422" tag="operation_1422" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1424" tag="operation_1424" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1424" tag="operation_1424" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param selection " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1426" tag="operation_1426" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1426" tag="operation_1426" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1427" tag="operation_1427" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1427" tag="operation_1427" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xpix &amp;#010;@param ypix " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1430" tag="operation_1430" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1430" tag="operation_1430" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1431" tag="operation_1431" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1431" tag="operation_1431" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1433" tag="operation_1433" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1433" tag="operation_1433" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1434" tag="operation_1434" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1434" tag="operation_1434" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1435" tag="operation_1435" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1435" tag="operation_1435" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param u " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1437" tag="operation_1437" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1437" tag="operation_1437" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1438" tag="operation_1438" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1438" tag="operation_1438" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param commit " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1440" tag="operation_1440" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1440" tag="operation_1440" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1441" tag="operation_1441" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1441" tag="operation_1441" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param uri " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1443" tag="operation_1443" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1443" tag="operation_1443" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tileno " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1445" tag="operation_1445" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1445" tag="operation_1445" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1447" tag="operation_1447" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1447" tag="operation_1447" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param active " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1450" tag="operation_1450" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1450" tag="operation_1450" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -40430,22 +40430,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1292" tag="operation_1292" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1292" tag="operation_1292" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1344" tag="operation_1344" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1344" tag="operation_1344" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dev " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1355" tag="operation_1355" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1355" tag="operation_1355" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param adapter &amp;#010;@param width &amp;#010;@param height &amp;#010;@param imgType &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1394" tag="operation_1394" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1394" tag="operation_1394" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param type " />
                  </header>
@@ -40466,152 +40466,152 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1260" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_active;" >
+              <ccfdeclarationcodeblock parent_id="1260" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_active;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1261" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_activeChannel;" >
+              <ccfdeclarationcodeblock parent_id="1261" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_activeChannel;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1262" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_activeLayer;" >
+              <ccfdeclarationcodeblock parent_id="1262" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_activeLayer;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1263" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
+              <ccfdeclarationcodeblock parent_id="1263" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1264" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
+              <ccfdeclarationcodeblock parent_id="1264" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1265" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" KisBackgroundSP m_bkg;" >
+              <ccfdeclarationcodeblock parent_id="1265" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" KisBackgroundSP m_bkg;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1266" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" vKisChannelSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="1266" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" vKisChannelSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1267" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColorMap m_clrMap;" >
+              <ccfdeclarationcodeblock parent_id="1267" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColorMap m_clrMap;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1268" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
+              <ccfdeclarationcodeblock parent_id="1268" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1269" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
+              <ccfdeclarationcodeblock parent_id="1269" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1271" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+              <ccfdeclarationcodeblock parent_id="1271" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1272" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layerStack;" >
+              <ccfdeclarationcodeblock parent_id="1272" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layerStack;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1273" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layers;" >
+              <ccfdeclarationcodeblock parent_id="1273" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layers;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1274" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_tqmaskClr;" >
+              <ccfdeclarationcodeblock parent_id="1274" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_maskClr;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1275" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_tqmaskEnabled;" >
+              <ccfdeclarationcodeblock parent_id="1275" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_maskEnabled;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1276" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_tqmaskInverted;" >
+              <ccfdeclarationcodeblock parent_id="1276" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_maskInverted;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1277" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="1277" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1278" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
+              <ccfdeclarationcodeblock parent_id="1278" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1279" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileCols;" >
+              <ccfdeclarationcodeblock parent_id="1279" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileCols;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1280" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileRows;" >
+              <ccfdeclarationcodeblock parent_id="1280" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileRows;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1281" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_projection;" >
+              <ccfdeclarationcodeblock parent_id="1281" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_projection;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1282" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_selection;" >
+              <ccfdeclarationcodeblock parent_id="1282" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_selection;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1283" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_selectionMask;" >
+              <ccfdeclarationcodeblock parent_id="1283" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_selectionMask;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1284" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
+              <ccfdeclarationcodeblock parent_id="1284" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_undoHistory;" >
+              <ccfdeclarationcodeblock parent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_undoHistory;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1287" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" KURL m_uri;" >
+              <ccfdeclarationcodeblock parent_id="1287" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" KURL m_uri;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1288" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_visible;" >
+              <ccfdeclarationcodeblock parent_id="1288" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_visible;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1289" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+              <ccfdeclarationcodeblock parent_id="1289" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1290" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" double m_xres;" >
+              <ccfdeclarationcodeblock parent_id="1290" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" double m_xres;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1291" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" double m_yres;" >
+              <ccfdeclarationcodeblock parent_id="1291" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" double m_yres;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -40645,302 +40645,302 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1260" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1260" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1260" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1260" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1261" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1261" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1261" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1261" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1262" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1262" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1262" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1262" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1263" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1263" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1263" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1263" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1264" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1264" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1264" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1264" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1265" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1265" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1265" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1265" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1266" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1266" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1266" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1266" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1267" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1267" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1267" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1267" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1268" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1268" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1268" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1268" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1269" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1269" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1269" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1269" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1271" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1271" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1271" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1271" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1272" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1272" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1272" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1272" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1273" tag="hblock_tag_65" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1273" tag="hblock_tag_65" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1273" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1273" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1274" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1274" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1274" tag="hblock_tag_68" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1274" tag="hblock_tag_68" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1275" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1275" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1275" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1275" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1276" tag="hblock_tag_71" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1276" tag="hblock_tag_71" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1276" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1276" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1277" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1277" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1277" tag="hblock_tag_74" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1277" tag="hblock_tag_74" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1278" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1278" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1278" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1278" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1279" tag="hblock_tag_77" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1279" tag="hblock_tag_77" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1279" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1279" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1280" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1280" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1280" tag="hblock_tag_80" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1280" tag="hblock_tag_80" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1281" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1281" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1281" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1281" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1282" tag="hblock_tag_83" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1282" tag="hblock_tag_83" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1282" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1282" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1283" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1283" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1283" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1283" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1284" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1284" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1284" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1284" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1286" tag="hblock_tag_89" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1286" tag="hblock_tag_89" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1286" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1286" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1287" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1287" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1287" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1287" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1288" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1288" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1288" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1288" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1289" tag="hblock_tag_95" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1289" tag="hblock_tag_95" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1289" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1289" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1290" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1290" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1290" tag="hblock_tag_98" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1290" tag="hblock_tag_98" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1291" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1291" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1291" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1291" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -40973,671 +40973,671 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimage.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>
-      <codeclassfield tqparent_id="1260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1260" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1260" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_active;" >
+       <ccfdeclarationcodeblock parent_id="1260" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_active;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1260" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1260" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1260" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1260" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1260" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1261" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1261" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_activeChannel;" >
+       <ccfdeclarationcodeblock parent_id="1261" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_activeChannel;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1261" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1261" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1261" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1261" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1261" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1262" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1262" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_activeLayer;" >
+       <ccfdeclarationcodeblock parent_id="1262" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_activeLayer;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1262" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1262" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1262" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1262" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1262" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1263" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1263" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
+       <ccfdeclarationcodeblock parent_id="1263" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisUndoAdapter * m_adapter;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1263" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1263" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1263" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1263" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1263" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1264" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1264" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1264" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
+       <ccfdeclarationcodeblock parent_id="1264" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1264" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1264" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1264" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1264" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1264" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1265" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1265" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1265" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" KisBackgroundSP m_bkg;" >
+       <ccfdeclarationcodeblock parent_id="1265" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" KisBackgroundSP m_bkg;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1265" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1265" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1265" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1265" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1265" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1266" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1266" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1266" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" vKisChannelSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1266" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" vKisChannelSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1266" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1266" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1266" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1266" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1266" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1267" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1267" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColorMap m_clrMap;" >
+       <ccfdeclarationcodeblock parent_id="1267" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColorMap m_clrMap;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1267" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1267" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1267" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1267" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1267" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1268" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1268" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1268" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
+       <ccfdeclarationcodeblock parent_id="1268" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_depth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1268" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1268" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1268" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1268" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1268" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1269" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1269" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1269" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
+       <ccfdeclarationcodeblock parent_id="1269" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1269" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1269" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1269" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1269" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1269" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1271" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1271" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1271" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="1271" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1271" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1271" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1271" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1271" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1271" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1272" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1272" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1272" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layerStack;" >
+       <ccfdeclarationcodeblock parent_id="1272" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layerStack;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1272" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1272" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1272" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1272" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1272" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1273" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1273" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1273" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layers;" >
+       <ccfdeclarationcodeblock parent_id="1273" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" vKisLayerSP m_layers;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1273" tag="hblock_tag_65" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1273" tag="hblock_tag_65" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1273" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1273" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1273" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1274" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1274" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1274" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_tqmaskClr;" >
+       <ccfdeclarationcodeblock parent_id="1274" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_maskClr;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1274" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1274" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1274" tag="hblock_tag_68" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1274" tag="hblock_tag_68" canDelete="false" indentLevel="1" classfield_id="1274" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1275" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1275" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1275" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_tqmaskEnabled;" >
+       <ccfdeclarationcodeblock parent_id="1275" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_maskEnabled;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1275" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1275" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1275" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1275" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1275" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1276" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1276" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1276" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_tqmaskInverted;" >
+       <ccfdeclarationcodeblock parent_id="1276" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_maskInverted;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1276" tag="hblock_tag_71" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1276" tag="hblock_tag_71" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1276" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1276" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1276" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1277" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1277" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1277" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="1277" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1277" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1277" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1277" tag="hblock_tag_74" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1277" tag="hblock_tag_74" canDelete="false" indentLevel="1" classfield_id="1277" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1278" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1278" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1278" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
+       <ccfdeclarationcodeblock parent_id="1278" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KisNameServer * m_nserver;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1278" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1278" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1278" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1278" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1278" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1279" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1279" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1279" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileCols;" >
+       <ccfdeclarationcodeblock parent_id="1279" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileCols;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1279" tag="hblock_tag_77" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1279" tag="hblock_tag_77" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1279" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1279" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1279" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1280" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1280" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1280" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileRows;" >
+       <ccfdeclarationcodeblock parent_id="1280" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_ntileRows;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1280" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1280" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1280" tag="hblock_tag_80" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1280" tag="hblock_tag_80" canDelete="false" indentLevel="1" classfield_id="1280" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1281" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1281" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1281" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_projection;" >
+       <ccfdeclarationcodeblock parent_id="1281" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_projection;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1281" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1281" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1281" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1281" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1281" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1282" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1282" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1282" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_selection;" >
+       <ccfdeclarationcodeblock parent_id="1282" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KisSelectionSP m_selection;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1282" tag="hblock_tag_83" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1282" tag="hblock_tag_83" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1282" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1282" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1282" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1283" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1283" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1283" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_selectionMask;" >
+       <ccfdeclarationcodeblock parent_id="1283" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelSP m_selectionMask;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1283" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1283" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1283" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1283" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="1283" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1284" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1284" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
+       <ccfdeclarationcodeblock parent_id="1284" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1284" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1284" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1284" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1284" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1284" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1286" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1286" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_undoHistory;" >
+       <ccfdeclarationcodeblock parent_id="1286" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" KCommandHistory * m_undoHistory;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1286" tag="hblock_tag_89" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1286" tag="hblock_tag_89" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1286" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1286" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1286" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1287" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1287" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1287" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" KURL m_uri;" >
+       <ccfdeclarationcodeblock parent_id="1287" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" KURL m_uri;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1287" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1287" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1287" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1287" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="1287" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1288" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1288" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1288" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_visible;" >
+       <ccfdeclarationcodeblock parent_id="1288" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" QBitArray m_visible;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1288" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1288" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1288" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1288" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1288" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1289" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1289" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1289" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="1289" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1289" tag="hblock_tag_95" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1289" tag="hblock_tag_95" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1289" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1289" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1289" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1290" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1290" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1290" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" double m_xres;" >
+       <ccfdeclarationcodeblock parent_id="1290" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" double m_xres;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1290" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1290" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1290" tag="hblock_tag_98" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1290" tag="hblock_tag_98" canDelete="false" indentLevel="1" classfield_id="1290" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1291" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1291" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1291" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" double m_yres;" >
+       <ccfdeclarationcodeblock parent_id="1291" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" double m_yres;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1291" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1291" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1291" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1291" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1291" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1270" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1270" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1270" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisGuideMgr m_guides;" >
+       <ccfdeclarationcodeblock parent_id="1270" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisGuideMgr m_guides;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1270" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1270" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1270" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1270" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1270" tag="hblock_tag_33" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1270" tag="hblock_tag_33" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1270" tag="hblock_tag_34" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1270" tag="hblock_tag_34" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1270" tag="hblock_tag_35" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1270" tag="hblock_tag_35" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1270" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1285" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1285" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1285" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_type;" >
+       <ccfdeclarationcodeblock parent_id="1285" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_type;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_38" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_38" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_39" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_39" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_40" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_40" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -41645,7 +41645,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1453" tqparent_class="1453" fileExt=".h" fileName="kispaintdevice" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1453" parent_class="1453" fileExt=".h" fileName="kispaintdevice" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPAINTDEVICE_H&amp;#010;#define KISPAINTDEVICE_H" >
        <header>
@@ -41672,7 +41672,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1453" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1453" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisPaintDevice&amp;#010;" />
          </header>
@@ -41687,12 +41687,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1455" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" CompositeOp m_compositeOp;" >
+              <ccfdeclarationcodeblock parent_id="1455" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" CompositeOp m_compositeOp;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1458" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_imgType;" >
+              <ccfdeclarationcodeblock parent_id="1458" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_imgType;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -41732,52 +41732,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_26" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_26" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_27" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_27" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_28" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_28" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -41791,312 +41791,312 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1476" tag="operation_1476" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1476" tag="operation_1476" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param width &amp;#010;@param height &amp;#010;@param imgType &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1482" tag="operation_1482" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1482" tag="operation_1482" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tm &amp;#010;@param img &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1486" tag="operation_1486" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1486" tag="operation_1486" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param width &amp;#010;@param height &amp;#010;@param imgType &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1491" tag="operation_1491" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1491" tag="operation_1491" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1493" tag="operation_1493" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1493" tag="operation_1493" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1494" tag="operation_1494" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1494" tag="operation_1494" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Reimplemented by KisSelection; here it does nothing useful, but it&amp;#010;cannot be abstract, because otherwise this class would be abstract." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1495" tag="operation_1495" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1495" tag="operation_1495" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1496" tag="operation_1496" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1496" tag="operation_1496" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1497" tag="operation_1497" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1497" tag="operation_1497" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param offx &amp;#010;@param offy &amp;#010;@param offw &amp;#010;@param offh " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1502" tag="operation_1502" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1502" tag="operation_1502" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param cm " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1504" tag="operation_1504" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1504" tag="operation_1504" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1505" tag="operation_1505" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1505" tag="operation_1505" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1506" tag="operation_1506" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1506" tag="operation_1506" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@param width &amp;#010;@param height &amp;#010;@param imgType &amp;#010;@param name &amp;#010;@param compositeOp " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1513" tag="operation_1513" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1513" tag="operation_1513" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1516" tag="operation_1516" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1516" tag="operation_1516" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1519" tag="operation_1519" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1519" tag="operation_1519" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mgr " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1521" tag="operation_1521" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1521" tag="operation_1521" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1524" tag="operation_1524" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1524" tag="operation_1524" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param size " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1526" tag="operation_1526" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1526" tag="operation_1526" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1529" tag="operation_1529" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1529" tag="operation_1529" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1531" tag="operation_1531" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1531" tag="operation_1531" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1532" tag="operation_1532" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1532" tag="operation_1532" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tileno " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1534" tag="operation_1534" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1534" tag="operation_1534" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1539" tag="operation_1539" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1539" tag="operation_1539" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1541" tag="operation_1541" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1541" tag="operation_1541" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1543" tag="operation_1543" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1543" tag="operation_1543" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x1 &amp;#010;@param y1 &amp;#010;@param x2 &amp;#010;@param y2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1551" tag="operation_1551" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1551" tag="operation_1551" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1553" tag="operation_1553" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1553" tag="operation_1553" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1554" tag="operation_1554" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1554" tag="operation_1554" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1557" tag="operation_1557" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1557" tag="operation_1557" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param c &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1562" tag="operation_1562" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1562" tag="operation_1562" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1563" tag="operation_1563" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1563" tag="operation_1563" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1564" tag="operation_1564" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1564" tag="operation_1564" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param store " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1566" tag="operation_1566" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1566" tag="operation_1566" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1567" tag="operation_1567" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1567" tag="operation_1567" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1570" tag="operation_1570" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1570" tag="operation_1570" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param size " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1572" tag="operation_1572" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1572" tag="operation_1572" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param offx &amp;#010;@param offy &amp;#010;@param offw &amp;#010;@param offh " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1577" tag="operation_1577" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1577" tag="operation_1577" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param compositeOp " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1579" tag="operation_1579" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1579" tag="operation_1579" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1581" tag="operation_1581" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1581" tag="operation_1581" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1583" tag="operation_1583" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1583" tag="operation_1583" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param c &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1590" tag="operation_1590" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1590" tag="operation_1590" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1592" tag="operation_1592" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1592" tag="operation_1592" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1593" tag="operation_1593" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1593" tag="operation_1593" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1594" tag="operation_1594" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1594" tag="operation_1594" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xpix &amp;#010;@param ypix " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1597" tag="operation_1597" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1597" tag="operation_1597" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1599" tag="operation_1599" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1599" tag="operation_1599" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1600" tag="operation_1600" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1600" tag="operation_1600" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1601" tag="operation_1601" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1601" tag="operation_1601" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1602" tag="operation_1602" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1602" tag="operation_1602" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1607" tag="operation_1607" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1607" tag="operation_1607" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tileno " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1609" tag="operation_1609" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1609" tag="operation_1609" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1610" tag="operation_1610" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1610" tag="operation_1610" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1612" tag="operation_1612" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1612" tag="operation_1612" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1615" tag="operation_1615" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1615" tag="operation_1615" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param store " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1617" tag="operation_1617" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1617" tag="operation_1617" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1619" tag="operation_1619" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1619" tag="operation_1619" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -42153,22 +42153,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1474" tag="operation_1474" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1474" tag="operation_1474" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1527" tag="operation_1527" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1527" tag="operation_1527" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1530" tag="operation_1530" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1530" tag="operation_1530" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1613" tag="operation_1613" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1613" tag="operation_1613" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w " />
                  </header>
@@ -42189,92 +42189,92 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1454" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
+              <ccfdeclarationcodeblock parent_id="1454" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1456" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
+              <ccfdeclarationcodeblock parent_id="1456" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1457" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+              <ccfdeclarationcodeblock parent_id="1457" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1459" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="1459" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1460" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offH;" >
+              <ccfdeclarationcodeblock parent_id="1460" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offH;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1461" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offW;" >
+              <ccfdeclarationcodeblock parent_id="1461" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offW;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1462" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offX;" >
+              <ccfdeclarationcodeblock parent_id="1462" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offX;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1463" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offY;" >
+              <ccfdeclarationcodeblock parent_id="1463" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offY;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1464" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_owner;" >
+              <ccfdeclarationcodeblock parent_id="1464" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_owner;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1465" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_projection;" >
+              <ccfdeclarationcodeblock parent_id="1465" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_projection;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1466" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_projectionValid;" >
+              <ccfdeclarationcodeblock parent_id="1466" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_projectionValid;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1467" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_quantumSize;" >
+              <ccfdeclarationcodeblock parent_id="1467" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_quantumSize;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1468" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
+              <ccfdeclarationcodeblock parent_id="1468" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1469" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_tiles;" >
+              <ccfdeclarationcodeblock parent_id="1469" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_tiles;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1470" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_visible;" >
+              <ccfdeclarationcodeblock parent_id="1470" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_visible;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1471" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+              <ccfdeclarationcodeblock parent_id="1471" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1472" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_x;" >
+              <ccfdeclarationcodeblock parent_id="1472" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_x;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1473" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_y;" >
+              <ccfdeclarationcodeblock parent_id="1473" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_y;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -42308,182 +42308,182 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1454" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1454" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1454" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1454" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1456" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1456" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1456" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1456" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1457" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1457" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1457" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1457" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1459" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1459" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1459" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1459" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1460" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1460" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1460" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1460" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1461" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1461" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1461" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1461" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1462" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1462" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1462" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1462" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1463" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1463" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1463" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1463" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1464" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1464" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1464" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1464" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1465" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1465" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1465" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1465" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1466" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1466" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1466" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1466" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1467" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1467" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1467" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1467" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1468" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1468" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1468" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1468" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1469" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1469" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1469" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1469" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1470" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1470" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1470" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1470" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1471" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1471" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1471" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1471" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1472" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1472" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1472" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1472" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1473" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1473" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1473" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1473" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -42516,431 +42516,431 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispaintdevice.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>
-      <codeclassfield tqparent_id="1454" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1454" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1454" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
+       <ccfdeclarationcodeblock parent_id="1454" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_alpha;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1454" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1454" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1454" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1454" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1454" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1456" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1456" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1456" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
+       <ccfdeclarationcodeblock parent_id="1456" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_depth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1456" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1456" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1456" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1456" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1456" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1457" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1457" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1457" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="1457" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1457" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1457" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1457" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1457" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1457" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1459" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1459" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1459" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="1459" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1459" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1459" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1459" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1459" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1459" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1460" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1460" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1460" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offH;" >
+       <ccfdeclarationcodeblock parent_id="1460" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offH;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1460" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1460" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1460" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1460" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1460" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1461" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1461" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1461" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offW;" >
+       <ccfdeclarationcodeblock parent_id="1461" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offW;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1461" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1461" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1461" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1461" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1461" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1462" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1462" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1462" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offX;" >
+       <ccfdeclarationcodeblock parent_id="1462" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offX;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1462" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1462" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1462" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1462" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1462" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1463" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1463" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1463" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offY;" >
+       <ccfdeclarationcodeblock parent_id="1463" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_offY;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1463" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1463" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1463" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1463" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1463" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1464" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1464" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1464" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_owner;" >
+       <ccfdeclarationcodeblock parent_id="1464" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_owner;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1464" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1464" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1464" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1464" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1464" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1465" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1465" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1465" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_projection;" >
+       <ccfdeclarationcodeblock parent_id="1465" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap m_projection;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1465" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1465" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1465" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1465" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1465" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1466" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1466" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1466" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_projectionValid;" >
+       <ccfdeclarationcodeblock parent_id="1466" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_projectionValid;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1466" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1466" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1466" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1466" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1466" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1467" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1467" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1467" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_quantumSize;" >
+       <ccfdeclarationcodeblock parent_id="1467" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_quantumSize;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1467" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1467" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1467" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1467" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1467" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1468" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1468" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1468" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
+       <ccfdeclarationcodeblock parent_id="1468" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_shadow;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1468" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1468" tag="hblock_tag_53" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1468" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1468" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1468" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1469" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1469" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1469" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_tiles;" >
+       <ccfdeclarationcodeblock parent_id="1469" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileMgrSP m_tiles;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1469" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1469" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1469" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1469" tag="hblock_tag_56" canDelete="false" indentLevel="1" classfield_id="1469" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1470" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1470" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1470" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_visible;" >
+       <ccfdeclarationcodeblock parent_id="1470" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_visible;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1470" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1470" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1470" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1470" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1470" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1471" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1471" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1471" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="1471" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1471" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1471" tag="hblock_tag_59" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1471" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1471" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1471" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1472" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1472" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1472" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_x;" >
+       <ccfdeclarationcodeblock parent_id="1472" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_x;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1472" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1472" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1472" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1472" tag="hblock_tag_62" canDelete="false" indentLevel="1" classfield_id="1472" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1473" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1473" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1473" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_y;" >
+       <ccfdeclarationcodeblock parent_id="1473" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_y;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1473" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1473" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1473" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1473" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1473" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1455" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1455" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1455" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" CompositeOp m_compositeOp;" >
+       <ccfdeclarationcodeblock parent_id="1455" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" CompositeOp m_compositeOp;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1455" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1455" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1455" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1455" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1455" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1455" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1455" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1455" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1455" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1455" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1455" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1458" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1458" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1458" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_imgType;" >
+       <ccfdeclarationcodeblock parent_id="1458" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" enumImgType m_imgType;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1458" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1458" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1458" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1458" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1458" tag="hblock_tag_26" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1458" tag="hblock_tag_26" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1458" tag="hblock_tag_27" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1458" tag="hblock_tag_27" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1458" tag="hblock_tag_28" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1458" tag="hblock_tag_28" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1458" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -42948,14 +42948,14 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1620" tqparent_class="1620" fileExt=".h" fileName="kislayer" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1620" parent_class="1620" fileExt=".h" fileName="kislayer" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISLAYER_H&amp;#010;#define KISLAYER_H" >
        <header>
         <cppcodedocumentation tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <codeblockwithcomments tag="includes" text="#include &lt;string>&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;kistilemgrsp.h&quot;&amp;#010;#include &quot;kistqmasksp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
+      <codeblockwithcomments tag="includes" text="#include &lt;string>&amp;#010;#include &quot;kisimagesp.h&quot;&amp;#010;#include &quot;quantum.h&quot;&amp;#010;#include &quot;kistilemgrsp.h&quot;&amp;#010;#include &quot;kismasksp.h&quot;&amp;#010;#include &quot;bool.h&quot;&amp;#010;" >
        <header>
         <cppcodedocumentation tag="" writeOutText="false" />
        </header>
@@ -42975,7 +42975,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1620" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1620" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisLayer&amp;#010;" />
          </header>
@@ -43032,87 +43032,87 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param width &amp;#010;@param height &amp;#010;@param name &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1634" tag="operation_1634" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1634" tag="operation_1634" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tiles &amp;#010;@param img &amp;#010;@param name &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1639" tag="operation_1639" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1639" tag="operation_1639" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param width &amp;#010;@param height &amp;#010;@param imgType &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1644" tag="operation_1644" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1644" tag="operation_1644" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1646" tag="operation_1646" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1646" tag="operation_1646" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1647" tag="operation_1647" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1647" tag="operation_1647" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqmask " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1649" tag="operation_1649" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1649" tag="operation_1649" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param mode " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1651" tag="operation_1651" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1651" tag="operation_1651" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqmaskType " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param maskType " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1653" tag="operation_1653" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1653" tag="operation_1653" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1654" tag="operation_1654" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1654" tag="operation_1654" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param l " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1656" tag="operation_1656" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1656" tag="operation_1656" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1657" tag="operation_1657" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1657" tag="operation_1657" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1658" tag="operation_1658" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1658" tag="operation_1658" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param val " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1660" tag="operation_1660" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1660" tag="operation_1660" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1663" tag="operation_1663" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1663" tag="operation_1663" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1664" tag="operation_1664" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1664" tag="operation_1664" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1666" tag="operation_1666" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1666" tag="operation_1666" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -43184,37 +43184,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1621" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dx;" >
+              <ccfdeclarationcodeblock parent_id="1621" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dx;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1622" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dy;" >
+              <ccfdeclarationcodeblock parent_id="1622" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dy;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1623" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_initial;" >
+              <ccfdeclarationcodeblock parent_id="1623" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_initial;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1624" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_linked;" >
+              <ccfdeclarationcodeblock parent_id="1624" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_linked;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_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_tqmask;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1626" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
+              <ccfdeclarationcodeblock parent_id="1626" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1627" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_preserveTransparency;" >
+              <ccfdeclarationcodeblock parent_id="1627" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_preserveTransparency;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -43248,72 +43248,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1621" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1621" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1621" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1621" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1622" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1622" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1622" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1622" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1623" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1623" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1623" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1623" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1624" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1624" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1624" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1624" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1625" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1625" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1625" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1625" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1626" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1626" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1626" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1626" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1627" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1627" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1627" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1627" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -43346,141 +43346,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kislayer.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>
-      <codeclassfield tqparent_id="1621" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1621" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1621" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dx;" >
+       <ccfdeclarationcodeblock parent_id="1621" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dx;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1621" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1621" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1621" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1621" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1621" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1622" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1622" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1622" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dy;" >
+       <ccfdeclarationcodeblock parent_id="1622" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_dy;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1622" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1622" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1622" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1622" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1622" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1623" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1623" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1623" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_initial;" >
+       <ccfdeclarationcodeblock parent_id="1623" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_initial;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1623" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1623" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1623" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1623" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1623" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1624" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1624" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1624" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_linked;" >
+       <ccfdeclarationcodeblock parent_id="1624" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_linked;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1624" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1624" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1624" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1624" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1624" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1625" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_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_tqmask;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1625" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1625" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1625" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1625" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1625" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1626" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1626" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
+       <ccfdeclarationcodeblock parent_id="1626" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1626" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1626" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1626" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1626" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1626" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1627" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_preserveTransparency;" >
+       <ccfdeclarationcodeblock parent_id="1627" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_preserveTransparency;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1627" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1627" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1627" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1627" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1627" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -43488,7 +43488,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1667" tqparent_class="1667" fileExt=".h" fileName="kisnameserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1667" parent_class="1667" fileExt=".h" fileName="kisnameserver" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISNAMESERVER_H&amp;#010;#define KISNAMESERVER_H" >
        <header>
@@ -43515,7 +43515,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1667" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1667" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisNameServer&amp;#010;" />
          </header>
@@ -43572,27 +43572,27 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1670" tag="operation_1670" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1670" tag="operation_1670" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param prefix &amp;#010;@param seed " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1673" tag="operation_1673" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1673" tag="operation_1673" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1674" tag="operation_1674" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1674" tag="operation_1674" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1675" tag="operation_1675" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1675" tag="operation_1675" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1676" tag="operation_1676" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1676" tag="operation_1676" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -43664,12 +43664,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1668" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_generator;" >
+              <ccfdeclarationcodeblock parent_id="1668" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_generator;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1669" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_prefix;" >
+              <ccfdeclarationcodeblock parent_id="1669" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_prefix;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -43703,22 +43703,22 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1668" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1668" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1668" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1668" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1669" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1669" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1669" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1669" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -43751,41 +43751,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisnameserver.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>
-      <codeclassfield tqparent_id="1668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1668" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_generator;" >
+       <ccfdeclarationcodeblock parent_id="1668" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_generator;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1668" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1668" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1668" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1668" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1668" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1669" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1669" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1669" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_prefix;" >
+       <ccfdeclarationcodeblock parent_id="1669" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_prefix;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1669" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1669" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1669" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1669" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1669" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -43793,7 +43793,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1677" tqparent_class="1677" fileExt=".h" fileName="kismemento" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1677" parent_class="1677" fileExt=".h" fileName="kismemento" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISMEMENTO_H&amp;#010;#define KISMEMENTO_H" >
        <header>
@@ -43820,7 +43820,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1677" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1677" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisMemento&amp;#010;" />
          </header>
@@ -43877,7 +43877,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1678" tag="operation_1678" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1678" tag="operation_1678" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -44005,7 +44005,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1679" tqparent_class="1679" fileExt=".h" fileName="kispaintdevicevisitor" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1679" parent_class="1679" fileExt=".h" fileName="kispaintdevicevisitor" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPAINTDEVICEVISITOR_H&amp;#010;#define KISPAINTDEVICEVISITOR_H" >
        <header>
@@ -44032,7 +44032,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1679" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1679" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisPaintDeviceVisitor&amp;#010;" />
          </header>
@@ -44089,62 +44089,62 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1680" tag="operation_1680" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1680" tag="operation_1680" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1683" tag="operation_1683" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1683" tag="operation_1683" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param dev " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1686" tag="operation_1686" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1686" tag="operation_1686" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param selection " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1689" tag="operation_1689" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1689" tag="operation_1689" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layers " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1692" tag="operation_1692" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1692" tag="operation_1692" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param devs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1695" tag="operation_1695" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1695" tag="operation_1695" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1696" tag="operation_1696" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1696" tag="operation_1696" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1699" tag="operation_1699" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1699" tag="operation_1699" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param dev " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1702" tag="operation_1702" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1702" tag="operation_1702" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param selection " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1705" tag="operation_1705" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1705" tag="operation_1705" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param layers " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1708" tag="operation_1708" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1708" tag="operation_1708" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param devs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1711" tag="operation_1711" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1711" tag="operation_1711" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -44272,7 +44272,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1712" tqparent_class="1712" fileExt=".h" fileName="kismementooriginatorinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1712" parent_class="1712" fileExt=".h" fileName="kismementooriginatorinterface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISMEMENTOORIGINATORINTERFACE_H&amp;#010;#define KISMEMENTOORIGINATORINTERFACE_H" >
        <header>
@@ -44299,7 +44299,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1712" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1712" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisMementoOriginatorInterface&amp;#010;" />
          </header>
@@ -44356,22 +44356,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1715" tag="operation_1715" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1715" tag="operation_1715" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1718" tag="operation_1718" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1718" tag="operation_1718" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param memento " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1720" tag="operation_1720" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1720" tag="operation_1720" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1721" tag="operation_1721" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1721" tag="operation_1721" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -44428,12 +44428,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1713" tag="operation_1713" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1713" tag="operation_1713" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1716" tag="operation_1716" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1716" tag="operation_1716" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -44510,7 +44510,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1722" tqparent_class="1722" fileExt=".h" fileName="kistqmask" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1722" parent_class="1722" fileExt=".h" fileName="kistqmask" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISMASK_H&amp;#010;#define KISMASK_H" >
        <header>
@@ -44537,7 +44537,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1722" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1722" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisMask&amp;#010;" />
          </header>
@@ -44594,47 +44594,47 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1723" tag="operation_1723" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1723" tag="operation_1723" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param width &amp;#010;@param height &amp;#010;@param name &amp;#010;@param color " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1729" tag="operation_1729" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1729" tag="operation_1729" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1731" tag="operation_1731" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1731" tag="operation_1731" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1732" tag="operation_1732" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1732" tag="operation_1732" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqmask " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1735" tag="operation_1735" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1735" tag="operation_1735" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param val " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1737" tag="operation_1737" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1737" tag="operation_1737" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1738" tag="operation_1738" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1738" tag="operation_1738" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param owner " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1740" tag="operation_1740" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1740" tag="operation_1740" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -44762,7 +44762,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1741" tqparent_class="1741" fileExt=".h" fileName="kisimagepipebrush" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1741" parent_class="1741" fileExt=".h" fileName="kisimagepipebrush" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISIMAGEPIPEBRUSH_H&amp;#010;#define KISIMAGEPIPEBRUSH_H" >
        <header>
@@ -44789,7 +44789,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1741" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1741" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisImagePipeBrush&amp;#010;" />
          </header>
@@ -44804,7 +44804,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1742" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" enumBrushType m_brushType;" >
+              <ccfdeclarationcodeblock parent_id="1742" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" enumBrushType m_brushType;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -44844,27 +44844,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -44878,47 +44878,47 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1750" tag="operation_1750" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1750" tag="operation_1750" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param filename " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1752" tag="operation_1752" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1752" tag="operation_1752" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1753" tag="operation_1753" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1753" tag="operation_1753" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1754" tag="operation_1754" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1754" tag="operation_1754" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="@return the next image in the pipe." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1755" tag="operation_1755" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1755" tag="operation_1755" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1756" tag="operation_1756" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1758" tag="operation_1758" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1758" tag="operation_1758" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1759" tag="operation_1759" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1759" tag="operation_1759" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1763" tag="operation_1763" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1763" tag="operation_1763" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -44975,7 +44975,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1761" tag="operation_1761" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1761" tag="operation_1761" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parasite " />
                  </header>
@@ -44996,37 +44996,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1743" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
+              <ccfdeclarationcodeblock parent_id="1743" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1744" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_currentBrush;" >
+              <ccfdeclarationcodeblock parent_id="1744" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_currentBrush;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1745" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+              <ccfdeclarationcodeblock parent_id="1745" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1746" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+              <ccfdeclarationcodeblock parent_id="1746" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1747" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="1747" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1748" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_numOfBrushes;" >
+              <ccfdeclarationcodeblock parent_id="1748" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_numOfBrushes;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1749" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_parasite;" >
+              <ccfdeclarationcodeblock parent_id="1749" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_parasite;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -45060,72 +45060,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1743" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1743" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1743" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1743" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1744" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1744" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1744" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1744" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1745" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1745" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1745" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1745" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1746" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1746" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1746" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1746" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1747" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1747" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1747" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1747" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1748" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1748" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1748" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1748" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1749" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1749" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1749" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1749" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -45158,176 +45158,176 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisimagepipebrush.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>
-      <codeclassfield tqparent_id="1743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1743" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1743" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
+       <ccfdeclarationcodeblock parent_id="1743" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1743" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1743" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1743" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1743" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1743" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1744" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1744" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_currentBrush;" >
+       <ccfdeclarationcodeblock parent_id="1744" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_currentBrush;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1744" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1744" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1744" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1744" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1744" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1745" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1745" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1745" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
+       <ccfdeclarationcodeblock parent_id="1745" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QValueVector m_data;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1745" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1745" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1745" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1745" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1745" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1746" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1746" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1746" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+       <ccfdeclarationcodeblock parent_id="1746" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1746" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1746" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1746" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1746" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1746" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1747" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1747" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1747" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="1747" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1747" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1747" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1747" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1747" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1747" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1748" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1748" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1748" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_numOfBrushes;" >
+       <ccfdeclarationcodeblock parent_id="1748" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_UINT32 m_numOfBrushes;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1748" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1748" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1748" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1748" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="1748" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1749" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1749" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1749" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_parasite;" >
+       <ccfdeclarationcodeblock parent_id="1749" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_parasite;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1749" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1749" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1749" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1749" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1749" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1742" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1742" field_type="4" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1742" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" enumBrushType m_brushType;" >
+       <ccfdeclarationcodeblock parent_id="1742" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" enumBrushType m_brushType;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1742" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1742" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1742" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1742" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1742" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1742" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1742" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1742" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1742" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1742" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1742" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -45335,7 +45335,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1767" tqparent_class="1767" fileExt=".h" fileName="kispainter" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1767" parent_class="1767" fileExt=".h" fileName="kispainter" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPAINTER_H&amp;#010;#define KISPAINTER_H" >
        <header>
@@ -45362,7 +45362,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1767" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1767" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisPainter&amp;#010;" />
          </header>
@@ -45377,12 +45377,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1769" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
+              <ccfdeclarationcodeblock parent_id="1769" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1776" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
+              <ccfdeclarationcodeblock parent_id="1776" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -45422,52 +45422,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -45481,142 +45481,142 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1786" tag="operation_1786" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1786" tag="operation_1786" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1787" tag="operation_1787" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1787" tag="operation_1787" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1791" tag="operation_1791" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1791" tag="operation_1791" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1793" tag="operation_1793" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1793" tag="operation_1793" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param customName " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1795" tag="operation_1795" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1795" tag="operation_1795" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dx &amp;#010;@param dy &amp;#010;@param op &amp;#010;@param src &amp;#010;@param opacity &amp;#010;@param sx &amp;#010;@param sy &amp;#010;@param sw &amp;#010;@param sh " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1805" tag="operation_1805" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1805" tag="operation_1805" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dx &amp;#010;@param dy &amp;#010;@param op &amp;#010;@param src &amp;#010;@param sx &amp;#010;@param sy &amp;#010;@param sw &amp;#010;@param sh " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1817" tag="operation_1817" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1817" tag="operation_1817" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1818" tag="operation_1818" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1818" tag="operation_1818" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1820" tag="operation_1820" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1820" tag="operation_1820" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos &amp;#010;@param pressure &amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1825" tag="operation_1825" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1825" tag="operation_1825" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos1 &amp;#010;@param pos2 &amp;#010;@param pressure &amp;#010;@param xTilt &amp;#010;@param yTilt &amp;#010;@param savedDist " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1832" tag="operation_1832" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1832" tag="operation_1832" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x1 &amp;#010;@param y1 &amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1837" tag="operation_1837" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1837" tag="operation_1837" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1839" tag="operation_1839" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1839" tag="operation_1839" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@param c " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1845" tag="operation_1845" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1845" tag="operation_1845" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@param c &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1852" tag="operation_1852" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1852" tag="operation_1852" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@param c " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1855" tag="operation_1855" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1855" tag="operation_1855" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@param c &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1859" tag="operation_1859" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1859" tag="operation_1859" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos &amp;#010;@param pressure &amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1864" tag="operation_1864" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1864" tag="operation_1864" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos1 &amp;#010;@param pos2 &amp;#010;@param pressure &amp;#010;@param xTilt &amp;#010;@param yTilt &amp;#010;@param savedDist " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1871" tag="operation_1871" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1871" tag="operation_1871" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param color " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1873" tag="operation_1873" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1873" tag="operation_1873" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param brush " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param color " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1877" tag="operation_1877" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1877" tag="operation_1877" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gradient " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1879" tag="operation_1879" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1879" tag="operation_1879" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1881" tag="operation_1881" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1881" tag="operation_1881" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param color " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1883" tag="operation_1883" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1883" tag="operation_1883" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pattern " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1902" tag="operation_1902" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1902" tag="operation_1902" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -45673,27 +45673,27 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1784" tag="operation_1784" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1784" tag="operation_1784" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1789" tag="operation_1789" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1789" tag="operation_1789" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1814" tag="operation_1814" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1814" tag="operation_1814" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqmask " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dsttile &amp;#010;@param src &amp;#010;@param srctile &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1894" tag="operation_1894" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1894" tag="operation_1894" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dsttile &amp;#010;@param src &amp;#010;@param srctile &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
@@ -45714,72 +45714,72 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1768" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_backgroundColor;" >
+              <ccfdeclarationcodeblock parent_id="1768" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_backgroundColor;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1770" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushHeight;" >
+              <ccfdeclarationcodeblock parent_id="1770" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushHeight;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1771" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushWidth;" >
+              <ccfdeclarationcodeblock parent_id="1771" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushWidth;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1772" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_dab;" >
+              <ccfdeclarationcodeblock parent_id="1772" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_dab;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1773" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
+              <ccfdeclarationcodeblock parent_id="1773" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1774" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_dirtyRect;" >
+              <ccfdeclarationcodeblock parent_id="1774" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_dirtyRect;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1775" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fillColor;" >
+              <ccfdeclarationcodeblock parent_id="1775" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fillColor;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1777" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+              <ccfdeclarationcodeblock parent_id="1777" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1778" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotX;" >
+              <ccfdeclarationcodeblock parent_id="1778" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotX;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1779" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotY;" >
+              <ccfdeclarationcodeblock parent_id="1779" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotY;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1780" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
+              <ccfdeclarationcodeblock parent_id="1780" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1781" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_paintColor;" >
+              <ccfdeclarationcodeblock parent_id="1781" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_paintColor;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1782" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisPattern * m_pattern;" >
+              <ccfdeclarationcodeblock parent_id="1782" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisPattern * m_pattern;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1783" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileCommand * m_transaction;" >
+              <ccfdeclarationcodeblock parent_id="1783" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileCommand * m_transaction;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -45813,142 +45813,142 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1768" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1768" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1768" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1768" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1770" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1770" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1770" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1770" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1771" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1771" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1771" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1771" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1772" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1772" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1772" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1772" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1773" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1773" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1773" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1773" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1774" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1774" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1774" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1774" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1775" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1775" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1775" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1775" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1777" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1777" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1777" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1777" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1778" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1778" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1778" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1778" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1779" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1779" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1779" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1779" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1780" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1780" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1780" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1780" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1781" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1781" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1781" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1781" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1782" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1782" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1782" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1782" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1783" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1783" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1783" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1783" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -45981,351 +45981,351 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispainter.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>
-      <codeclassfield tqparent_id="1768" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1768" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1768" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_backgroundColor;" >
+       <ccfdeclarationcodeblock parent_id="1768" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_backgroundColor;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1768" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1768" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1768" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1768" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="1768" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1770" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1770" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1770" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushHeight;" >
+       <ccfdeclarationcodeblock parent_id="1770" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushHeight;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1770" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1770" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1770" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1770" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1770" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1771" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1771" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1771" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushWidth;" >
+       <ccfdeclarationcodeblock parent_id="1771" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_brushWidth;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1771" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1771" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1771" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1771" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1771" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1772" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1772" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1772" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_dab;" >
+       <ccfdeclarationcodeblock parent_id="1772" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisLayerSP m_dab;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1772" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1772" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1772" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1772" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="1772" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1773" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1773" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1773" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
+       <ccfdeclarationcodeblock parent_id="1773" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1773" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1773" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1773" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1773" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1773" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1774" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1774" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1774" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_dirtyRect;" >
+       <ccfdeclarationcodeblock parent_id="1774" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_dirtyRect;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1774" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1774" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1774" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1774" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1774" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1775" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1775" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1775" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fillColor;" >
+       <ccfdeclarationcodeblock parent_id="1775" tag="tblock_8" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fillColor;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1775" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1775" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1775" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1775" tag="hblock_tag_38" canDelete="false" indentLevel="1" classfield_id="1775" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1777" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1777" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1777" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+       <ccfdeclarationcodeblock parent_id="1777" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1777" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1777" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1777" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1777" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1777" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1778" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1778" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1778" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotX;" >
+       <ccfdeclarationcodeblock parent_id="1778" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotX;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1778" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1778" tag="hblock_tag_41" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1778" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1778" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1778" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1779" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1779" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1779" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotY;" >
+       <ccfdeclarationcodeblock parent_id="1779" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_hotSpotY;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1779" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1779" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1779" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1779" tag="hblock_tag_44" canDelete="false" indentLevel="1" classfield_id="1779" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1780" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1780" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1780" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
+       <ccfdeclarationcodeblock parent_id="1780" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" QUANTUM m_opacity;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1780" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1780" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1780" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1780" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1780" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1781" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1781" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1781" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_paintColor;" >
+       <ccfdeclarationcodeblock parent_id="1781" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_paintColor;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1781" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1781" tag="hblock_tag_47" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1781" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1781" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1781" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1782" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1782" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1782" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisPattern * m_pattern;" >
+       <ccfdeclarationcodeblock parent_id="1782" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" KisPattern * m_pattern;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1782" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1782" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1782" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1782" tag="hblock_tag_50" canDelete="false" indentLevel="1" classfield_id="1782" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1783" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1783" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1783" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileCommand * m_transaction;" >
+       <ccfdeclarationcodeblock parent_id="1783" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisTileCommand * m_transaction;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1783" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1783" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1783" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1783" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1783" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1769" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1769" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1769" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
+       <ccfdeclarationcodeblock parent_id="1769" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1769" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1769" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1769" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1769" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1769" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1769" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1769" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1769" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1769" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1769" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1769" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1776" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1776" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1776" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
+       <ccfdeclarationcodeblock parent_id="1776" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1776" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="1776" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1776" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="1776" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1776" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="1776" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1776" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -46333,7 +46333,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1903" tqparent_class="1903" fileExt=".h" fileName="kisselection" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1903" parent_class="1903" fileExt=".h" fileName="kisselection" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISSELECTION_H&amp;#010;#define KISSELECTION_H" >
        <header>
@@ -46360,7 +46360,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1903" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1903" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisSelection&amp;#010;" />
          </header>
@@ -46417,72 +46417,72 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1911" tag="operation_1911" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1916" tag="operation_1916" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1916" tag="operation_1916" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param width &amp;#010;@param height &amp;#010;@param imgType &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1921" tag="operation_1921" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1921" tag="operation_1921" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1922" tag="operation_1922" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1922" tag="operation_1922" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param f " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1924" tag="operation_1924" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1924" tag="operation_1924" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1925" tag="operation_1925" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1925" tag="operation_1925" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1927" tag="operation_1927" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1927" tag="operation_1927" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1930" tag="operation_1930" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1930" tag="operation_1930" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1931" tag="operation_1931" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1931" tag="operation_1931" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparentX &amp;#010;@param tqparentY &amp;#010;@param width &amp;#010;@param height " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param parentX &amp;#010;@param parentY &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1936" tag="operation_1936" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1936" tag="operation_1936" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1938" tag="operation_1938" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1938" tag="operation_1938" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1940" tag="operation_1940" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1940" tag="operation_1940" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1941" tag="operation_1941" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1941" tag="operation_1941" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1942" tag="operation_1942" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1942" tag="operation_1942" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -46554,37 +46554,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1904" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clearOnMove;" >
+              <ccfdeclarationcodeblock parent_id="1904" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clearOnMove;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1905" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_clipImg;" >
+              <ccfdeclarationcodeblock parent_id="1905" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_clipImg;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1906" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_firstMove;" >
+              <ccfdeclarationcodeblock parent_id="1906" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_firstMove;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1907" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
+              <ccfdeclarationcodeblock parent_id="1907" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1908" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="1908" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1909" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_parent;" >
+              <ccfdeclarationcodeblock parent_id="1909" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_parent;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1910" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+              <ccfdeclarationcodeblock parent_id="1910" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -46618,72 +46618,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1904" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1904" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1904" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1904" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1905" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1905" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1905" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1905" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1906" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1906" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1906" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1906" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1907" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1907" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1907" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1907" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1908" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1908" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1908" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1908" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1909" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1909" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1909" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1909" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1910" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1910" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1910" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1910" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -46716,141 +46716,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisselection.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:50:04&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1904" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1904" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clearOnMove;" >
+       <ccfdeclarationcodeblock parent_id="1904" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clearOnMove;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1904" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1904" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1904" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1904" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1904" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1905" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1905" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_clipImg;" >
+       <ccfdeclarationcodeblock parent_id="1905" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_clipImg;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1905" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1905" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1905" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1905" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1905" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1906" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1906" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_firstMove;" >
+       <ccfdeclarationcodeblock parent_id="1906" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_firstMove;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1906" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1906" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1906" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1906" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1906" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1907" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1907" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
+       <ccfdeclarationcodeblock parent_id="1907" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisImageSP m_img;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1907" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1907" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1907" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1907" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1907" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1908" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1908" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="1908" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1908" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1908" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1908" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1908" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1908" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1909" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1909" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_parent;" >
+       <ccfdeclarationcodeblock parent_id="1909" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_parent;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1909" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1909" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1909" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1909" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1909" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1910" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1910" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+       <ccfdeclarationcodeblock parent_id="1910" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1910" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1910" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1910" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1910" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1910" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -46858,7 +46858,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1943" tqparent_class="1943" fileExt=".h" fileName="kisresourcemediator" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1943" parent_class="1943" fileExt=".h" fileName="kisresourcemediator" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISRESOURCEMEDIATOR_H&amp;#010;#define KISRESOURCEMEDIATOR_H" >
        <header>
@@ -46885,7 +46885,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1943" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1943" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisResourceMediator&amp;#010;" />
          </header>
@@ -46900,12 +46900,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2369" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2369" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2423" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2423" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -46945,52 +46945,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -47004,37 +47004,37 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1947" tag="operation_1947" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1955" tag="operation_1955" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1955" tag="operation_1955" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1956" tag="operation_1956" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1956" tag="operation_1956" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1957" tag="operation_1957" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1957" tag="operation_1957" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1959" tag="operation_1959" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1959" tag="operation_1959" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param item " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1961" tag="operation_1961" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1961" tag="operation_1961" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param item " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1963" tag="operation_1963" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1963" tag="operation_1963" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -47106,17 +47106,17 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1944" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoIconItem * m_activeItem;" >
+              <ccfdeclarationcodeblock parent_id="1944" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoIconItem * m_activeItem;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1945" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisItemChooser * m_chooser;" >
+              <ccfdeclarationcodeblock parent_id="1945" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisItemChooser * m_chooser;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1946" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QMap m_items;" >
+              <ccfdeclarationcodeblock parent_id="1946" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QMap m_items;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -47150,32 +47150,32 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1944" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1944" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1944" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1944" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1945" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1945" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1945" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1945" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1946" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1946" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1946" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1946" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -47208,131 +47208,131 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisresourcemediator.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>
-      <codeclassfield tqparent_id="1944" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1944" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1944" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoIconItem * m_activeItem;" >
+       <ccfdeclarationcodeblock parent_id="1944" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" KoIconItem * m_activeItem;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1944" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1944" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1944" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1944" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1944" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1945" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1945" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1945" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisItemChooser * m_chooser;" >
+       <ccfdeclarationcodeblock parent_id="1945" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" KisItemChooser * m_chooser;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1945" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1945" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1945" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1945" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1945" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1946" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1946" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1946" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QMap m_items;" >
+       <ccfdeclarationcodeblock parent_id="1946" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QMap m_items;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1946" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1946" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1946" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1946" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1946" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2369" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2369" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2369" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2369" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2423" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2423" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2423" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2423" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -47340,7 +47340,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1964" tqparent_class="1964" fileExt=".h" fileName="kisresourceserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1964" parent_class="1964" fileExt=".h" fileName="kisresourceserver" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISRESOURCESERVER_H&amp;#010;#define KISRESOURCESERVER_H" >
        <header>
@@ -47367,7 +47367,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1964" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1964" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisResourceServer&amp;#010;" />
          </header>
@@ -47424,57 +47424,57 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1971" tag="operation_1971" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1971" tag="operation_1971" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1972" tag="operation_1972" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1972" tag="operation_1972" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1973" tag="operation_1973" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1973" tag="operation_1973" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1975" tag="operation_1975" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1975" tag="operation_1975" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1977" tag="operation_1977" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1977" tag="operation_1977" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1979" tag="operation_1979" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1979" tag="operation_1979" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1980" tag="operation_1980" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1980" tag="operation_1980" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1981" tag="operation_1981" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1981" tag="operation_1981" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1982" tag="operation_1982" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1982" tag="operation_1982" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1983" tag="operation_1983" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1983" tag="operation_1983" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1984" tag="operation_1984" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1984" tag="operation_1984" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -47531,17 +47531,17 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1974" tag="operation_1974" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1974" tag="operation_1974" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1976" tag="operation_1976" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1976" tag="operation_1976" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1978" tag="operation_1978" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1978" tag="operation_1978" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -47562,32 +47562,32 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1965" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_brushFilenames;" >
+              <ccfdeclarationcodeblock parent_id="1965" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_brushFilenames;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1966" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
+              <ccfdeclarationcodeblock parent_id="1966" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1967" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_patternFilenames;" >
+              <ccfdeclarationcodeblock parent_id="1967" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_patternFilenames;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1968" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_patterns;" >
+              <ccfdeclarationcodeblock parent_id="1968" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_patterns;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1969" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_pipebrushFilenames;" >
+              <ccfdeclarationcodeblock parent_id="1969" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_pipebrushFilenames;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1970" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_pipebrushes;" >
+              <ccfdeclarationcodeblock parent_id="1970" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_pipebrushes;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -47621,62 +47621,62 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1965" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1965" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1965" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1965" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1966" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1966" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1966" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1966" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1967" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1967" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1967" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1967" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1968" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1968" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1968" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1968" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1969" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1969" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1969" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1969" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1970" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1970" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1970" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1970" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -47709,121 +47709,121 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisresourceserver.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>
-      <codeclassfield tqparent_id="1965" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1965" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1965" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_brushFilenames;" >
+       <ccfdeclarationcodeblock parent_id="1965" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_brushFilenames;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1965" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1965" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1965" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1965" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1965" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1966" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1966" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1966" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
+       <ccfdeclarationcodeblock parent_id="1966" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_brushes;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1966" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1966" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1966" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1966" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1966" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1967" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1967" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1967" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_patternFilenames;" >
+       <ccfdeclarationcodeblock parent_id="1967" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_patternFilenames;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1967" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1967" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1967" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1967" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1967" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1968" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1968" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1968" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_patterns;" >
+       <ccfdeclarationcodeblock parent_id="1968" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_patterns;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1968" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1968" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1968" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1968" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1968" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1969" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1969" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1969" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_pipebrushFilenames;" >
+       <ccfdeclarationcodeblock parent_id="1969" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QStringList m_pipebrushFilenames;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1969" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1969" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1969" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1969" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1969" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1970" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1970" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1970" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_pipebrushes;" >
+       <ccfdeclarationcodeblock parent_id="1970" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPtrList m_pipebrushes;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1970" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1970" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1970" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1970" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1970" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -47831,7 +47831,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1985" tqparent_class="1985" fileExt=".h" fileName="kispluginserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1985" parent_class="1985" fileExt=".h" fileName="kispluginserver" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPLUGINSERVER_H&amp;#010;#define KISPLUGINSERVER_H" >
        <header>
@@ -47858,7 +47858,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1985" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1985" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisPluginServer&amp;#010;" />
          </header>
@@ -47915,22 +47915,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1988" tag="operation_1988" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1988" tag="operation_1988" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1989" tag="operation_1989" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1989" tag="operation_1989" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1991" tag="operation_1991" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1991" tag="operation_1991" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param menu " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1995" tag="operation_1995" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1995" tag="operation_1995" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -47987,7 +47987,7 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1993" tag="operation_1993" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="1993" tag="operation_1993" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param directory " />
                  </header>
@@ -48008,12 +48008,12 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1986" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" int m_count;" >
+              <ccfdeclarationcodeblock parent_id="1986" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" int m_count;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1987" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" PluginInfoList m_plugins;" >
+              <ccfdeclarationcodeblock parent_id="1987" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" PluginInfoList m_plugins;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -48047,22 +48047,22 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1986" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1986" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1986" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1986" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1987" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1987" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1987" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1987" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -48095,41 +48095,41 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispluginserver.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>
-      <codeclassfield tqparent_id="1986" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1986" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1986" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" int m_count;" >
+       <ccfdeclarationcodeblock parent_id="1986" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" int m_count;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1986" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1986" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1986" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1986" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1986" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1987" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1987" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1987" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" PluginInfoList m_plugins;" >
+       <ccfdeclarationcodeblock parent_id="1987" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" PluginInfoList m_plugins;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1987" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1987" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1987" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1987" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1987" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -48137,7 +48137,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1996" tqparent_class="1996" fileExt=".h" fileName="kistilecommand" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1996" parent_class="1996" fileExt=".h" fileName="kistilecommand" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTILECOMMAND_H&amp;#010;#define KISTILECOMMAND_H" >
        <header>
@@ -48164,7 +48164,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1996" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="1996" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisTileCommand&amp;#010;" />
          </header>
@@ -48221,42 +48221,42 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2002" tag="operation_2002" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2002" tag="operation_2002" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@param device " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2005" tag="operation_2005" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2005" tag="operation_2005" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@param device &amp;#010;@param x &amp;#010;@param y &amp;#010;@param width &amp;#010;@param height " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2012" tag="operation_2012" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2012" tag="operation_2012" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@param device &amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2016" tag="operation_2016" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2016" tag="operation_2016" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tileNo &amp;#010;@param tile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2019" tag="operation_2019" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2019" tag="operation_2019" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2020" tag="operation_2020" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2020" tag="operation_2020" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2021" tag="operation_2021" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2021" tag="operation_2021" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2022" tag="operation_2022" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2022" tag="operation_2022" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -48328,27 +48328,27 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1997" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
+              <ccfdeclarationcodeblock parent_id="1997" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1998" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="1998" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1999" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_originals;" >
+              <ccfdeclarationcodeblock parent_id="1999" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_originals;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2000" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+              <ccfdeclarationcodeblock parent_id="2000" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2001" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_tiles;" >
+              <ccfdeclarationcodeblock parent_id="2001" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_tiles;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -48382,52 +48382,52 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1997" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1997" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1997" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1997" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1998" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1998" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1998" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1998" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1999" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="1999" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1999" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="1999" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2000" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2000" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2000" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2000" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2001" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2001" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2001" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2001" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -48460,101 +48460,101 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistilecommand.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:47:19&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1997" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1997" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1997" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
+       <ccfdeclarationcodeblock parent_id="1997" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" KisPaintDeviceSP m_device;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1997" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1997" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1997" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1997" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1997" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1998" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1998" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1998" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="1998" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1998" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1998" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1998" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1998" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1998" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1999" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1999" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1999" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_originals;" >
+       <ccfdeclarationcodeblock parent_id="1999" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_originals;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1999" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="1999" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1999" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="1999" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1999" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2000" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2000" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2000" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
+       <ccfdeclarationcodeblock parent_id="2000" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QRect m_rc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2000" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2000" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2000" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2000" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2000" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2001" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2001" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2001" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_tiles;" >
+       <ccfdeclarationcodeblock parent_id="2001" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" TileMap m_tiles;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2001" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2001" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2001" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2001" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2001" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -48562,7 +48562,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2023" tqparent_class="2023" fileExt=".h" fileName="plugininfo" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2023" parent_class="2023" fileExt=".h" fileName="plugininfo" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef PLUGININFO_H&amp;#010;#define PLUGININFO_H" >
        <header>
@@ -48589,7 +48589,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2023" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2023" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class PluginInfo&amp;#010;" />
          </header>
@@ -48646,47 +48646,47 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2031" tag="operation_2031" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2031" tag="operation_2031" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@param comment &amp;#010;@param dir &amp;#010;@param lib &amp;#010;@param category &amp;#010;@param type " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2038" tag="operation_2038" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2038" tag="operation_2038" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2039" tag="operation_2039" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2039" tag="operation_2039" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2040" tag="operation_2040" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2040" tag="operation_2040" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2041" tag="operation_2041" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2041" tag="operation_2041" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2042" tag="operation_2042" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2042" tag="operation_2042" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2043" tag="operation_2043" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2043" tag="operation_2043" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2044" tag="operation_2044" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2044" tag="operation_2044" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2046" tag="operation_2046" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2046" tag="operation_2046" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -48758,37 +48758,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2024" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_category;" >
+              <ccfdeclarationcodeblock parent_id="2024" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_category;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2025" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_comment;" >
+              <ccfdeclarationcodeblock parent_id="2025" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_comment;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2026" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_dir;" >
+              <ccfdeclarationcodeblock parent_id="2026" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_dir;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2027" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" int m_id;" >
+              <ccfdeclarationcodeblock parent_id="2027" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" int m_id;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2028" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_library;" >
+              <ccfdeclarationcodeblock parent_id="2028" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_library;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2029" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="2029" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2030" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" PluginType m_type;" >
+              <ccfdeclarationcodeblock parent_id="2030" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" PluginType m_type;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -48822,72 +48822,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2024" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2024" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2024" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2024" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2025" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2025" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2025" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2025" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2026" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2026" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2026" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2026" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2027" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2027" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2027" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2027" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2028" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2028" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2028" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2028" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2029" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2029" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2029" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2029" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2030" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2030" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2030" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2030" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -48920,141 +48920,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			plugininfo.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>
-      <codeclassfield tqparent_id="2024" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2024" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2024" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_category;" >
+       <ccfdeclarationcodeblock parent_id="2024" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_category;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2024" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2024" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2024" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2024" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2024" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2025" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2025" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2025" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_comment;" >
+       <ccfdeclarationcodeblock parent_id="2025" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_comment;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2025" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2025" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2025" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2025" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2025" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2026" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2026" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2026" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_dir;" >
+       <ccfdeclarationcodeblock parent_id="2026" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_dir;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2026" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2026" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2026" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2026" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2026" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2027" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2027" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2027" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" int m_id;" >
+       <ccfdeclarationcodeblock parent_id="2027" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" int m_id;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2027" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2027" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2027" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2027" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2027" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2028" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2028" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2028" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_library;" >
+       <ccfdeclarationcodeblock parent_id="2028" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_library;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2028" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2028" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2028" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2028" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2028" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2029" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2029" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2029" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="2029" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2029" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2029" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2029" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2029" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2029" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2030" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2030" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2030" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" PluginType m_type;" >
+       <ccfdeclarationcodeblock parent_id="2030" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" PluginType m_type;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2030" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2030" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2030" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2030" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2030" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -49062,7 +49062,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2047" tqparent_class="2047" fileExt=".h" fileName="kisresource" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2047" parent_class="2047" fileExt=".h" fileName="kisresource" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISRESOURCE_H&amp;#010;#define KISRESOURCE_H" >
        <header>
@@ -49089,7 +49089,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2047" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2047" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisResource&amp;#010;The KisResource class provides a representation of Chalk image resources.  This&amp;#010;includes, but not limited to, brushes and patterns.&amp;#010;&amp;#010;This replaces the KisKrayon facility that used to be present in Krayon." />
          </header>
@@ -49146,87 +49146,87 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2059" tag="operation_2059" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2059" tag="operation_2059" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Creates a new KisResource object using @p filename.  No file is opened&amp;#010;in the constructor, you have to call loadAsync.&amp;#010;&amp;#010;@param filename the file name to save and load from.&amp;#010;@param filename " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2061" tag="operation_2061" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2061" tag="operation_2061" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2062" tag="operation_2062" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2062" tag="operation_2062" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2063" tag="operation_2063" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2063" tag="operation_2063" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2064" tag="operation_2064" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2064" tag="operation_2064" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Returns a QImage representing this resource.  This image could be null." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2065" tag="operation_2065" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2065" tag="operation_2065" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Load this resource asynchronously.  The signal loadComplete is emitted when&amp;#010;the resource has been loaded and valid flag is set to true." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2066" tag="operation_2066" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2066" tag="operation_2066" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2067" tag="operation_2067" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2067" tag="operation_2067" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Save this resource asynchronously.  The signal saveComplete is emitted when&amp;#010;the resource has been saved." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2068" tag="operation_2068" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2068" tag="operation_2068" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dirt " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2070" tag="operation_2070" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2070" tag="operation_2070" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param filename " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2074" tag="operation_2074" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2074" tag="operation_2074" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2076" tag="operation_2076" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2076" tag="operation_2076" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param s " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2078" tag="operation_2078" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2078" tag="operation_2078" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param valid " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2082" tag="operation_2082" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2082" tag="operation_2082" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2083" tag="operation_2083" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2083" tag="operation_2083" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2084" tag="operation_2084" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2084" tag="operation_2084" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2085" tag="operation_2085" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2085" tag="operation_2085" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Creates a new KisResource object using @p filename.  No file is opened&amp;#010;in the constructor, you have to call loadAsync.&amp;#010;&amp;#010;@param filename the file name to save and load from." />
                  </header>
@@ -49283,22 +49283,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2055" tag="operation_2055" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2055" tag="operation_2055" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2057" tag="operation_2057" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2057" tag="operation_2057" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2072" tag="operation_2072" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2072" tag="operation_2072" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2080" tag="operation_2080" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2080" tag="operation_2080" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w " />
                  </header>
@@ -49319,37 +49319,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2048" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
+              <ccfdeclarationcodeblock parent_id="2048" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2049" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_filename;" >
+              <ccfdeclarationcodeblock parent_id="2049" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_filename;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2050" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+              <ccfdeclarationcodeblock parent_id="2050" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2051" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+              <ccfdeclarationcodeblock parent_id="2051" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2052" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_spacing;" >
+              <ccfdeclarationcodeblock parent_id="2052" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_spacing;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2053" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
+              <ccfdeclarationcodeblock parent_id="2053" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2054" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+              <ccfdeclarationcodeblock parent_id="2054" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -49383,72 +49383,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2048" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2048" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2048" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2048" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2049" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2049" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2049" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2049" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2050" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2050" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2050" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2050" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2051" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2051" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2051" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2051" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2052" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2052" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2052" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2052" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2053" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2053" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2053" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2053" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2054" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2054" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2054" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2054" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -49481,141 +49481,141 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisresource.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>
-      <codeclassfield tqparent_id="2048" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2048" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2048" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
+       <ccfdeclarationcodeblock parent_id="2048" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_dirty;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2048" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2048" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2048" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2048" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2048" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2049" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2049" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2049" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_filename;" >
+       <ccfdeclarationcodeblock parent_id="2049" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_filename;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2049" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2049" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2049" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2049" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="2049" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2050" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2050" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2050" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="2050" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_height;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2050" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2050" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2050" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2050" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="2050" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2051" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2051" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2051" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="2051" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QString m_name;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2051" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2051" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2051" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2051" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2051" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2052" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2052" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2052" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_spacing;" >
+       <ccfdeclarationcodeblock parent_id="2052" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_spacing;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2052" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2052" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2052" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2052" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2052" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2053" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2053" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2053" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
+       <ccfdeclarationcodeblock parent_id="2053" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2053" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2053" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2053" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2053" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2053" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2054" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2054" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2054" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="2054" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_width;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2054" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2054" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2054" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2054" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2054" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -49623,7 +49623,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2086" tqparent_class="2086" fileExt=".h" fileName="kisrenderinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2086" parent_class="2086" fileExt=".h" fileName="kisrenderinterface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISRENDERINTERFACE_H&amp;#010;#define KISRENDERINTERFACE_H" >
        <header>
@@ -49650,7 +49650,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2086" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2086" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisRenderInterface&amp;#010;" />
          </header>
@@ -49707,57 +49707,57 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2087" tag="operation_2087" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2087" tag="operation_2087" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2089" tag="operation_2089" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2089" tag="operation_2089" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2090" tag="operation_2090" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2090" tag="operation_2090" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2092" tag="operation_2092" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2092" tag="operation_2092" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2093" tag="operation_2093" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2093" tag="operation_2093" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tileno " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2095" tag="operation_2095" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2095" tag="operation_2095" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2100" tag="operation_2100" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2100" tag="operation_2100" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2102" tag="operation_2102" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2102" tag="operation_2102" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xpix &amp;#010;@param ypix " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2105" tag="operation_2105" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2105" tag="operation_2105" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2106" tag="operation_2106" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2106" tag="operation_2106" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tileno " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2108" tag="operation_2108" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2108" tag="operation_2108" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -49885,7 +49885,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2109" tqparent_class="2109" fileExt=".h" fileName="kispattern" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2109" parent_class="2109" fileExt=".h" fileName="kispattern" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPATTERN_H&amp;#010;#define KISPATTERN_H" >
        <header>
@@ -49912,7 +49912,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2109" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2109" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisPattern&amp;#010;" />
          </header>
@@ -49927,7 +49927,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2422" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2422" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -49967,27 +49967,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -50001,47 +50001,47 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2117" tag="operation_2117" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2117" tag="operation_2117" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param file " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2119" tag="operation_2119" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2119" tag="operation_2119" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2120" tag="operation_2120" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2120" tag="operation_2120" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2121" tag="operation_2121" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2121" tag="operation_2121" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2122" tag="operation_2122" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2122" tag="operation_2122" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2123" tag="operation_2123" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2123" tag="operation_2123" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2124" tag="operation_2124" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2124" tag="operation_2124" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2125" tag="operation_2125" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2125" tag="operation_2125" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2126" tag="operation_2126" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2126" tag="operation_2126" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -50113,37 +50113,37 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2110" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QByteArray m_data;" >
+              <ccfdeclarationcodeblock parent_id="2110" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QByteArray m_data;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2111" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+              <ccfdeclarationcodeblock parent_id="2111" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2112" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
+              <ccfdeclarationcodeblock parent_id="2112" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2113" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_pixmap;" >
+              <ccfdeclarationcodeblock parent_id="2113" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_pixmap;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2114" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_thumbPixmap;" >
+              <ccfdeclarationcodeblock parent_id="2114" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_thumbPixmap;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2115" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
+              <ccfdeclarationcodeblock parent_id="2115" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2116" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_validThumb;" >
+              <ccfdeclarationcodeblock parent_id="2116" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_validThumb;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -50177,72 +50177,72 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2110" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2110" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2110" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2110" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2111" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2111" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2111" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2111" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2112" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2112" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2112" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2112" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2113" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2113" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2113" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2113" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2114" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2114" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2114" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2114" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2115" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2115" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2115" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2115" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2116" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2116" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2116" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2116" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -50275,176 +50275,176 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kispattern.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>
-      <codeclassfield tqparent_id="2110" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2110" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2110" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QByteArray m_data;" >
+       <ccfdeclarationcodeblock parent_id="2110" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" QByteArray m_data;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2110" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2110" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2110" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2110" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2110" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2111" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2111" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
+       <ccfdeclarationcodeblock parent_id="2111" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_hotSpot;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2111" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2111" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2111" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2111" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="2111" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2112" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2112" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
+       <ccfdeclarationcodeblock parent_id="2112" tag="tblock_3" canDelete="false" indentLevel="1" role_id="-1" text=" QImage m_img;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2112" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2112" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2112" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2112" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="2112" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2113" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2113" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_pixmap;" >
+       <ccfdeclarationcodeblock parent_id="2113" tag="tblock_4" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_pixmap;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2113" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2113" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2113" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2113" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="2113" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2114" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2114" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_thumbPixmap;" >
+       <ccfdeclarationcodeblock parent_id="2114" tag="tblock_5" canDelete="false" indentLevel="1" role_id="-1" text=" QPixmap * m_thumbPixmap;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2114" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2114" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2114" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2114" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="2114" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2115" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2115" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2115" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
+       <ccfdeclarationcodeblock parent_id="2115" tag="tblock_6" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_valid;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2115" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2115" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2115" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2115" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="2115" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2116" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2116" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2116" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_validThumb;" >
+       <ccfdeclarationcodeblock parent_id="2116" tag="tblock_7" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_validThumb;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2116" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2116" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2116" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2116" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="2116" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2422" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2422" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2422" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2422" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -50452,7 +50452,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2129" tqparent_class="2129" fileExt=".h" fileName="plugintype" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2129" parent_class="2129" fileExt=".h" fileName="plugintype" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef PLUGINTYPE_H&amp;#010;#define PLUGINTYPE_H" >
        <header>
@@ -50479,7 +50479,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2129" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2129" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class PluginType&amp;#010;" />
          </header>
@@ -50658,7 +50658,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2135" tqparent_class="2135" fileExt=".h" fileName="kistool" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2135" parent_class="2135" fileExt=".h" fileName="kistool" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTOOL_H&amp;#010;#define KISTOOL_H" >
        <header>
@@ -50685,7 +50685,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2135" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2135" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisTool&amp;#010;" />
          </header>
@@ -50700,7 +50700,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2441" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2441" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -50740,27 +50740,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -50774,92 +50774,92 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2138" tag="operation_2138" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2138" tag="operation_2138" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2141" tag="operation_2141" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2141" tag="operation_2141" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2142" tag="operation_2142" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2142" tag="operation_2142" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2144" tag="operation_2144" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2144" tag="operation_2144" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2146" tag="operation_2146" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2146" tag="operation_2146" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2148" tag="operation_2148" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2148" tag="operation_2148" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2150" tag="operation_2150" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2150" tag="operation_2150" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2152" tag="operation_2152" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2152" tag="operation_2152" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2154" tag="operation_2154" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2154" tag="operation_2154" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2156" tag="operation_2156" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2156" tag="operation_2156" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2158" tag="operation_2158" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2158" tag="operation_2158" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2160" tag="operation_2160" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2160" tag="operation_2160" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tqparent " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2162" tag="operation_2162" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2162" tag="operation_2162" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2164" tag="operation_2164" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2164" tag="operation_2164" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gc &amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2167" tag="operation_2167" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2167" tag="operation_2167" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param cursor " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2169" tag="operation_2169" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2169" tag="operation_2169" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param collection " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2171" tag="operation_2171" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2171" tag="operation_2171" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2173" tag="operation_2173" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2173" tag="operation_2173" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -50916,12 +50916,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2136" tag="operation_2136" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2136" tag="operation_2136" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2139" tag="operation_2139" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2139" tag="operation_2139" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -50997,36 +50997,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistool.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:19&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="2441" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2441" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2441" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2441" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -51034,7 +51034,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2174" tqparent_class="2174" fileExt=".h" fileName="kisundoadapter" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2174" parent_class="2174" fileExt=".h" fileName="kisundoadapter" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISUNDOADAPTER_H&amp;#010;#define KISUNDOADAPTER_H" >
        <header>
@@ -51061,7 +51061,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2174" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2174" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisUndoAdapter&amp;#010;" />
          </header>
@@ -51076,7 +51076,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2366" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+              <ccfdeclarationcodeblock parent_id="2366" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -51116,27 +51116,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+                  <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+                  <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+                  <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+                  <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+                  <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -51150,42 +51150,42 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2177" tag="operation_2177" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2177" tag="operation_2177" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2180" tag="operation_2180" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2180" tag="operation_2180" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param cmd " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2182" tag="operation_2182" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2182" tag="operation_2182" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param macroName " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2184" tag="operation_2184" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2184" tag="operation_2184" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2185" tag="operation_2185" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2185" tag="operation_2185" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2186" tag="operation_2186" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2186" tag="operation_2186" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param undo " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2188" tag="operation_2188" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2188" tag="operation_2188" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2189" tag="operation_2189" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2189" tag="operation_2189" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -51242,12 +51242,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2175" tag="operation_2175" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2175" tag="operation_2175" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2178" tag="operation_2178" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2178" tag="operation_2178" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -51323,36 +51323,36 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisundoadapter.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:19&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="2366" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2366" field_type="3" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2366" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
+       <ccfdeclarationcodeblock parent_id="2366" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisView ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -51360,7 +51360,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2190" tqparent_class="2190" fileExt=".h" fileName="kistoolfactory" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2190" parent_class="2190" fileExt=".h" fileName="kistoolfactory" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTOOLFACTORY_H&amp;#010;#define KISTOOLFACTORY_H" >
        <header>
@@ -51387,7 +51387,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2190" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2190" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisToolFactory&amp;#010;" />
          </header>
@@ -51402,7 +51402,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2191" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisToolFactory m_singleton;" >
+              <ccfdeclarationcodeblock parent_id="2191" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisToolFactory m_singleton;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -51442,27 +51442,27 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2191" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2191" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2191" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2191" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -51476,22 +51476,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2195" tag="operation_2195" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2195" tag="operation_2195" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2198" tag="operation_2198" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2198" tag="operation_2198" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param actionCollection &amp;#010;@param subject " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2201" tag="operation_2201" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2201" tag="operation_2201" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2202" tag="operation_2202" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2202" tag="operation_2202" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -51548,12 +51548,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2193" tag="operation_2193" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2193" tag="operation_2193" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2196" tag="operation_2196" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2196" tag="operation_2196" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -51574,7 +51574,7 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2192" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTool m_tools;" >
+              <ccfdeclarationcodeblock parent_id="2192" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTool m_tools;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -51608,12 +51608,12 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2192" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2192" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2192" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2192" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -51646,91 +51646,91 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kistoolfactory.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:19&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="2192" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2192" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2192" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTool m_tools;" >
+       <ccfdeclarationcodeblock parent_id="2192" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" vKisTool m_tools;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2192" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2192" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2192" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2192" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="2192" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2191" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2191" field_type="1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2191" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisToolFactory m_singleton;" >
+       <ccfdeclarationcodeblock parent_id="2191" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisToolFactory m_singleton;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2191" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2191" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2191" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2191" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2191" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2191" field_type="1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2191" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisToolFactory ;" >
+       <ccfdeclarationcodeblock parent_id="2191" tag="tblock_1" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text=" KisToolFactory ;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2191" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="0" parent_id="2191" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2191" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="1" parent_id="2191" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="2" parent_id="2191" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="3" parent_id="2191" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
+       <codeaccessormethod accessType="4" parent_id="2191" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2191" role_id="1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -51738,7 +51738,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2203" tqparent_class="2203" fileExt=".h" fileName="kistoolcontrollerinterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2203" parent_class="2203" fileExt=".h" fileName="kistoolcontrollerinterface" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISTOOLCONTROLLERINTERFACE_H&amp;#010;#define KISTOOLCONTROLLERINTERFACE_H" >
        <header>
@@ -51765,7 +51765,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2203" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2203" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisToolControllerInterface&amp;#010;" />
          </header>
@@ -51822,22 +51822,22 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2206" tag="operation_2206" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2206" tag="operation_2206" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2209" tag="operation_2209" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2209" tag="operation_2209" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2210" tag="operation_2210" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2210" tag="operation_2210" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tool " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2212" tag="operation_2212" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2212" tag="operation_2212" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -51894,12 +51894,12 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2204" tag="operation_2204" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2204" tag="operation_2204" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2207" tag="operation_2207" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2207" tag="operation_2207" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -51976,7 +51976,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2218" tqparent_class="2218" fileExt=".h" fileName="kisutil" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2218" parent_class="2218" fileExt=".h" fileName="kisutil" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISUTIL_H&amp;#010;#define KISUTIL_H" >
        <header>
@@ -52003,7 +52003,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2218" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2218" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisUtil&amp;#010;" />
          </header>
@@ -52060,32 +52060,32 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2219" tag="operation_2219" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2219" tag="operation_2219" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@param p " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2222" tag="operation_2222" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2222" tag="operation_2222" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param area " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2224" tag="operation_2224" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2224" tag="operation_2224" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2226" tag="operation_2226" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2226" tag="operation_2226" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2229" tag="operation_2229" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2229" tag="operation_2229" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param name " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2232" tag="operation_2232" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2232" tag="operation_2232" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param width &amp;#010;@param height " />
                  </header>
@@ -52213,7 +52213,7 @@ in the constructor, you have to call loadAsync.
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2236" tqparent_class="2236" fileExt=".h" fileName="kisvector" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2236" parent_class="2236" fileExt=".h" fileName="kisvector" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISVECTOR_H&amp;#010;#define KISVECTOR_H" >
        <header>
@@ -52240,7 +52240,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2236" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2236" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisVector&amp;#010;" />
          </header>
@@ -52297,187 +52297,187 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2240" tag="operation_2240" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2240" tag="operation_2240" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2243" tag="operation_2243" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2243" tag="operation_2243" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2246" tag="operation_2246" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2246" tag="operation_2246" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2249" tag="operation_2249" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2249" tag="operation_2249" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2252" tag="operation_2252" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2252" tag="operation_2252" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2255" tag="operation_2255" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2255" tag="operation_2255" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2258" tag="operation_2258" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2258" tag="operation_2258" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2261" tag="operation_2261" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2261" tag="operation_2261" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2263" tag="operation_2263" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2263" tag="operation_2263" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2265" tag="operation_2265" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2265" tag="operation_2265" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2267" tag="operation_2267" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2267" tag="operation_2267" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2270" tag="operation_2270" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2270" tag="operation_2270" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2272" tag="operation_2272" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2272" tag="operation_2272" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2274" tag="operation_2274" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2274" tag="operation_2274" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2277" tag="operation_2277" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2277" tag="operation_2277" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2279" tag="operation_2279" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2279" tag="operation_2279" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2282" tag="operation_2282" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2282" tag="operation_2282" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2285" tag="operation_2285" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2285" tag="operation_2285" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2288" tag="operation_2288" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2288" tag="operation_2288" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2290" tag="operation_2290" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2290" tag="operation_2290" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2292" tag="operation_2292" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2292" tag="operation_2292" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2294" tag="operation_2294" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2294" tag="operation_2294" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2297" tag="operation_2297" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2297" tag="operation_2297" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2298" tag="operation_2298" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2298" tag="operation_2298" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param z " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2302" tag="operation_2302" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2302" tag="operation_2302" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param z " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2306" tag="operation_2306" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2306" tag="operation_2306" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param z " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2310" tag="operation_2310" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2310" tag="operation_2310" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2312" tag="operation_2312" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2312" tag="operation_2312" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2314" tag="operation_2314" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2314" tag="operation_2314" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2315" tag="operation_2315" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2315" tag="operation_2315" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2316" tag="operation_2316" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2316" tag="operation_2316" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2317" tag="operation_2317" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2317" tag="operation_2317" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2319" tag="operation_2319" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2319" tag="operation_2319" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2321" tag="operation_2321" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2321" tag="operation_2321" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2323" tag="operation_2323" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2323" tag="operation_2323" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2324" tag="operation_2324" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2324" tag="operation_2324" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2325" tag="operation_2325" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2325" tag="operation_2325" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -52549,17 +52549,17 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2237" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" double m_x;" >
+              <ccfdeclarationcodeblock parent_id="2237" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" double m_x;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2238" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_y;" >
+              <ccfdeclarationcodeblock parent_id="2238" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_y;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2239" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double m_z;" >
+              <ccfdeclarationcodeblock parent_id="2239" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double m_z;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -52593,32 +52593,32 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2237" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2237" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2237" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2237" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2238" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2238" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2238" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2238" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2239" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2239" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2239" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2239" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -52651,61 +52651,61 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisvector.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:19&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="2237" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2237" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2237" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" double m_x;" >
+       <ccfdeclarationcodeblock parent_id="2237" tag="tblock_0" canDelete="false" indentLevel="1" role_id="-1" text=" double m_x;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2237" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2237" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2237" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2237" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="2237" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2238" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_y;" >
+       <ccfdeclarationcodeblock parent_id="2238" tag="tblock_1" canDelete="false" indentLevel="1" role_id="-1" text=" double m_y;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2238" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2238" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2238" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2238" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="2238" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2239" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2239" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2239" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double m_z;" >
+       <ccfdeclarationcodeblock parent_id="2239" tag="tblock_2" canDelete="false" indentLevel="1" role_id="-1" text=" double m_z;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2239" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2239" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2239" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2239" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="2239" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -52713,7 +52713,7 @@ in the constructor, you have to call loadAsync.
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader2365" tqparent_class="2365" fileExt=".h" fileName="kisview" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader2365" parent_class="2365" fileExt=".h" fileName="kisview" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISVIEW_H&amp;#010;#define KISVIEW_H" >
        <header>
@@ -52740,7 +52740,7 @@ in the constructor, you have to call loadAsync.
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="2365" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
+        <cppheaderclassdeclarationblock parent_id="2365" tag="classDeclarationBlock" canDelete="false" role_id="-1" >
          <header>
           <cppcodecomment tag="" text="Class KisView&amp;#010;" />
          </header>
@@ -52755,47 +52755,47 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2366" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisUndoAdapter m_adapter;" >
+              <ccfdeclarationcodeblock parent_id="2366" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisUndoAdapter m_adapter;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2368" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
+              <ccfdeclarationcodeblock parent_id="2368" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2369" tag="tblock_2" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_brushMediator;" >
+              <ccfdeclarationcodeblock parent_id="2369" tag="tblock_2" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_brushMediator;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2382" tag="tblock_3" canDelete="false" indentLevel="1" role_id="0" text=" KisDoc m_doc;" >
+              <ccfdeclarationcodeblock parent_id="2382" tag="tblock_3" canDelete="false" indentLevel="1" role_id="0" text=" KisDoc m_doc;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2385" tag="tblock_4" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
+              <ccfdeclarationcodeblock parent_id="2385" tag="tblock_4" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2390" tag="tblock_5" canDelete="false" indentLevel="1" role_id="0" text=" KisBuilderMonitor m_imgBuilderMgr;" >
+              <ccfdeclarationcodeblock parent_id="2390" tag="tblock_5" canDelete="false" indentLevel="1" role_id="0" text=" KisBuilderMonitor m_imgBuilderMgr;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2422" tag="tblock_6" canDelete="false" indentLevel="1" role_id="0" text=" KisPattern m_pattern;" >
+              <ccfdeclarationcodeblock parent_id="2422" tag="tblock_6" canDelete="false" indentLevel="1" role_id="0" text=" KisPattern m_pattern;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2423" tag="tblock_7" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_patternMediator;" >
+              <ccfdeclarationcodeblock parent_id="2423" tag="tblock_7" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_patternMediator;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2441" tag="tblock_8" canDelete="false" indentLevel="1" role_id="0" text=" KisTool m_tool;" >
+              <ccfdeclarationcodeblock parent_id="2441" tag="tblock_8" canDelete="false" indentLevel="1" role_id="0" text=" KisTool m_tool;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -52835,227 +52835,227 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_83" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_83" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_84" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_84" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_85" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_85" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_88" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_88" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_89" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_89" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_90" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_90" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_93" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_93" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_94" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_94" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_95" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_95" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_98" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_98" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_99" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_99" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_100" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_100" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_101" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_101" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_103" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_103" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_104" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_104" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_105" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_105" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_106" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_106" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_107" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_107" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_108" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_108" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_109" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_109" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_110" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_110" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_111" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_111" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_112" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_112" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_113" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_113" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_114" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_114" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_115" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_115" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_116" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_116" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_117" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_117" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_118" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_118" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_119" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_119" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_120" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_120" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_121" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
+                  <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_121" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_122" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
+                  <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_122" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_123" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
+                  <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_123" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_124" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
+                  <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_124" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_125" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
+                  <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_125" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -53069,67 +53069,67 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2448" tag="operation_2448" canDelete="false" indentLevel="1" role_id="-1" >
+                <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 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2458" tag="operation_2458" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2458" tag="operation_2458" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2459" tag="operation_2459" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2459" tag="operation_2459" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2469" tag="operation_2469" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2469" tag="operation_2469" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2473" tag="operation_2473" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2473" tag="operation_2473" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2474" tag="operation_2474" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2474" tag="operation_2474" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2477" tag="operation_2477" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2477" tag="operation_2477" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param o &amp;#010;@param e " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2484" tag="operation_2484" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2484" tag="operation_2484" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param event " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2488" tag="operation_2488" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2488" tag="operation_2488" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param createLayer &amp;#010;@param modal &amp;#010;@param filename " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2498" tag="operation_2498" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2498" tag="operation_2498" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param printer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2517" tag="operation_2517" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2517" tag="operation_2517" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param printer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2536" tag="operation_2536" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2536" tag="operation_2536" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param readwrite " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2566" tag="operation_2566" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2566" tag="operation_2566" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -53186,297 +53186,297 @@ in the constructor, you have to call loadAsync.
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="2453" tag="operation_2453" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2453" tag="operation_2453" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param observer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2455" tag="operation_2455" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2455" tag="operation_2455" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2456" tag="operation_2456" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2456" tag="operation_2456" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2457" tag="operation_2457" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2457" tag="operation_2457" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2460" tag="operation_2460" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2460" tag="operation_2460" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2462" tag="operation_2462" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2462" tag="operation_2462" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2463" tag="operation_2463" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2463" tag="operation_2463" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2464" tag="operation_2464" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2464" tag="operation_2464" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2465" tag="operation_2465" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2465" tag="operation_2465" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2466" tag="operation_2466" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2466" tag="operation_2466" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2467" tag="operation_2467" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2467" tag="operation_2467" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2468" tag="operation_2468" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2468" tag="operation_2468" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2470" tag="operation_2470" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2470" tag="operation_2470" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param observer " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2472" tag="operation_2472" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2472" tag="operation_2472" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2475" tag="operation_2475" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2475" tag="operation_2475" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2476" tag="operation_2476" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2476" tag="operation_2476" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2480" tag="operation_2480" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2480" tag="operation_2480" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2481" tag="operation_2481" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2481" tag="operation_2481" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2486" tag="operation_2486" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2486" tag="operation_2486" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2487" tag="operation_2487" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2487" tag="operation_2487" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2492" tag="operation_2492" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2492" tag="operation_2492" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param enable " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2494" tag="operation_2494" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2494" tag="operation_2494" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2495" tag="operation_2495" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2495" tag="operation_2495" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2496" tag="operation_2496" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2496" tag="operation_2496" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2500" tag="operation_2500" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2500" tag="operation_2500" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2502" tag="operation_2502" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2502" tag="operation_2502" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param result " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2504" tag="operation_2504" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2504" tag="operation_2504" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2506" tag="operation_2506" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2506" tag="operation_2506" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param enable " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2508" tag="operation_2508" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2508" tag="operation_2508" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2510" tag="operation_2510" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2510" tag="operation_2510" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tool " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2512" tag="operation_2512" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2512" tag="operation_2512" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2514" tag="operation_2514" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2514" tag="operation_2514" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2515" tag="operation_2515" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2515" tag="operation_2515" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2516" tag="operation_2516" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2516" tag="operation_2516" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2519" tag="operation_2519" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2519" tag="operation_2519" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2520" tag="operation_2520" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2520" tag="operation_2520" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2521" tag="operation_2521" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2521" tag="operation_2521" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2522" tag="operation_2522" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2522" tag="operation_2522" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2523" tag="operation_2523" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2523" tag="operation_2523" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2524" tag="operation_2524" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2524" tag="operation_2524" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2525" tag="operation_2525" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2525" tag="operation_2525" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2526" tag="operation_2526" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2526" tag="operation_2526" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2527" tag="operation_2527" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2527" tag="operation_2527" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2528" tag="operation_2528" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2528" tag="operation_2528" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2533" tag="operation_2533" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2533" tag="operation_2533" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2535" tag="operation_2535" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2535" tag="operation_2535" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2538" tag="operation_2538" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2538" tag="operation_2538" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2539" tag="operation_2539" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2539" tag="operation_2539" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2542" tag="operation_2542" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2542" tag="operation_2542" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2544" tag="operation_2544" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2544" tag="operation_2544" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2546" tag="operation_2546" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2546" tag="operation_2546" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2549" tag="operation_2549" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2549" tag="operation_2549" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2551" tag="operation_2551" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2551" tag="operation_2551" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2553" tag="operation_2553" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2553" tag="operation_2553" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2554" tag="operation_2554" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2554" tag="operation_2554" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2555" tag="operation_2555" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2555" tag="operation_2555" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2558" tag="operation_2558" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2558" tag="operation_2558" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2559" tag="operation_2559" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2559" tag="operation_2559" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="2562" tag="operation_2562" canDelete="false" indentLevel="1" role_id="-1" >
+                <codeoperation parent_id="2562" tag="operation_2562" canDelete="false" indentLevel="1" role_id="-1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param zf " />
                  </header>
@@ -53497,367 +53497,367 @@ in the constructor, you have to call loadAsync.
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="2367" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_bg;" >
+              <ccfdeclarationcodeblock parent_id="2367" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_bg;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2370" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisLabelBuilderProgress * m_buildProgress;" >
+              <ccfdeclarationcodeblock parent_id="2370" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisLabelBuilderProgress * m_buildProgress;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2371" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvas * m_canvas;" >
+              <ccfdeclarationcodeblock parent_id="2371" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvas * m_canvas;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2372" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelView * m_channelView;" >
+              <ccfdeclarationcodeblock parent_id="2372" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelView * m_channelView;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2373" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clipboardHasImage;" >
+              <ccfdeclarationcodeblock parent_id="2373" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clipboardHasImage;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2374" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KisImageSP m_current;" >
+              <ccfdeclarationcodeblock parent_id="2374" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KisImageSP m_current;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2375" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisGuideSP m_currentGuide;" >
+              <ccfdeclarationcodeblock parent_id="2375" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisGuideSP m_currentGuide;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2376" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
+              <ccfdeclarationcodeblock parent_id="2376" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgBrushToggle;" >
+              <ccfdeclarationcodeblock parent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgBrushToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgChannelsToggle;" >
+              <ccfdeclarationcodeblock parent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgChannelsToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgColorsToggle;" >
+              <ccfdeclarationcodeblock parent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgColorsToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgLayersToggle;" >
+              <ccfdeclarationcodeblock parent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgLayersToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgPatternToggle;" >
+              <ccfdeclarationcodeblock parent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgPatternToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2383" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fg;" >
+              <ccfdeclarationcodeblock parent_id="2383" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fg;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_floatsidebarToggle;" >
+              <ccfdeclarationcodeblock parent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_floatsidebarToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2386" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_gradientChooser;" >
+              <ccfdeclarationcodeblock parent_id="2386" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_gradientChooser;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2387" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_hRuler;" >
+              <ccfdeclarationcodeblock parent_id="2387" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_hRuler;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2388" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_hScroll;" >
+              <ccfdeclarationcodeblock parent_id="2388" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_hScroll;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2389" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_imageChooser;" >
+              <ccfdeclarationcodeblock parent_id="2389" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_imageChooser;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgDup;" >
+              <ccfdeclarationcodeblock parent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgDup;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgExport;" >
+              <ccfdeclarationcodeblock parent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgExport;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgImport;" >
+              <ccfdeclarationcodeblock parent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgImport;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeAll;" >
+              <ccfdeclarationcodeblock parent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeAll;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeLinked;" >
+              <ccfdeclarationcodeblock parent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeLinked;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeVisible;" >
+              <ccfdeclarationcodeblock parent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeVisible;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResize;" >
+              <ccfdeclarationcodeblock parent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResize;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResizeToLayer;" >
+              <ccfdeclarationcodeblock parent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResizeToLayer;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgRm;" >
+              <ccfdeclarationcodeblock parent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgRm;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgScan;" >
+              <ccfdeclarationcodeblock parent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgScan;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2401" tag="tblock_38" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_lastGuidePoint;" >
+              <ccfdeclarationcodeblock parent_id="2401" tag="tblock_38" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_lastGuidePoint;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerAdd;" >
+              <ccfdeclarationcodeblock parent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerAdd;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerBottom;" >
+              <ccfdeclarationcodeblock parent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerBottom;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2404" tag="tblock_41" canDelete="false" indentLevel="1" role_id="-1" text=" KisListBox * m_layerBox;" >
+              <ccfdeclarationcodeblock parent_id="2404" tag="tblock_41" canDelete="false" indentLevel="1" role_id="-1" text=" KisListBox * m_layerBox;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerDup;" >
+              <ccfdeclarationcodeblock parent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerDup;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerHide;" >
+              <ccfdeclarationcodeblock parent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerHide;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLink;" >
+              <ccfdeclarationcodeblock parent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLink;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLower;" >
+              <ccfdeclarationcodeblock parent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLower;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerProperties;" >
+              <ccfdeclarationcodeblock parent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerProperties;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRaise;" >
+              <ccfdeclarationcodeblock parent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRaise;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResize;" >
+              <ccfdeclarationcodeblock parent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResize;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResizeToImage;" >
+              <ccfdeclarationcodeblock parent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResizeToImage;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRm;" >
+              <ccfdeclarationcodeblock parent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRm;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerSaveAs;" >
+              <ccfdeclarationcodeblock parent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerSaveAs;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerScale;" >
+              <ccfdeclarationcodeblock parent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerScale;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerToImage;" >
+              <ccfdeclarationcodeblock parent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerToImage;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerTop;" >
+              <ccfdeclarationcodeblock parent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerTop;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_lsidebarToggle;" >
+              <ccfdeclarationcodeblock parent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_lsidebarToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2419" tag="tblock_56" canDelete="false" indentLevel="1" role_id="-1" text=" vKisCanvasObserver m_observers;" >
+              <ccfdeclarationcodeblock parent_id="2419" tag="tblock_56" canDelete="false" indentLevel="1" role_id="-1" text=" vKisCanvasObserver m_observers;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2420" tag="tblock_57" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_paletteChooser;" >
+              <ccfdeclarationcodeblock parent_id="2420" tag="tblock_57" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_paletteChooser;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2421" tag="tblock_58" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_pathView;" >
+              <ccfdeclarationcodeblock parent_id="2421" tag="tblock_58" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_pathView;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCopy;" >
+              <ccfdeclarationcodeblock parent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCopy;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCrop;" >
+              <ccfdeclarationcodeblock parent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCrop;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCut;" >
+              <ccfdeclarationcodeblock parent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCut;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillBg;" >
+              <ccfdeclarationcodeblock parent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillBg;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillFg;" >
+              <ccfdeclarationcodeblock parent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillFg;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPaste;" >
+              <ccfdeclarationcodeblock parent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPaste;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPasteInto;" >
+              <ccfdeclarationcodeblock parent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPasteInto;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionRm;" >
+              <ccfdeclarationcodeblock parent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionRm;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectAll;" >
+              <ccfdeclarationcodeblock parent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectAll;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectNone;" >
+              <ccfdeclarationcodeblock parent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectNone;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2434" tag="tblock_69" canDelete="false" indentLevel="1" role_id="-1" text=" KisSideBar * m_sideBar;" >
+              <ccfdeclarationcodeblock parent_id="2434" tag="tblock_69" canDelete="false" indentLevel="1" role_id="-1" text=" KisSideBar * m_sideBar;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_sidebarToggle;" >
+              <ccfdeclarationcodeblock parent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_sidebarToggle;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2436" tag="tblock_71" canDelete="false" indentLevel="1" role_id="-1" text=" KoTabBar * m_tabBar;" >
+              <ccfdeclarationcodeblock parent_id="2436" tag="tblock_71" canDelete="false" indentLevel="1" role_id="-1" text=" KoTabBar * m_tabBar;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2437" tag="tblock_72" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabFirst;" >
+              <ccfdeclarationcodeblock parent_id="2437" tag="tblock_72" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabFirst;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2438" tag="tblock_73" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLast;" >
+              <ccfdeclarationcodeblock parent_id="2438" tag="tblock_73" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLast;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2439" tag="tblock_74" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLeft;" >
+              <ccfdeclarationcodeblock parent_id="2439" tag="tblock_74" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLeft;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2440" tag="tblock_75" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabRight;" >
+              <ccfdeclarationcodeblock parent_id="2440" tag="tblock_75" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabRight;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2442" tag="tblock_76" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_vRuler;" >
+              <ccfdeclarationcodeblock parent_id="2442" tag="tblock_76" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_vRuler;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2443" tag="tblock_77" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_vScroll;" >
+              <ccfdeclarationcodeblock parent_id="2443" tag="tblock_77" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_vScroll;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2444" tag="tblock_78" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_xoff;" >
+              <ccfdeclarationcodeblock parent_id="2444" tag="tblock_78" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_xoff;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2445" tag="tblock_79" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_yoff;" >
+              <ccfdeclarationcodeblock parent_id="2445" tag="tblock_79" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_yoff;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomIn;" >
+              <ccfdeclarationcodeblock parent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomIn;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomOut;" >
+              <ccfdeclarationcodeblock parent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomOut;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -53891,732 +53891,732 @@ in the constructor, you have to call loadAsync.
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="2367" tag="hblock_tag_126" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2367" tag="hblock_tag_126" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2367" tag="hblock_tag_127" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2367" tag="hblock_tag_127" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2370" tag="hblock_tag_128" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2370" tag="hblock_tag_128" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2370" tag="hblock_tag_129" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2370" tag="hblock_tag_129" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2371" tag="hblock_tag_130" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2371" tag="hblock_tag_130" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2371" tag="hblock_tag_131" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2371" tag="hblock_tag_131" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2372" tag="hblock_tag_132" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2372" tag="hblock_tag_132" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2372" tag="hblock_tag_133" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2372" tag="hblock_tag_133" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2373" tag="hblock_tag_134" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2373" tag="hblock_tag_134" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2373" tag="hblock_tag_135" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2373" tag="hblock_tag_135" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2374" tag="hblock_tag_136" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2374" tag="hblock_tag_136" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2374" tag="hblock_tag_137" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2374" tag="hblock_tag_137" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2375" tag="hblock_tag_138" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2375" tag="hblock_tag_138" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2375" tag="hblock_tag_139" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2375" tag="hblock_tag_139" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2376" tag="hblock_tag_140" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2376" tag="hblock_tag_140" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2376" tag="hblock_tag_141" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2376" tag="hblock_tag_141" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2377" tag="hblock_tag_142" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2377" tag="hblock_tag_142" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2377" tag="hblock_tag_143" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2377" tag="hblock_tag_143" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2378" tag="hblock_tag_144" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2378" tag="hblock_tag_144" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2378" tag="hblock_tag_145" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2378" tag="hblock_tag_145" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2379" tag="hblock_tag_146" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2379" tag="hblock_tag_146" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2379" tag="hblock_tag_147" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2379" tag="hblock_tag_147" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2380" tag="hblock_tag_148" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2380" tag="hblock_tag_148" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2380" tag="hblock_tag_149" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2380" tag="hblock_tag_149" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2381" tag="hblock_tag_150" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2381" tag="hblock_tag_150" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2381" tag="hblock_tag_151" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2381" tag="hblock_tag_151" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2383" tag="hblock_tag_152" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2383" tag="hblock_tag_152" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2383" tag="hblock_tag_153" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2383" tag="hblock_tag_153" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2384" tag="hblock_tag_154" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2384" tag="hblock_tag_154" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2384" tag="hblock_tag_155" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2384" tag="hblock_tag_155" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2386" tag="hblock_tag_156" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2386" tag="hblock_tag_156" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2386" tag="hblock_tag_157" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2386" tag="hblock_tag_157" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2387" tag="hblock_tag_158" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2387" tag="hblock_tag_158" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2387" tag="hblock_tag_159" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2387" tag="hblock_tag_159" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2388" tag="hblock_tag_160" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2388" tag="hblock_tag_160" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2388" tag="hblock_tag_161" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2388" tag="hblock_tag_161" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2389" tag="hblock_tag_162" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2389" tag="hblock_tag_162" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2389" tag="hblock_tag_163" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2389" tag="hblock_tag_163" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2391" tag="hblock_tag_164" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2391" tag="hblock_tag_164" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2391" tag="hblock_tag_165" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2391" tag="hblock_tag_165" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2392" tag="hblock_tag_166" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2392" tag="hblock_tag_166" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2392" tag="hblock_tag_167" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2392" tag="hblock_tag_167" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2393" tag="hblock_tag_168" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2393" tag="hblock_tag_168" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2393" tag="hblock_tag_169" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2393" tag="hblock_tag_169" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2394" tag="hblock_tag_170" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2394" tag="hblock_tag_170" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2394" tag="hblock_tag_171" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2394" tag="hblock_tag_171" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2395" tag="hblock_tag_172" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2395" tag="hblock_tag_172" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2395" tag="hblock_tag_173" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2395" tag="hblock_tag_173" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2396" tag="hblock_tag_174" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2396" tag="hblock_tag_174" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2396" tag="hblock_tag_175" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2396" tag="hblock_tag_175" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2397" tag="hblock_tag_176" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2397" tag="hblock_tag_176" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2397" tag="hblock_tag_177" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2397" tag="hblock_tag_177" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2398" tag="hblock_tag_178" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2398" tag="hblock_tag_178" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2398" tag="hblock_tag_179" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2398" tag="hblock_tag_179" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2399" tag="hblock_tag_180" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2399" tag="hblock_tag_180" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2399" tag="hblock_tag_181" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2399" tag="hblock_tag_181" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2400" tag="hblock_tag_182" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2400" tag="hblock_tag_182" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2400" tag="hblock_tag_183" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2400" tag="hblock_tag_183" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2401" tag="hblock_tag_184" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2401" tag="hblock_tag_184" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2401" tag="hblock_tag_185" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2401" tag="hblock_tag_185" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2402" tag="hblock_tag_186" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2402" tag="hblock_tag_186" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2402" tag="hblock_tag_187" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2402" tag="hblock_tag_187" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2403" tag="hblock_tag_188" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2403" tag="hblock_tag_188" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2403" tag="hblock_tag_189" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2403" tag="hblock_tag_189" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2404" tag="hblock_tag_190" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2404" tag="hblock_tag_190" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2404" tag="hblock_tag_191" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2404" tag="hblock_tag_191" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2405" tag="hblock_tag_192" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2405" tag="hblock_tag_192" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2405" tag="hblock_tag_193" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2405" tag="hblock_tag_193" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2406" tag="hblock_tag_194" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2406" tag="hblock_tag_194" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2406" tag="hblock_tag_195" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2406" tag="hblock_tag_195" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2407" tag="hblock_tag_196" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2407" tag="hblock_tag_196" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2407" tag="hblock_tag_197" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2407" tag="hblock_tag_197" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2408" tag="hblock_tag_198" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2408" tag="hblock_tag_198" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2408" tag="hblock_tag_199" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2408" tag="hblock_tag_199" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2409" tag="hblock_tag_200" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2409" tag="hblock_tag_200" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2409" tag="hblock_tag_201" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2409" tag="hblock_tag_201" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2410" tag="hblock_tag_202" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2410" tag="hblock_tag_202" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2410" tag="hblock_tag_203" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2410" tag="hblock_tag_203" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2411" tag="hblock_tag_204" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2411" tag="hblock_tag_204" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2411" tag="hblock_tag_205" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2411" tag="hblock_tag_205" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2412" tag="hblock_tag_206" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2412" tag="hblock_tag_206" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2412" tag="hblock_tag_207" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2412" tag="hblock_tag_207" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2413" tag="hblock_tag_208" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2413" tag="hblock_tag_208" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2413" tag="hblock_tag_209" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2413" tag="hblock_tag_209" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2414" tag="hblock_tag_210" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2414" tag="hblock_tag_210" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2414" tag="hblock_tag_211" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2414" tag="hblock_tag_211" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2415" tag="hblock_tag_212" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2415" tag="hblock_tag_212" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2415" tag="hblock_tag_213" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2415" tag="hblock_tag_213" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2416" tag="hblock_tag_214" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2416" tag="hblock_tag_214" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2416" tag="hblock_tag_215" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2416" tag="hblock_tag_215" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2417" tag="hblock_tag_216" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2417" tag="hblock_tag_216" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2417" tag="hblock_tag_217" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2417" tag="hblock_tag_217" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2418" tag="hblock_tag_218" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2418" tag="hblock_tag_218" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2418" tag="hblock_tag_219" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2418" tag="hblock_tag_219" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2419" tag="hblock_tag_220" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2419" tag="hblock_tag_220" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2419" tag="hblock_tag_221" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2419" tag="hblock_tag_221" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2420" tag="hblock_tag_222" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2420" tag="hblock_tag_222" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2420" tag="hblock_tag_223" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2420" tag="hblock_tag_223" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2421" tag="hblock_tag_224" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2421" tag="hblock_tag_224" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2421" tag="hblock_tag_225" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2421" tag="hblock_tag_225" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2424" tag="hblock_tag_226" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2424" tag="hblock_tag_226" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2424" tag="hblock_tag_227" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2424" tag="hblock_tag_227" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2425" tag="hblock_tag_228" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2425" tag="hblock_tag_228" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2425" tag="hblock_tag_229" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2425" tag="hblock_tag_229" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2426" tag="hblock_tag_230" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2426" tag="hblock_tag_230" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2426" tag="hblock_tag_231" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2426" tag="hblock_tag_231" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2427" tag="hblock_tag_232" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2427" tag="hblock_tag_232" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2427" tag="hblock_tag_233" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2427" tag="hblock_tag_233" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2428" tag="hblock_tag_234" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2428" tag="hblock_tag_234" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2428" tag="hblock_tag_235" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2428" tag="hblock_tag_235" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2429" tag="hblock_tag_236" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2429" tag="hblock_tag_236" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2429" tag="hblock_tag_237" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2429" tag="hblock_tag_237" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2430" tag="hblock_tag_238" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2430" tag="hblock_tag_238" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2430" tag="hblock_tag_239" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2430" tag="hblock_tag_239" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2431" tag="hblock_tag_240" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2431" tag="hblock_tag_240" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2431" tag="hblock_tag_241" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2431" tag="hblock_tag_241" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2432" tag="hblock_tag_242" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2432" tag="hblock_tag_242" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2432" tag="hblock_tag_243" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2432" tag="hblock_tag_243" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2433" tag="hblock_tag_244" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2433" tag="hblock_tag_244" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2433" tag="hblock_tag_245" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2433" tag="hblock_tag_245" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2434" tag="hblock_tag_246" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2434" tag="hblock_tag_246" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2434" tag="hblock_tag_247" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2434" tag="hblock_tag_247" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2435" tag="hblock_tag_248" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2435" tag="hblock_tag_248" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2435" tag="hblock_tag_249" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2435" tag="hblock_tag_249" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2436" tag="hblock_tag_250" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2436" tag="hblock_tag_250" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2436" tag="hblock_tag_251" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2436" tag="hblock_tag_251" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2437" tag="hblock_tag_252" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2437" tag="hblock_tag_252" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2437" tag="hblock_tag_253" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2437" tag="hblock_tag_253" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2438" tag="hblock_tag_254" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2438" tag="hblock_tag_254" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2438" tag="hblock_tag_255" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2438" tag="hblock_tag_255" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2439" tag="hblock_tag_256" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2439" tag="hblock_tag_256" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2439" tag="hblock_tag_257" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2439" tag="hblock_tag_257" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2440" tag="hblock_tag_258" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2440" tag="hblock_tag_258" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2440" tag="hblock_tag_259" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2440" tag="hblock_tag_259" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2442" tag="hblock_tag_260" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2442" tag="hblock_tag_260" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2442" tag="hblock_tag_261" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2442" tag="hblock_tag_261" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2443" tag="hblock_tag_262" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2443" tag="hblock_tag_262" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2443" tag="hblock_tag_263" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2443" tag="hblock_tag_263" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2444" tag="hblock_tag_264" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2444" tag="hblock_tag_264" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2444" tag="hblock_tag_265" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2444" tag="hblock_tag_265" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2445" tag="hblock_tag_266" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2445" tag="hblock_tag_266" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2445" tag="hblock_tag_267" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2445" tag="hblock_tag_267" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2446" tag="hblock_tag_268" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2446" tag="hblock_tag_268" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2446" tag="hblock_tag_269" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2446" tag="hblock_tag_269" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="2447" tag="hblock_tag_270" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
+                  <codeaccessormethod accessType="0" parent_id="2447" tag="hblock_tag_270" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="2447" tag="hblock_tag_271" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
+                  <codeaccessormethod accessType="1" parent_id="2447" tag="hblock_tag_271" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -54649,1776 +54649,1776 @@ in the constructor, you have to call loadAsync.
       <codecomment tag="" text="/************************************************************************&amp;#010;  			kisview.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:19&amp;#010;The original location of this file is &amp;#010;**************************************************************************/&amp;#010;" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="2367" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2367" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2367" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_bg;" >
+       <ccfdeclarationcodeblock parent_id="2367" tag="tblock_9" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_bg;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2367" tag="hblock_tag_126" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2367" tag="hblock_tag_126" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2367" tag="hblock_tag_127" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2367" tag="hblock_tag_127" canDelete="false" indentLevel="1" classfield_id="2367" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2370" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2370" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2370" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisLabelBuilderProgress * m_buildProgress;" >
+       <ccfdeclarationcodeblock parent_id="2370" tag="tblock_10" canDelete="false" indentLevel="1" role_id="-1" text=" KisLabelBuilderProgress * m_buildProgress;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2370" tag="hblock_tag_128" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2370" tag="hblock_tag_128" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2370" tag="hblock_tag_129" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2370" tag="hblock_tag_129" canDelete="false" indentLevel="1" classfield_id="2370" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2371" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2371" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2371" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvas * m_canvas;" >
+       <ccfdeclarationcodeblock parent_id="2371" tag="tblock_11" canDelete="false" indentLevel="1" role_id="-1" text=" KisCanvas * m_canvas;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2371" tag="hblock_tag_130" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2371" tag="hblock_tag_130" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2371" tag="hblock_tag_131" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2371" tag="hblock_tag_131" canDelete="false" indentLevel="1" classfield_id="2371" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2372" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2372" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2372" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelView * m_channelView;" >
+       <ccfdeclarationcodeblock parent_id="2372" tag="tblock_12" canDelete="false" indentLevel="1" role_id="-1" text=" KisChannelView * m_channelView;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2372" tag="hblock_tag_132" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2372" tag="hblock_tag_132" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2372" tag="hblock_tag_133" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2372" tag="hblock_tag_133" canDelete="false" indentLevel="1" classfield_id="2372" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2373" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2373" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2373" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clipboardHasImage;" >
+       <ccfdeclarationcodeblock parent_id="2373" tag="tblock_13" canDelete="false" indentLevel="1" role_id="-1" text=" bool m_clipboardHasImage;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2373" tag="hblock_tag_134" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2373" tag="hblock_tag_134" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2373" tag="hblock_tag_135" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2373" tag="hblock_tag_135" canDelete="false" indentLevel="1" classfield_id="2373" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2374" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KisImageSP m_current;" >
+       <ccfdeclarationcodeblock parent_id="2374" tag="tblock_14" canDelete="false" indentLevel="1" role_id="-1" text=" mutable KisImageSP m_current;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2374" tag="hblock_tag_136" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2374" tag="hblock_tag_136" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2374" tag="hblock_tag_137" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2374" tag="hblock_tag_137" canDelete="false" indentLevel="1" classfield_id="2374" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2375" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisGuideSP m_currentGuide;" >
+       <ccfdeclarationcodeblock parent_id="2375" tag="tblock_15" canDelete="false" indentLevel="1" role_id="-1" text=" KisGuideSP m_currentGuide;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2375" tag="hblock_tag_138" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2375" tag="hblock_tag_138" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2375" tag="hblock_tag_139" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2375" tag="hblock_tag_139" canDelete="false" indentLevel="1" classfield_id="2375" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2376" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
+       <ccfdeclarationcodeblock parent_id="2376" tag="tblock_16" canDelete="false" indentLevel="1" role_id="-1" text=" DCOPObject * m_dcop;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2376" tag="hblock_tag_140" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2376" tag="hblock_tag_140" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2376" tag="hblock_tag_141" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2376" tag="hblock_tag_141" canDelete="false" indentLevel="1" classfield_id="2376" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgBrushToggle;" >
+       <ccfdeclarationcodeblock parent_id="2377" tag="tblock_17" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgBrushToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2377" tag="hblock_tag_142" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2377" tag="hblock_tag_142" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2377" tag="hblock_tag_143" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2377" tag="hblock_tag_143" canDelete="false" indentLevel="1" classfield_id="2377" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2378" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2378" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgChannelsToggle;" >
+       <ccfdeclarationcodeblock parent_id="2378" tag="tblock_18" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgChannelsToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2378" tag="hblock_tag_144" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2378" tag="hblock_tag_144" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2378" tag="hblock_tag_145" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2378" tag="hblock_tag_145" canDelete="false" indentLevel="1" classfield_id="2378" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2379" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2379" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgColorsToggle;" >
+       <ccfdeclarationcodeblock parent_id="2379" tag="tblock_19" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgColorsToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2379" tag="hblock_tag_146" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2379" tag="hblock_tag_146" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2379" tag="hblock_tag_147" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2379" tag="hblock_tag_147" canDelete="false" indentLevel="1" classfield_id="2379" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2380" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2380" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgLayersToggle;" >
+       <ccfdeclarationcodeblock parent_id="2380" tag="tblock_20" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgLayersToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2380" tag="hblock_tag_148" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2380" tag="hblock_tag_148" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2380" tag="hblock_tag_149" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2380" tag="hblock_tag_149" canDelete="false" indentLevel="1" classfield_id="2380" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgPatternToggle;" >
+       <ccfdeclarationcodeblock parent_id="2381" tag="tblock_21" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_dlgPatternToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2381" tag="hblock_tag_150" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2381" tag="hblock_tag_150" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2381" tag="hblock_tag_151" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2381" tag="hblock_tag_151" canDelete="false" indentLevel="1" classfield_id="2381" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2383" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fg;" >
+       <ccfdeclarationcodeblock parent_id="2383" tag="tblock_22" canDelete="false" indentLevel="1" role_id="-1" text=" KoColor m_fg;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2383" tag="hblock_tag_152" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2383" tag="hblock_tag_152" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2383" tag="hblock_tag_153" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2383" tag="hblock_tag_153" canDelete="false" indentLevel="1" classfield_id="2383" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_floatsidebarToggle;" >
+       <ccfdeclarationcodeblock parent_id="2384" tag="tblock_23" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_floatsidebarToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2384" tag="hblock_tag_154" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2384" tag="hblock_tag_154" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2384" tag="hblock_tag_155" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2384" tag="hblock_tag_155" canDelete="false" indentLevel="1" classfield_id="2384" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2386" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2386" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2386" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_gradientChooser;" >
+       <ccfdeclarationcodeblock parent_id="2386" tag="tblock_24" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_gradientChooser;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2386" tag="hblock_tag_156" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2386" tag="hblock_tag_156" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2386" tag="hblock_tag_157" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2386" tag="hblock_tag_157" canDelete="false" indentLevel="1" classfield_id="2386" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2387" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2387" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2387" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_hRuler;" >
+       <ccfdeclarationcodeblock parent_id="2387" tag="tblock_25" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_hRuler;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2387" tag="hblock_tag_158" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2387" tag="hblock_tag_158" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2387" tag="hblock_tag_159" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2387" tag="hblock_tag_159" canDelete="false" indentLevel="1" classfield_id="2387" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2388" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2388" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2388" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_hScroll;" >
+       <ccfdeclarationcodeblock parent_id="2388" tag="tblock_26" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_hScroll;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2388" tag="hblock_tag_160" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2388" tag="hblock_tag_160" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2388" tag="hblock_tag_161" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2388" tag="hblock_tag_161" canDelete="false" indentLevel="1" classfield_id="2388" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2389" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2389" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2389" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_imageChooser;" >
+       <ccfdeclarationcodeblock parent_id="2389" tag="tblock_27" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_imageChooser;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2389" tag="hblock_tag_162" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2389" tag="hblock_tag_162" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2389" tag="hblock_tag_163" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2389" tag="hblock_tag_163" canDelete="false" indentLevel="1" classfield_id="2389" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2391" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2391" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgDup;" >
+       <ccfdeclarationcodeblock parent_id="2391" tag="tblock_28" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgDup;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2391" tag="hblock_tag_164" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2391" tag="hblock_tag_164" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2391" tag="hblock_tag_165" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2391" tag="hblock_tag_165" canDelete="false" indentLevel="1" classfield_id="2391" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2392" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2392" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgExport;" >
+       <ccfdeclarationcodeblock parent_id="2392" tag="tblock_29" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgExport;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2392" tag="hblock_tag_166" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2392" tag="hblock_tag_166" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2392" tag="hblock_tag_167" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2392" tag="hblock_tag_167" canDelete="false" indentLevel="1" classfield_id="2392" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2393" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2393" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgImport;" >
+       <ccfdeclarationcodeblock parent_id="2393" tag="tblock_30" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgImport;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2393" tag="hblock_tag_168" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2393" tag="hblock_tag_168" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2393" tag="hblock_tag_169" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2393" tag="hblock_tag_169" canDelete="false" indentLevel="1" classfield_id="2393" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2394" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2394" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeAll;" >
+       <ccfdeclarationcodeblock parent_id="2394" tag="tblock_31" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeAll;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2394" tag="hblock_tag_170" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2394" tag="hblock_tag_170" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2394" tag="hblock_tag_171" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2394" tag="hblock_tag_171" canDelete="false" indentLevel="1" classfield_id="2394" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2395" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2395" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeLinked;" >
+       <ccfdeclarationcodeblock parent_id="2395" tag="tblock_32" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeLinked;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2395" tag="hblock_tag_172" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2395" tag="hblock_tag_172" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2395" tag="hblock_tag_173" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2395" tag="hblock_tag_173" canDelete="false" indentLevel="1" classfield_id="2395" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2396" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2396" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeVisible;" >
+       <ccfdeclarationcodeblock parent_id="2396" tag="tblock_33" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgMergeVisible;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2396" tag="hblock_tag_174" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2396" tag="hblock_tag_174" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2396" tag="hblock_tag_175" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2396" tag="hblock_tag_175" canDelete="false" indentLevel="1" classfield_id="2396" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2397" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2397" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResize;" >
+       <ccfdeclarationcodeblock parent_id="2397" tag="tblock_34" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResize;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2397" tag="hblock_tag_176" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2397" tag="hblock_tag_176" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2397" tag="hblock_tag_177" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2397" tag="hblock_tag_177" canDelete="false" indentLevel="1" classfield_id="2397" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2398" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2398" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResizeToLayer;" >
+       <ccfdeclarationcodeblock parent_id="2398" tag="tblock_35" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgResizeToLayer;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2398" tag="hblock_tag_178" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2398" tag="hblock_tag_178" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2398" tag="hblock_tag_179" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2398" tag="hblock_tag_179" canDelete="false" indentLevel="1" classfield_id="2398" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2399" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2399" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgRm;" >
+       <ccfdeclarationcodeblock parent_id="2399" tag="tblock_36" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgRm;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2399" tag="hblock_tag_180" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2399" tag="hblock_tag_180" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2399" tag="hblock_tag_181" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2399" tag="hblock_tag_181" canDelete="false" indentLevel="1" classfield_id="2399" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2400" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2400" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgScan;" >
+       <ccfdeclarationcodeblock parent_id="2400" tag="tblock_37" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_imgScan;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2400" tag="hblock_tag_182" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2400" tag="hblock_tag_182" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2400" tag="hblock_tag_183" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2400" tag="hblock_tag_183" canDelete="false" indentLevel="1" classfield_id="2400" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2401" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2401" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2401" tag="tblock_38" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_lastGuidePoint;" >
+       <ccfdeclarationcodeblock parent_id="2401" tag="tblock_38" canDelete="false" indentLevel="1" role_id="-1" text=" QPoint m_lastGuidePoint;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2401" tag="hblock_tag_184" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2401" tag="hblock_tag_184" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2401" tag="hblock_tag_185" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2401" tag="hblock_tag_185" canDelete="false" indentLevel="1" classfield_id="2401" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2402" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2402" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerAdd;" >
+       <ccfdeclarationcodeblock parent_id="2402" tag="tblock_39" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerAdd;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2402" tag="hblock_tag_186" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2402" tag="hblock_tag_186" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2402" tag="hblock_tag_187" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2402" tag="hblock_tag_187" canDelete="false" indentLevel="1" classfield_id="2402" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2403" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2403" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerBottom;" >
+       <ccfdeclarationcodeblock parent_id="2403" tag="tblock_40" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerBottom;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2403" tag="hblock_tag_188" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2403" tag="hblock_tag_188" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2403" tag="hblock_tag_189" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2403" tag="hblock_tag_189" canDelete="false" indentLevel="1" classfield_id="2403" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2404" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2404" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2404" tag="tblock_41" canDelete="false" indentLevel="1" role_id="-1" text=" KisListBox * m_layerBox;" >
+       <ccfdeclarationcodeblock parent_id="2404" tag="tblock_41" canDelete="false" indentLevel="1" role_id="-1" text=" KisListBox * m_layerBox;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2404" tag="hblock_tag_190" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2404" tag="hblock_tag_190" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2404" tag="hblock_tag_191" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2404" tag="hblock_tag_191" canDelete="false" indentLevel="1" classfield_id="2404" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2405" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2405" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerDup;" >
+       <ccfdeclarationcodeblock parent_id="2405" tag="tblock_42" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerDup;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2405" tag="hblock_tag_192" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2405" tag="hblock_tag_192" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2405" tag="hblock_tag_193" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2405" tag="hblock_tag_193" canDelete="false" indentLevel="1" classfield_id="2405" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2406" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2406" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerHide;" >
+       <ccfdeclarationcodeblock parent_id="2406" tag="tblock_43" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerHide;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2406" tag="hblock_tag_194" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2406" tag="hblock_tag_194" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2406" tag="hblock_tag_195" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2406" tag="hblock_tag_195" canDelete="false" indentLevel="1" classfield_id="2406" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2407" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2407" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLink;" >
+       <ccfdeclarationcodeblock parent_id="2407" tag="tblock_44" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLink;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2407" tag="hblock_tag_196" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2407" tag="hblock_tag_196" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2407" tag="hblock_tag_197" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2407" tag="hblock_tag_197" canDelete="false" indentLevel="1" classfield_id="2407" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2408" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2408" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLower;" >
+       <ccfdeclarationcodeblock parent_id="2408" tag="tblock_45" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerLower;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2408" tag="hblock_tag_198" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2408" tag="hblock_tag_198" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2408" tag="hblock_tag_199" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2408" tag="hblock_tag_199" canDelete="false" indentLevel="1" classfield_id="2408" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2409" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2409" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerProperties;" >
+       <ccfdeclarationcodeblock parent_id="2409" tag="tblock_46" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerProperties;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2409" tag="hblock_tag_200" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2409" tag="hblock_tag_200" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2409" tag="hblock_tag_201" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2409" tag="hblock_tag_201" canDelete="false" indentLevel="1" classfield_id="2409" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2410" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2410" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRaise;" >
+       <ccfdeclarationcodeblock parent_id="2410" tag="tblock_47" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRaise;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2410" tag="hblock_tag_202" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2410" tag="hblock_tag_202" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2410" tag="hblock_tag_203" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2410" tag="hblock_tag_203" canDelete="false" indentLevel="1" classfield_id="2410" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2411" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2411" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResize;" >
+       <ccfdeclarationcodeblock parent_id="2411" tag="tblock_48" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResize;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2411" tag="hblock_tag_204" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2411" tag="hblock_tag_204" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2411" tag="hblock_tag_205" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2411" tag="hblock_tag_205" canDelete="false" indentLevel="1" classfield_id="2411" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2412" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2412" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResizeToImage;" >
+       <ccfdeclarationcodeblock parent_id="2412" tag="tblock_49" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerResizeToImage;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2412" tag="hblock_tag_206" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2412" tag="hblock_tag_206" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2412" tag="hblock_tag_207" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2412" tag="hblock_tag_207" canDelete="false" indentLevel="1" classfield_id="2412" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2413" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2413" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRm;" >
+       <ccfdeclarationcodeblock parent_id="2413" tag="tblock_50" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerRm;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2413" tag="hblock_tag_208" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2413" tag="hblock_tag_208" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2413" tag="hblock_tag_209" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2413" tag="hblock_tag_209" canDelete="false" indentLevel="1" classfield_id="2413" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2414" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2414" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerSaveAs;" >
+       <ccfdeclarationcodeblock parent_id="2414" tag="tblock_51" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerSaveAs;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2414" tag="hblock_tag_210" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2414" tag="hblock_tag_210" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2414" tag="hblock_tag_211" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2414" tag="hblock_tag_211" canDelete="false" indentLevel="1" classfield_id="2414" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2415" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2415" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerScale;" >
+       <ccfdeclarationcodeblock parent_id="2415" tag="tblock_52" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerScale;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2415" tag="hblock_tag_212" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2415" tag="hblock_tag_212" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2415" tag="hblock_tag_213" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2415" tag="hblock_tag_213" canDelete="false" indentLevel="1" classfield_id="2415" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2416" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2416" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerToImage;" >
+       <ccfdeclarationcodeblock parent_id="2416" tag="tblock_53" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerToImage;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2416" tag="hblock_tag_214" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2416" tag="hblock_tag_214" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2416" tag="hblock_tag_215" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2416" tag="hblock_tag_215" canDelete="false" indentLevel="1" classfield_id="2416" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2417" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2417" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerTop;" >
+       <ccfdeclarationcodeblock parent_id="2417" tag="tblock_54" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_layerTop;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2417" tag="hblock_tag_216" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2417" tag="hblock_tag_216" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2417" tag="hblock_tag_217" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2417" tag="hblock_tag_217" canDelete="false" indentLevel="1" classfield_id="2417" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2418" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2418" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_lsidebarToggle;" >
+       <ccfdeclarationcodeblock parent_id="2418" tag="tblock_55" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_lsidebarToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2418" tag="hblock_tag_218" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2418" tag="hblock_tag_218" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2418" tag="hblock_tag_219" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2418" tag="hblock_tag_219" canDelete="false" indentLevel="1" classfield_id="2418" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2419" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2419" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2419" tag="tblock_56" canDelete="false" indentLevel="1" role_id="-1" text=" vKisCanvasObserver m_observers;" >
+       <ccfdeclarationcodeblock parent_id="2419" tag="tblock_56" canDelete="false" indentLevel="1" role_id="-1" text=" vKisCanvasObserver m_observers;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2419" tag="hblock_tag_220" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2419" tag="hblock_tag_220" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2419" tag="hblock_tag_221" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2419" tag="hblock_tag_221" canDelete="false" indentLevel="1" classfield_id="2419" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2420" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2420" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2420" tag="tblock_57" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_paletteChooser;" >
+       <ccfdeclarationcodeblock parent_id="2420" tag="tblock_57" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_paletteChooser;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2420" tag="hblock_tag_222" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2420" tag="hblock_tag_222" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2420" tag="hblock_tag_223" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2420" tag="hblock_tag_223" canDelete="false" indentLevel="1" classfield_id="2420" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2421" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2421" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2421" tag="tblock_58" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_pathView;" >
+       <ccfdeclarationcodeblock parent_id="2421" tag="tblock_58" canDelete="false" indentLevel="1" role_id="-1" text=" QWidget * m_pathView;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2421" tag="hblock_tag_224" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2421" tag="hblock_tag_224" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2421" tag="hblock_tag_225" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2421" tag="hblock_tag_225" canDelete="false" indentLevel="1" classfield_id="2421" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2424" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2424" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCopy;" >
+       <ccfdeclarationcodeblock parent_id="2424" tag="tblock_59" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCopy;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2424" tag="hblock_tag_226" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2424" tag="hblock_tag_226" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2424" tag="hblock_tag_227" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2424" tag="hblock_tag_227" canDelete="false" indentLevel="1" classfield_id="2424" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2425" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2425" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCrop;" >
+       <ccfdeclarationcodeblock parent_id="2425" tag="tblock_60" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCrop;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2425" tag="hblock_tag_228" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2425" tag="hblock_tag_228" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2425" tag="hblock_tag_229" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2425" tag="hblock_tag_229" canDelete="false" indentLevel="1" classfield_id="2425" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2426" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2426" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCut;" >
+       <ccfdeclarationcodeblock parent_id="2426" tag="tblock_61" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionCut;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2426" tag="hblock_tag_230" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2426" tag="hblock_tag_230" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2426" tag="hblock_tag_231" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2426" tag="hblock_tag_231" canDelete="false" indentLevel="1" classfield_id="2426" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2427" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2427" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillBg;" >
+       <ccfdeclarationcodeblock parent_id="2427" tag="tblock_62" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillBg;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2427" tag="hblock_tag_232" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2427" tag="hblock_tag_232" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2427" tag="hblock_tag_233" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2427" tag="hblock_tag_233" canDelete="false" indentLevel="1" classfield_id="2427" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2428" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2428" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillFg;" >
+       <ccfdeclarationcodeblock parent_id="2428" tag="tblock_63" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionFillFg;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2428" tag="hblock_tag_234" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2428" tag="hblock_tag_234" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2428" tag="hblock_tag_235" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2428" tag="hblock_tag_235" canDelete="false" indentLevel="1" classfield_id="2428" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2429" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2429" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPaste;" >
+       <ccfdeclarationcodeblock parent_id="2429" tag="tblock_64" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPaste;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2429" tag="hblock_tag_236" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2429" tag="hblock_tag_236" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2429" tag="hblock_tag_237" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2429" tag="hblock_tag_237" canDelete="false" indentLevel="1" classfield_id="2429" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2430" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2430" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPasteInto;" >
+       <ccfdeclarationcodeblock parent_id="2430" tag="tblock_65" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionPasteInto;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2430" tag="hblock_tag_238" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2430" tag="hblock_tag_238" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2430" tag="hblock_tag_239" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2430" tag="hblock_tag_239" canDelete="false" indentLevel="1" classfield_id="2430" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2431" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2431" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionRm;" >
+       <ccfdeclarationcodeblock parent_id="2431" tag="tblock_66" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionRm;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2431" tag="hblock_tag_240" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2431" tag="hblock_tag_240" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2431" tag="hblock_tag_241" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2431" tag="hblock_tag_241" canDelete="false" indentLevel="1" classfield_id="2431" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2432" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2432" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectAll;" >
+       <ccfdeclarationcodeblock parent_id="2432" tag="tblock_67" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectAll;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2432" tag="hblock_tag_242" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2432" tag="hblock_tag_242" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2432" tag="hblock_tag_243" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2432" tag="hblock_tag_243" canDelete="false" indentLevel="1" classfield_id="2432" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2433" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectNone;" >
+       <ccfdeclarationcodeblock parent_id="2433" tag="tblock_68" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_selectionSelectNone;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2433" tag="hblock_tag_244" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2433" tag="hblock_tag_244" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2433" tag="hblock_tag_245" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2433" tag="hblock_tag_245" canDelete="false" indentLevel="1" classfield_id="2433" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2434" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2434" tag="tblock_69" canDelete="false" indentLevel="1" role_id="-1" text=" KisSideBar * m_sideBar;" >
+       <ccfdeclarationcodeblock parent_id="2434" tag="tblock_69" canDelete="false" indentLevel="1" role_id="-1" text=" KisSideBar * m_sideBar;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2434" tag="hblock_tag_246" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2434" tag="hblock_tag_246" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2434" tag="hblock_tag_247" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2434" tag="hblock_tag_247" canDelete="false" indentLevel="1" classfield_id="2434" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2435" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_sidebarToggle;" >
+       <ccfdeclarationcodeblock parent_id="2435" tag="tblock_70" canDelete="false" indentLevel="1" role_id="-1" text=" KToggleAction * m_sidebarToggle;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2435" tag="hblock_tag_248" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2435" tag="hblock_tag_248" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2435" tag="hblock_tag_249" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2435" tag="hblock_tag_249" canDelete="false" indentLevel="1" classfield_id="2435" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2436" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2436" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2436" tag="tblock_71" canDelete="false" indentLevel="1" role_id="-1" text=" KoTabBar * m_tabBar;" >
+       <ccfdeclarationcodeblock parent_id="2436" tag="tblock_71" canDelete="false" indentLevel="1" role_id="-1" text=" KoTabBar * m_tabBar;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2436" tag="hblock_tag_250" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2436" tag="hblock_tag_250" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2436" tag="hblock_tag_251" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2436" tag="hblock_tag_251" canDelete="false" indentLevel="1" classfield_id="2436" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2437" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2437" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2437" tag="tblock_72" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabFirst;" >
+       <ccfdeclarationcodeblock parent_id="2437" tag="tblock_72" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabFirst;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2437" tag="hblock_tag_252" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2437" tag="hblock_tag_252" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2437" tag="hblock_tag_253" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2437" tag="hblock_tag_253" canDelete="false" indentLevel="1" classfield_id="2437" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2438" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2438" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2438" tag="tblock_73" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLast;" >
+       <ccfdeclarationcodeblock parent_id="2438" tag="tblock_73" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLast;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2438" tag="hblock_tag_254" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2438" tag="hblock_tag_254" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2438" tag="hblock_tag_255" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2438" tag="hblock_tag_255" canDelete="false" indentLevel="1" classfield_id="2438" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2439" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2439" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2439" tag="tblock_74" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLeft;" >
+       <ccfdeclarationcodeblock parent_id="2439" tag="tblock_74" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabLeft;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2439" tag="hblock_tag_256" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2439" tag="hblock_tag_256" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2439" tag="hblock_tag_257" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2439" tag="hblock_tag_257" canDelete="false" indentLevel="1" classfield_id="2439" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2440" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2440" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2440" tag="tblock_75" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabRight;" >
+       <ccfdeclarationcodeblock parent_id="2440" tag="tblock_75" canDelete="false" indentLevel="1" role_id="-1" text=" QButton * m_tabRight;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2440" tag="hblock_tag_258" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2440" tag="hblock_tag_258" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2440" tag="hblock_tag_259" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2440" tag="hblock_tag_259" canDelete="false" indentLevel="1" classfield_id="2440" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2442" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2442" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2442" tag="tblock_76" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_vRuler;" >
+       <ccfdeclarationcodeblock parent_id="2442" tag="tblock_76" canDelete="false" indentLevel="1" role_id="-1" text=" KisRuler * m_vRuler;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2442" tag="hblock_tag_260" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2442" tag="hblock_tag_260" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2442" tag="hblock_tag_261" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2442" tag="hblock_tag_261" canDelete="false" indentLevel="1" classfield_id="2442" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2443" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2443" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2443" tag="tblock_77" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_vScroll;" >
+       <ccfdeclarationcodeblock parent_id="2443" tag="tblock_77" canDelete="false" indentLevel="1" role_id="-1" text=" QScrollBar * m_vScroll;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2443" tag="hblock_tag_262" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2443" tag="hblock_tag_262" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2443" tag="hblock_tag_263" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2443" tag="hblock_tag_263" canDelete="false" indentLevel="1" classfield_id="2443" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2444" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2444" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2444" tag="tblock_78" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_xoff;" >
+       <ccfdeclarationcodeblock parent_id="2444" tag="tblock_78" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_xoff;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2444" tag="hblock_tag_264" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2444" tag="hblock_tag_264" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2444" tag="hblock_tag_265" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2444" tag="hblock_tag_265" canDelete="false" indentLevel="1" classfield_id="2444" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2445" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2445" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2445" tag="tblock_79" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_yoff;" >
+       <ccfdeclarationcodeblock parent_id="2445" tag="tblock_79" canDelete="false" indentLevel="1" role_id="-1" text=" Q_INT32 m_yoff;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2445" tag="hblock_tag_266" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2445" tag="hblock_tag_266" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2445" tag="hblock_tag_267" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2445" tag="hblock_tag_267" canDelete="false" indentLevel="1" classfield_id="2445" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2446" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2446" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomIn;" >
+       <ccfdeclarationcodeblock parent_id="2446" tag="tblock_80" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomIn;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2446" tag="hblock_tag_268" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2446" tag="hblock_tag_268" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2446" tag="hblock_tag_269" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2446" tag="hblock_tag_269" canDelete="false" indentLevel="1" classfield_id="2446" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2447" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2447" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomOut;" >
+       <ccfdeclarationcodeblock parent_id="2447" tag="tblock_81" canDelete="false" indentLevel="1" role_id="-1" text=" KAction * m_zoomOut;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2447" tag="hblock_tag_270" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
+       <codeaccessormethod accessType="0" parent_id="2447" tag="hblock_tag_270" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2447" tag="hblock_tag_271" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
+       <codeaccessormethod accessType="1" parent_id="2447" tag="hblock_tag_271" canDelete="false" indentLevel="1" classfield_id="2447" role_id="-1" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2366" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2366" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2366" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisUndoAdapter m_adapter;" >
+       <ccfdeclarationcodeblock parent_id="2366" tag="tblock_0" canDelete="false" indentLevel="1" role_id="0" text=" KisUndoAdapter m_adapter;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2366" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2366" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2366" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2366" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2366" tag="hblock_tag_83" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2366" tag="hblock_tag_83" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2366" tag="hblock_tag_84" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2366" tag="hblock_tag_84" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2366" tag="hblock_tag_85" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2366" tag="hblock_tag_85" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2366" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2368" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2368" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2368" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
+       <ccfdeclarationcodeblock parent_id="2368" tag="tblock_1" canDelete="false" indentLevel="1" role_id="0" text=" KisBrush m_brush;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2368" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2368" tag="hblock_tag_86" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2368" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2368" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2368" tag="hblock_tag_88" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2368" tag="hblock_tag_88" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2368" tag="hblock_tag_89" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2368" tag="hblock_tag_89" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2368" tag="hblock_tag_90" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2368" tag="hblock_tag_90" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2368" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2369" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2369" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2369" tag="tblock_2" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_brushMediator;" >
+       <ccfdeclarationcodeblock parent_id="2369" tag="tblock_2" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_brushMediator;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2369" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2369" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2369" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2369" tag="hblock_tag_92" canDelete="false" indentLevel="1" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2369" tag="hblock_tag_93" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2369" tag="hblock_tag_93" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2369" tag="hblock_tag_94" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2369" tag="hblock_tag_94" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2369" tag="hblock_tag_95" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2369" tag="hblock_tag_95" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2369" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2382" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2382" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2382" tag="tblock_3" canDelete="false" indentLevel="1" role_id="0" text=" KisDoc m_doc;" >
+       <ccfdeclarationcodeblock parent_id="2382" tag="tblock_3" canDelete="false" indentLevel="1" role_id="0" text=" KisDoc m_doc;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2382" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2382" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2382" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2382" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2382" tag="hblock_tag_98" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2382" tag="hblock_tag_98" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2382" tag="hblock_tag_99" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2382" tag="hblock_tag_99" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2382" tag="hblock_tag_100" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2382" tag="hblock_tag_100" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2382" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2385" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2385" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2385" tag="tblock_4" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
+       <ccfdeclarationcodeblock parent_id="2385" tag="tblock_4" canDelete="false" indentLevel="1" role_id="0" text=" KisGradient m_gradient;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2385" tag="hblock_tag_101" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2385" tag="hblock_tag_101" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2385" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2385" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2385" tag="hblock_tag_103" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2385" tag="hblock_tag_103" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2385" tag="hblock_tag_104" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2385" tag="hblock_tag_104" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2385" tag="hblock_tag_105" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2385" tag="hblock_tag_105" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2385" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2390" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2390" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2390" tag="tblock_5" canDelete="false" indentLevel="1" role_id="0" text=" KisBuilderMonitor m_imgBuilderMgr;" >
+       <ccfdeclarationcodeblock parent_id="2390" tag="tblock_5" canDelete="false" indentLevel="1" role_id="0" text=" KisBuilderMonitor m_imgBuilderMgr;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2390" tag="hblock_tag_106" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2390" tag="hblock_tag_106" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2390" tag="hblock_tag_107" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2390" tag="hblock_tag_107" canDelete="false" indentLevel="1" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2390" tag="hblock_tag_108" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2390" tag="hblock_tag_108" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2390" tag="hblock_tag_109" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2390" tag="hblock_tag_109" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2390" tag="hblock_tag_110" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2390" tag="hblock_tag_110" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2390" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2422" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2422" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2422" tag="tblock_6" canDelete="false" indentLevel="1" role_id="0" text=" KisPattern m_pattern;" >
+       <ccfdeclarationcodeblock parent_id="2422" tag="tblock_6" canDelete="false" indentLevel="1" role_id="0" text=" KisPattern m_pattern;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2422" tag="hblock_tag_111" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2422" tag="hblock_tag_111" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2422" tag="hblock_tag_112" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2422" tag="hblock_tag_112" canDelete="false" indentLevel="1" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2422" tag="hblock_tag_113" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2422" tag="hblock_tag_113" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2422" tag="hblock_tag_114" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2422" tag="hblock_tag_114" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2422" tag="hblock_tag_115" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2422" tag="hblock_tag_115" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2422" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2423" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2423" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2423" tag="tblock_7" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_patternMediator;" >
+       <ccfdeclarationcodeblock parent_id="2423" tag="tblock_7" canDelete="false" indentLevel="1" role_id="0" text=" KisResourceMediator m_patternMediator;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2423" tag="hblock_tag_116" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2423" tag="hblock_tag_116" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2423" tag="hblock_tag_117" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2423" tag="hblock_tag_117" canDelete="false" indentLevel="1" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2423" tag="hblock_tag_118" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2423" tag="hblock_tag_118" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2423" tag="hblock_tag_119" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2423" tag="hblock_tag_119" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2423" tag="hblock_tag_120" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2423" tag="hblock_tag_120" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2423" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="2441" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="2441" field_type="3" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="2441" tag="tblock_8" canDelete="false" indentLevel="1" role_id="0" text=" KisTool m_tool;" >
+       <ccfdeclarationcodeblock parent_id="2441" tag="tblock_8" canDelete="false" indentLevel="1" role_id="0" text=" KisTool m_tool;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="2441" tag="hblock_tag_121" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="0" parent_id="2441" tag="hblock_tag_121" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="2441" tag="hblock_tag_122" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="1" parent_id="2441" tag="hblock_tag_122" canDelete="false" indentLevel="1" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="2441" tag="hblock_tag_123" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="2" parent_id="2441" tag="hblock_tag_123" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="2441" tag="hblock_tag_124" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="3" parent_id="2441" tag="hblock_tag_124" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="2441" tag="hblock_tag_125" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
+       <codeaccessormethod accessType="4" parent_id="2441" tag="hblock_tag_125" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="2441" role_id="0" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
diff --git a/chalk/doc/channels_masks_selections b/chalk/doc/channels_masks_selections
index 4ce65414..66588363 100644
--- a/chalk/doc/channels_masks_selections
+++ b/chalk/doc/channels_masks_selections
@@ -1,4 +1,4 @@
-We did a rethink on channels, selections and tqmasks last summer.
+We did a rethink on channels, selections and masks last summer.
 
 Traditionally, a tqmask is seen as an extra channel for an image, analogous
 to the alpha channel. We want to do away with that idea.
diff --git a/chalk/doc/colorspaces.xmi b/chalk/doc/colorspaces.xmi
index cd874de8..c517ab0c 100644
--- a/chalk/doc/colorspaces.xmi
+++ b/chalk/doc/colorspaces.xmi
@@ -433,7 +433,7 @@ converted to the target model." isSpecification="false" isLeaf="false" visibilit
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="194" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="195" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="196" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="197" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="197" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="198" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="199" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="200" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -450,7 +450,7 @@ model together." isSpecification="false" isLeaf="false" visibility="protected" x
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="209" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="210" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="211" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="212" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="212" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="213" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="214" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="215" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -727,7 +727,7 @@ Returns false if the conversion failed, true if it succeeded" isSpecification="f
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="340" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="341" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="342" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="343" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="343" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="344" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="345" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="346" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -973,7 +973,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="447" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="448" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="449" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="450" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="450" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="451" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="452" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="453" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -992,7 +992,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="462" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="465" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1005,7 +1005,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="472" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="475" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1018,7 +1018,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="482" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="485" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1031,7 +1031,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="492" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="495" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1044,7 +1044,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="502" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="505" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1057,7 +1057,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="512" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="515" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1070,7 +1070,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="522" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="525" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1083,7 +1083,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="532" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="535" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1096,7 +1096,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="542" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="545" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1109,7 +1109,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="552" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="555" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1122,7 +1122,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="562" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="565" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -1302,7 +1302,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="642" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="643" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="644" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="645" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="645" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="646" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="647" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="648" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -1509,7 +1509,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="750" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="751" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="752" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="753" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="753" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="754" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="755" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="756" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -1528,7 +1528,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="765" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="768" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1541,7 +1541,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="775" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="778" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1554,7 +1554,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="785" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="788" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1567,7 +1567,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="795" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="798" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1580,7 +1580,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="805" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="808" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1593,7 +1593,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="815" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="818" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1606,7 +1606,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="825" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="828" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1619,7 +1619,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="835" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="838" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1632,7 +1632,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="845" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="848" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1645,7 +1645,7 @@ and down-scaling of channels." isSpecification="false" isLeaf="false" visibility
         <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="855" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="858" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -1881,7 +1881,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="966" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="967" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="968" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="969" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="969" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="970" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="971" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="972" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -1895,7 +1895,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="980" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="983" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1908,7 +1908,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="990" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="993" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1921,7 +1921,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1000" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1003" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1934,7 +1934,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1010" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1013" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1947,7 +1947,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1020" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1023" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1960,7 +1960,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1030" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1033" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1973,7 +1973,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1040" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1043" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1986,7 +1986,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1050" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1053" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -1999,7 +1999,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1060" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1063" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -2012,7 +2012,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1070" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1073" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -2025,7 +2025,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1080" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1083" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -2038,7 +2038,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1090" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1093" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -2051,7 +2051,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1100" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1103" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -2064,7 +2064,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1110" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1113" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -2077,7 +2077,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1120" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1123" isRoot="false" value="" type="6" isAbstract="false" name="opacity" />
@@ -2278,7 +2278,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1222" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1223" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1224" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1225" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1225" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1226" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1227" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1228" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -2292,7 +2292,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1236" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1239" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2305,7 +2305,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1246" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1249" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2318,7 +2318,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1256" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1259" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2331,7 +2331,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1266" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1269" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2344,7 +2344,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1276" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1279" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2357,7 +2357,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1286" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1289" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2370,7 +2370,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1296" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1299" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2383,7 +2383,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1306" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1309" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2396,7 +2396,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1316" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1319" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2409,7 +2409,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1326" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1329" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2422,7 +2422,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1336" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1339" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2435,7 +2435,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1346" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1349" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2448,7 +2448,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1356" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1359" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2461,7 +2461,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1366" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1369" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2474,7 +2474,7 @@ A plugin wrapper around the RGB F32 colour space strategy." isSpecification="fal
         <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="1376" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1379" isRoot="false" value="" type="150" isAbstract="false" name="opacity" />
@@ -2688,7 +2688,7 @@ the compensation factor will be used to limit the darkening.
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1490" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1491" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1492" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1493" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1493" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1494" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1495" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1496" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -2702,7 +2702,7 @@ the compensation factor will be used to limit the darkening.
         <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="1504" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1507" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2715,7 +2715,7 @@ the compensation factor will be used to limit the darkening.
         <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="1514" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1517" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2728,7 +2728,7 @@ the compensation factor will be used to limit the darkening.
         <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="1524" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1527" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2741,7 +2741,7 @@ the compensation factor will be used to limit the darkening.
         <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="1534" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1537" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2754,7 +2754,7 @@ the compensation factor will be used to limit the darkening.
         <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="1544" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1547" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2767,7 +2767,7 @@ the compensation factor will be used to limit the darkening.
         <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="1554" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1557" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2780,7 +2780,7 @@ the compensation factor will be used to limit the darkening.
         <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="1564" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1567" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2793,7 +2793,7 @@ the compensation factor will be used to limit the darkening.
         <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="1574" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1577" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2806,7 +2806,7 @@ the compensation factor will be used to limit the darkening.
         <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="1584" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1587" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2819,7 +2819,7 @@ the compensation factor will be used to limit the darkening.
         <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="1594" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1597" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2832,7 +2832,7 @@ the compensation factor will be used to limit the darkening.
         <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="1604" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1607" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2845,7 +2845,7 @@ the compensation factor will be used to limit the darkening.
         <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="1614" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1617" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2858,7 +2858,7 @@ the compensation factor will be used to limit the darkening.
         <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="1624" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1627" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -2871,7 +2871,7 @@ the compensation factor will be used to limit the darkening.
         <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="1634" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1637" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -3087,7 +3087,7 @@ these wetpix structs for every paint device pixel" isSpecification="false" isLea
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1738" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1739" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1740" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1741" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1741" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1742" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1743" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1744" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -3297,7 +3297,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1849" isRoot="false" value="" type="54" isAbstract="false" name="src" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1850" isRoot="false" value="" type="44" isAbstract="false" name="srcRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1851" isRoot="false" value="" type="54" isAbstract="false" name="srcAlphaMask" />
-        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1852" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1852" isRoot="false" value="" type="44" isAbstract="false" name="maskRowStride" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1853" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1854" isRoot="false" value="" type="44" isAbstract="false" name="rows" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1855" isRoot="false" value="" type="44" isAbstract="false" name="cols" />
@@ -3323,7 +3323,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <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="1871" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1874" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -3336,7 +3336,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <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="1881" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1884" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -3349,7 +3349,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <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="1891" isRoot="false" value="" type="44" isAbstract="false" name="tqmaskRowStride" />
+        <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" />
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1894" isRoot="false" value="" type="84" isAbstract="false" name="opacity" />
@@ -4065,7 +4065,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
     </codedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2" tqparent_class="2" fileExt=".java" fileName="int" >
+    <classifiercodedocument writeOutCode="true" package="" id="2" parent_class="2" fileExt=".java" fileName="int" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4077,7 +4077,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="2" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="2" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Int&amp;#010;" />
        </header>
@@ -4140,7 +4140,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="4" tqparent_class="4" fileExt=".java" fileName="char" >
+    <classifiercodedocument writeOutCode="true" package="" id="4" parent_class="4" fileExt=".java" fileName="char" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4152,7 +4152,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="4" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="4" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Char&amp;#010;" />
        </header>
@@ -4215,7 +4215,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="5" tqparent_class="5" fileExt=".java" fileName="boolean" >
+    <classifiercodedocument writeOutCode="true" package="" id="5" parent_class="5" fileExt=".java" fileName="boolean" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4227,7 +4227,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="5" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="5" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Boolean&amp;#010;" />
        </header>
@@ -4290,7 +4290,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="6" tqparent_class="6" fileExt=".java" fileName="float" >
+    <classifiercodedocument writeOutCode="true" package="" id="6" parent_class="6" fileExt=".java" fileName="float" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4302,7 +4302,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="6" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="6" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Float&amp;#010;" />
        </header>
@@ -4365,7 +4365,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="7" tqparent_class="7" fileExt=".java" fileName="double" >
+    <classifiercodedocument writeOutCode="true" package="" id="7" parent_class="7" fileExt=".java" fileName="double" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4377,7 +4377,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="7" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="7" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Double&amp;#010;" />
        </header>
@@ -4440,7 +4440,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="8" tqparent_class="8" fileExt=".java" fileName="byte" >
+    <classifiercodedocument writeOutCode="true" package="" id="8" parent_class="8" fileExt=".java" fileName="byte" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4452,7 +4452,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="8" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="8" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Byte&amp;#010;" />
        </header>
@@ -4515,7 +4515,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="9" tqparent_class="9" fileExt=".java" fileName="short" >
+    <classifiercodedocument writeOutCode="true" package="" id="9" parent_class="9" fileExt=".java" fileName="short" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4527,7 +4527,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="9" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="9" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Short&amp;#010;" />
        </header>
@@ -4590,7 +4590,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="10" tqparent_class="10" fileExt=".java" fileName="string" >
+    <classifiercodedocument writeOutCode="true" package="" id="10" parent_class="10" fileExt=".java" fileName="string" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4602,7 +4602,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="10" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="10" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class String&amp;#010;" />
        </header>
@@ -4665,7 +4665,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="11" tqparent_class="11" fileExt=".java" fileName="QPainter" >
+    <classifiercodedocument writeOutCode="true" package="" id="11" parent_class="11" fileExt=".java" fileName="QPainter" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4677,7 +4677,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="11" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="11" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPainter&amp;#010;" />
        </header>
@@ -4740,7 +4740,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="12" tqparent_class="12" fileExt=".java" fileName="KisIteratorPixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="12" parent_class="12" fileExt=".java" fileName="KisIteratorPixel" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4752,7 +4752,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="12" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="12" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisIteratorPixel&amp;#010;" />
        </header>
@@ -4815,7 +4815,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="13" tqparent_class="13" fileExt=".java" fileName="KisPixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="13" parent_class="13" fileExt=".java" fileName="KisPixel" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4827,7 +4827,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="13" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="13" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPixel&amp;#010;" />
        </header>
@@ -4890,7 +4890,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="14" tqparent_class="14" fileExt=".java" fileName="KisPixelRO" >
+    <classifiercodedocument writeOutCode="true" package="" id="14" parent_class="14" fileExt=".java" fileName="KisPixelRO" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4902,7 +4902,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="14" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="14" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPixelRO&amp;#010;" />
        </header>
@@ -4965,7 +4965,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="15" tqparent_class="15" fileExt=".java" fileName="KisProfilePair" >
+    <classifiercodedocument writeOutCode="true" package="" id="15" parent_class="15" fileExt=".java" fileName="KisProfilePair" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4977,7 +4977,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="15" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="15" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProfilePair&amp;#010;" />
        </header>
@@ -5040,7 +5040,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="17" tqparent_class="17" fileExt=".java" fileName="transform" >
+    <classifiercodedocument writeOutCode="true" package="" id="17" parent_class="17" fileExt=".java" fileName="transform" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5052,7 +5052,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="17" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="17" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Transform&amp;#010;// This would be better, I guess." />
        </header>
@@ -5062,27 +5062,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text="public KisProfile srcProfile;" >
+          <ccfdeclarationcodeblock parent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text="public KisProfile srcProfile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="21" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT32 srcCmType;" >
+          <ccfdeclarationcodeblock parent_id="21" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT32 srcCmType;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="22" tag="tblock_5" canDelete="false" indentLevel="1" text="public KisProfile dstProfile;" >
+          <ccfdeclarationcodeblock parent_id="22" tag="tblock_5" canDelete="false" indentLevel="1" text="public KisProfile dstProfile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="23" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT32 dstType;" >
+          <ccfdeclarationcodeblock parent_id="23" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT32 dstType;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="24" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT32 renderIntent;" >
+          <ccfdeclarationcodeblock parent_id="24" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT32 renderIntent;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -5116,52 +5116,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
+              <codeaccessormethod accessType="0" parent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of srcProfile&amp;#010;&amp;#010;@return the value of srcProfile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="19" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
+              <codeaccessormethod accessType="1" parent_id="19" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of srcProfile&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="21" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
+              <codeaccessormethod accessType="0" parent_id="21" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of srcCmType&amp;#010;&amp;#010;@return the value of srcCmType" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="21" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
+              <codeaccessormethod accessType="1" parent_id="21" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of srcCmType&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="22" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
+              <codeaccessormethod accessType="0" parent_id="22" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of dstProfile&amp;#010;&amp;#010;@return the value of dstProfile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="22" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
+              <codeaccessormethod accessType="1" parent_id="22" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of dstProfile&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="23" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
+              <codeaccessormethod accessType="0" parent_id="23" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of dstType&amp;#010;&amp;#010;@return the value of dstType" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
+              <codeaccessormethod accessType="1" parent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of dstType&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
+              <codeaccessormethod accessType="0" parent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of renderIntent&amp;#010;&amp;#010;@return the value of renderIntent" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
+              <codeaccessormethod accessType="1" parent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of renderIntent&amp;#010;&amp;#010;" />
                </header>
@@ -5191,101 +5191,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="19" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="19" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text="public KisProfile srcProfile;" >
+       <ccfdeclarationcodeblock parent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text="public KisProfile srcProfile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
+       <codeaccessormethod accessType="0" parent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of srcProfile&amp;#010;&amp;#010;@return the value of srcProfile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="19" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="19" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of srcProfile&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="21" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="21" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="21" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT32 srcCmType;" >
+       <ccfdeclarationcodeblock parent_id="21" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT32 srcCmType;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="21" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
+       <codeaccessormethod accessType="0" parent_id="21" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of srcCmType&amp;#010;&amp;#010;@return the value of srcCmType" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="21" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
+       <codeaccessormethod accessType="1" parent_id="21" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of srcCmType&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="22" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="22" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="22" tag="tblock_5" canDelete="false" indentLevel="1" text="public KisProfile dstProfile;" >
+       <ccfdeclarationcodeblock parent_id="22" tag="tblock_5" canDelete="false" indentLevel="1" text="public KisProfile dstProfile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="22" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
+       <codeaccessormethod accessType="0" parent_id="22" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of dstProfile&amp;#010;&amp;#010;@return the value of dstProfile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="22" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="22" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of dstProfile&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="23" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="23" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="23" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT32 dstType;" >
+       <ccfdeclarationcodeblock parent_id="23" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT32 dstType;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="23" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
+       <codeaccessormethod accessType="0" parent_id="23" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of dstType&amp;#010;&amp;#010;@return the value of dstType" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
+       <codeaccessormethod accessType="1" parent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of dstType&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="24" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="24" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="24" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT32 renderIntent;" >
+       <ccfdeclarationcodeblock parent_id="24" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT32 renderIntent;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
+       <codeaccessormethod accessType="0" parent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of renderIntent&amp;#010;&amp;#010;@return the value of renderIntent" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
+       <codeaccessormethod accessType="1" parent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of renderIntent&amp;#010;&amp;#010;" />
         </header>
@@ -5293,7 +5293,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="18" tqparent_class="18" fileExt=".java" fileName="KisProfile" >
+    <classifiercodedocument writeOutCode="true" package="" id="18" parent_class="18" fileExt=".java" fileName="KisProfile" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5305,7 +5305,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="18" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="18" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProfile&amp;#010;" />
        </header>
@@ -5368,7 +5368,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="20" tqparent_class="20" fileExt=".java" fileName="Q_UINT32" >
+    <classifiercodedocument writeOutCode="true" package="" id="20" parent_class="20" fileExt=".java" fileName="Q_UINT32" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5380,7 +5380,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="20" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="20" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT32&amp;#010;" />
        </header>
@@ -5443,7 +5443,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="25" tqparent_class="25" fileExt=".java" fileName="struct KisColorAdjustment" >
+    <classifiercodedocument writeOutCode="true" package="" id="25" parent_class="25" fileExt=".java" fileName="struct KisColorAdjustment" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5455,7 +5455,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="25" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="25" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Struct KisColorAdjustment&amp;#010;" />
        </header>
@@ -5518,7 +5518,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="26" tqparent_class="26" fileExt=".java" fileName="KisAbstractColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="26" parent_class="26" fileExt=".java" fileName="KisAbstractColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5530,7 +5530,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="26" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="26" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAbstractColorSpace&amp;#010;A colorspace strategy is the definition of a certain color model&amp;#010;in Chalk." />
        </header>
@@ -5540,67 +5540,67 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text="protected QStringList m_profileFilenames;" >
+          <ccfdeclarationcodeblock parent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text="protected QStringList m_profileFilenames;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="228" tag="tblock_2" canDelete="false" indentLevel="1" text="protected KisProfileSP m_defaultProfile;" >
+          <ccfdeclarationcodeblock parent_id="228" tag="tblock_2" canDelete="false" indentLevel="1" text="protected KisProfileSP m_defaultProfile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="229" tag="tblock_5" canDelete="false" indentLevel="1" text="protected Q_UINT8* m_qcolordata;" >
+          <ccfdeclarationcodeblock parent_id="229" tag="tblock_5" canDelete="false" indentLevel="1" text="protected Q_UINT8* m_qcolordata;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="230" tag="tblock_8" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaPos;" >
+          <ccfdeclarationcodeblock parent_id="230" tag="tblock_8" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaPos;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="231" tag="tblock_11" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaSize;" >
+          <ccfdeclarationcodeblock parent_id="231" tag="tblock_11" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaSize;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="232" tag="tblock_14" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultToRGB;" >
+          <ccfdeclarationcodeblock parent_id="232" tag="tblock_14" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultToRGB;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="233" tag="tblock_17" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultFromRGB;" >
+          <ccfdeclarationcodeblock parent_id="233" tag="tblock_17" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultFromRGB;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="234" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisID m_id;" >
+          <ccfdeclarationcodeblock parent_id="234" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisID m_id;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="235" tag="tblock_23" canDelete="false" indentLevel="1" text="private DWORD m_cmType;" >
+          <ccfdeclarationcodeblock parent_id="235" tag="tblock_23" canDelete="false" indentLevel="1" text="private DWORD m_cmType;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="236" tag="tblock_26" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
+          <ccfdeclarationcodeblock parent_id="236" tag="tblock_26" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="238" tag="tblock_29" canDelete="false" indentLevel="1" text="private TransformMap m_transforms;" >
+          <ccfdeclarationcodeblock parent_id="238" tag="tblock_29" canDelete="false" indentLevel="1" text="private TransformMap m_transforms;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Cache for existing transforms" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="245" tag="tblock_32" canDelete="false" indentLevel="1" text="private Q_UINT32 m_cachesize;" >
+          <ccfdeclarationcodeblock parent_id="245" tag="tblock_32" canDelete="false" indentLevel="1" text="private Q_UINT32 m_cachesize;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="246" tag="tblock_35" canDelete="false" indentLevel="1" text="private Q_UINT8* m_conversionCache;" >
+          <ccfdeclarationcodeblock parent_id="246" tag="tblock_35" canDelete="false" indentLevel="1" text="private Q_UINT8* m_conversionCache;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -5634,132 +5634,132 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
+              <codeaccessormethod accessType="0" parent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profileFilenames&amp;#010;&amp;#010;@return the value of m_profileFilenames" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="227" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
+              <codeaccessormethod accessType="1" parent_id="227" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profileFilenames&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="228" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
+              <codeaccessormethod accessType="0" parent_id="228" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultProfile&amp;#010;&amp;#010;@return the value of m_defaultProfile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="228" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
+              <codeaccessormethod accessType="1" parent_id="228" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultProfile&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="229" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
+              <codeaccessormethod accessType="0" parent_id="229" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="229" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
+              <codeaccessormethod accessType="1" parent_id="229" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="230" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
+              <codeaccessormethod accessType="0" parent_id="230" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alphaPos&amp;#010;&amp;#010;@return the value of m_alphaPos" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="230" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
+              <codeaccessormethod accessType="1" parent_id="230" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alphaPos&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="231" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
+              <codeaccessormethod accessType="0" parent_id="231" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alphaSize&amp;#010;&amp;#010;@return the value of m_alphaSize" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="231" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
+              <codeaccessormethod accessType="1" parent_id="231" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alphaSize&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="232" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
+              <codeaccessormethod accessType="0" parent_id="232" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultToRGB&amp;#010;&amp;#010;@return the value of m_defaultToRGB" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="232" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
+              <codeaccessormethod accessType="1" parent_id="232" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultToRGB&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="233" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
+              <codeaccessormethod accessType="0" parent_id="233" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultFromRGB&amp;#010;&amp;#010;@return the value of m_defaultFromRGB" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="233" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
+              <codeaccessormethod accessType="1" parent_id="233" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultFromRGB&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="234" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
+              <codeaccessormethod accessType="0" parent_id="234" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_id&amp;#010;&amp;#010;@return the value of m_id" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="234" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
+              <codeaccessormethod accessType="1" parent_id="234" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_id&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="235" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
+              <codeaccessormethod accessType="0" parent_id="235" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="235" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
+              <codeaccessormethod accessType="1" parent_id="235" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="236" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
+              <codeaccessormethod accessType="0" parent_id="236" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="236" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
+              <codeaccessormethod accessType="1" parent_id="236" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="238" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
+              <codeaccessormethod accessType="0" parent_id="238" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Cache for existing transforms" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="238" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
+              <codeaccessormethod accessType="1" parent_id="238" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Cache for existing transforms" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="245" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
+              <codeaccessormethod accessType="0" parent_id="245" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_cachesize&amp;#010;&amp;#010;@return the value of m_cachesize" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
+              <codeaccessormethod accessType="1" parent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_cachesize&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
+              <codeaccessormethod accessType="0" parent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_conversionCache&amp;#010;&amp;#010;@return the value of m_conversionCache" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
+              <codeaccessormethod accessType="1" parent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_conversionCache&amp;#010;&amp;#010;" />
                </header>
@@ -5779,252 +5779,252 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="31" tag="operation_31" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="31" tag="operation_31" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Create a new colorspace strategy.&amp;#010;&amp;#010;@param id The Chalk identification of this color model.&amp;#010;@param cmType The littlecms colorstrategy type we wrap.&amp;#010;@param colorSpaceSignature The icc signature for the colorspace we are." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="40" tag="operation_40" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="40" tag="operation_40" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="41" tag="operation_41" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="41" tag="operation_41" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="//========== Channels =====================================================//// Return a vector describing all the channels this color model has." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="43" tag="operation_43" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="43" tag="operation_43" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="The total number of channels for a single pixel in this color model" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="45" tag="operation_45" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="45" tag="operation_45" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="The total number of color channels (excludes alpha and substance) for a single&amp;#010;pixel in this color model." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="46" tag="operation_46" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="46" tag="operation_46" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="47" tag="operation_47" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="47" tag="operation_47" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="The size in bytes of a single pixel in this color model" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="48" tag="operation_48" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="48" tag="operation_48" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Whether this color model has a channel of type ALPHA" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="50" tag="operation_50" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="50" tag="operation_50" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="51" tag="operation_51" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="51" tag="operation_51" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="52" tag="operation_52" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="52" tag="operation_52" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Return a string with the channel's value suitable for display in the gui." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="58" tag="operation_58" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="58" tag="operation_58" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Return a string with the channel's value with integer&amp;#010;channels normalised to the floating point range 0 to 1, if appropriate." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="61" tag="operation_61" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="61" tag="operation_61" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisID  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="62" tag="operation_62" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="62" tag="operation_62" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param type &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="64" tag="operation_64" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="64" tag="operation_64" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_UINT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="65" tag="operation_65" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="65" tag="operation_65" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param signature &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="67" tag="operation_67" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="67" tag="operation_67" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return icColorSpaceSignature  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="68" tag="operation_68" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="68" tag="operation_68" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="//========== Capabilities =================================================///**&amp;#010;Returns the list of user-visible composite ops supported by this colourspace. Internal&amp;#010;ops such as COPY, CLEAR, and ERASE, are not included as these make no sense&amp;#010;for layers in the full image model." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="70" tag="operation_70" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="70" tag="operation_70" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="71" tag="operation_71" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="71" tag="operation_71" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="//========== Display profiles =============================================///**&amp;#010;Get a list of profiles that apply to this color space" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="73" tag="operation_73" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="73" tag="operation_73" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Return the number of profiles available for this color space" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="74" tag="operation_74" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="74" tag="operation_74" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="//================= Conversion functions ==================================///**&amp;#010;The nativeColor methods take a given color defined as an RGB QColor&amp;#010;and fills a byte array with the corresponding color in the&amp;#010;the colorspace managed by this strategy.&amp;#010;&amp;#010;The profile parameter is the profile of the paint device; the other profile&amp;#010;is the display profile -- since we are moving from QColor&amp;#010;that have most likely been picked from the display itself.&amp;#010;&amp;#010;XXX: We actually do not use the display yet, nor the paint device profile" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="82" tag="operation_82" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="82" tag="operation_82" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="88" tag="operation_88" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="88" tag="operation_88" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="The toQColor methods take a byte array that is at least pixelSize() long&amp;#010;and converts the contents to a QColor, using the given profile as a source&amp;#010;profile and the display profile as a destination profile.&amp;#010;&amp;#010;XXX: We actually do not use the display yet, nor the paint device profile&amp;#010;" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="93" tag="operation_93" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="93" tag="operation_93" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="99" tag="operation_99" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="99" tag="operation_99" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Get the alpha value of the given pixel.&amp;#010;XXX: Change to float/int to match setAlpha() when that changes." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="102" tag="operation_102" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="102" tag="operation_102" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="105" tag="operation_105" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="105" tag="operation_105" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="108" tag="operation_108" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="108" tag="operation_108" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="This function is used to convert a KisPixelRepresentation from this color strategy to the specified&amp;#010;color strategy." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="113" tag="operation_113" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="113" tag="operation_113" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Convert the pixels in data to (8-bit BGRA) QImage using the specified profiles.&amp;#010;The pixels are supposed to be encoded in this color model.&amp;#010;&amp;#010;@param data A pointer to a contiguous memory region containing width * height pixels&amp;#010;@param width in pixels&amp;#010;@param height in pixels&amp;#010;@param srcProfile source profile&amp;#010;@param dstProfile destination profile&amp;#010;@param renderingIntent the rendering intent&amp;#010;@param exposure The exposure setting for rendering a preview of a high dynamic range image." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="122" tag="operation_122" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="122" tag="operation_122" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Convert a byte array of srcLen pixels *src to the specified color space&amp;#010;and put the converted bytes into the prepared byte array *dst.&amp;#010;&amp;#010;Returns false if the conversion failed, true if it succeeded" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="131" tag="operation_131" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="131" tag="operation_131" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Convert the value of the channel at the specified position into&amp;#010;an 8-bit value." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="134" tag="operation_134" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="134" tag="operation_134" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Convert the value of the channel at the specified position into&amp;#010;a 16-bit value. This may be upscaling or downscaling, depending&amp;#010;on the defined value of the channel" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="137" tag="operation_137" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="137" tag="operation_137" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="//============================== Manipulation fucntions ==========================//// // The manipulation functions have default implementations that _convert_ the pixel// to a QColor and back. Reimplement these methods in your color strategy!///**&amp;#010;Set the alpha channel to the given value.&amp;#010;&amp;#010;pixels -- a pointer to the pixels that will have their alpha set to this value&amp;#010;alpha --  XXX: This must become int or float&amp;#010;nPixels -- the number of pixels&amp;#010;&amp;#010;XXX: Also add a function that modifies the current alpha with the given alpha, i.e., premultiply them?" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="141" tag="operation_141" canDelete="false" indentLevel="1" >
+            <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." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="145" tag="operation_145" canDelete="false" indentLevel="1" >
+            <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." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="149" tag="operation_149" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="149" tag="operation_149" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Create an adjustment object for adjusting the brightness and contrast&amp;#010;transferValues is a 256 bins array with values from 0 to 0xFFFF" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="155" tag="operation_155" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="155" tag="operation_155" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Apply the adjustment created with onr of the other functions" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="160" tag="operation_160" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="160" tag="operation_160" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// XXX: What with alpha channels? YYY: Add an overloaded function that takes alpha into account?/**&amp;#010;Get the difference between 2 colors, normalized in the range (0,255)" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="164" tag="operation_164" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="164" tag="operation_164" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Mix the colors given their weights and return in dst&amp;#010;The sum of weights is assumed 255" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="170" tag="operation_170" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="170" tag="operation_170" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Convolve the given array of pointers to pixels and return the result&amp;#010;in dst. The kernel values are clamped between -128 and 128" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="181" tag="operation_181" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="181" tag="operation_181" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Darken all color channels with the given amount. If compensate is true,&amp;#010;the compensation factor will be used to limit the darkening.&amp;#010;&amp;#010;(See the bumpmap filter)" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="188" tag="operation_188" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="188" tag="operation_188" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Calculate the intensity of the given pixel, scaled down to the range 0-255. XXX: Maybe this should be more flexible" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="190" tag="operation_190" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="190" tag="operation_190" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Compose two arrays of pixels together. If source and target&amp;#010;are not the same colour model, the source pixels will be&amp;#010;converted to the target model." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="206" tag="operation_206" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="206" tag="operation_206" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Compose two byte arrays containing pixels in the same color&amp;#010;model together." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="217" tag="operation_217" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="217" tag="operation_217" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dstColorStrategy &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@return cmsHTRANSFORM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="223" tag="operation_223" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="223" tag="operation_223" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisProfileSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="224" tag="operation_224" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="224" tag="operation_224" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="239" tag="operation_239" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="239" tag="operation_239" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="242" tag="operation_242" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="242" tag="operation_242" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return KisAbstractColorSpace&amp;  " />
              </header>
@@ -6040,471 +6040,471 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="28" field_type="6357104" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="28" field_type="6357104" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
+       <ccfdeclarationcodeblock parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="227" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="227" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text="protected QStringList m_profileFilenames;" >
+       <ccfdeclarationcodeblock parent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text="protected QStringList m_profileFilenames;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
+       <codeaccessormethod accessType="0" parent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profileFilenames&amp;#010;&amp;#010;@return the value of m_profileFilenames" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="227" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
+       <codeaccessormethod accessType="1" parent_id="227" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profileFilenames&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="228" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="228" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="228" tag="tblock_2" canDelete="false" indentLevel="1" text="protected KisProfileSP m_defaultProfile;" >
+       <ccfdeclarationcodeblock parent_id="228" tag="tblock_2" canDelete="false" indentLevel="1" text="protected KisProfileSP m_defaultProfile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="228" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
+       <codeaccessormethod accessType="0" parent_id="228" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultProfile&amp;#010;&amp;#010;@return the value of m_defaultProfile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="228" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="228" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultProfile&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="229" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="229" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// A small buffer for conversion from and to qcolor." />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="229" tag="tblock_5" canDelete="false" indentLevel="1" text="protected Q_UINT8* m_qcolordata;" >
+       <ccfdeclarationcodeblock parent_id="229" tag="tblock_5" canDelete="false" indentLevel="1" text="protected Q_UINT8* m_qcolordata;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="229" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="229" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="229" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="229" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="230" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="230" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="230" tag="tblock_8" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaPos;" >
+       <ccfdeclarationcodeblock parent_id="230" tag="tblock_8" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaPos;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="230" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
+       <codeaccessormethod accessType="0" parent_id="230" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alphaPos&amp;#010;&amp;#010;@return the value of m_alphaPos" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="230" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
+       <codeaccessormethod accessType="1" parent_id="230" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alphaPos&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="231" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="231" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="231" tag="tblock_11" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaSize;" >
+       <ccfdeclarationcodeblock parent_id="231" tag="tblock_11" canDelete="false" indentLevel="1" text="protected Q_INT32 m_alphaSize;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="231" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
+       <codeaccessormethod accessType="0" parent_id="231" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alphaSize&amp;#010;&amp;#010;@return the value of m_alphaSize" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="231" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
+       <codeaccessormethod accessType="1" parent_id="231" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alphaSize&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="232" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="232" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="232" tag="tblock_14" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultToRGB;" >
+       <ccfdeclarationcodeblock parent_id="232" tag="tblock_14" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultToRGB;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="232" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="232" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultToRGB&amp;#010;&amp;#010;@return the value of m_defaultToRGB" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="232" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="232" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultToRGB&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="233" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="233" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="233" tag="tblock_17" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultFromRGB;" >
+       <ccfdeclarationcodeblock parent_id="233" tag="tblock_17" canDelete="false" indentLevel="1" text="protected cmsHTRANSFORM m_defaultFromRGB;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="233" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="233" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultFromRGB&amp;#010;&amp;#010;@return the value of m_defaultFromRGB" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="233" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="233" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultFromRGB&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="234" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="234" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="234" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisID m_id;" >
+       <ccfdeclarationcodeblock parent_id="234" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisID m_id;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="234" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
+       <codeaccessormethod accessType="0" parent_id="234" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_id&amp;#010;&amp;#010;@return the value of m_id" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="234" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
+       <codeaccessormethod accessType="1" parent_id="234" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_id&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="235" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="235" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// The colorspace type as defined by littlecms" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="235" tag="tblock_23" canDelete="false" indentLevel="1" text="private DWORD m_cmType;" >
+       <ccfdeclarationcodeblock parent_id="235" tag="tblock_23" canDelete="false" indentLevel="1" text="private DWORD m_cmType;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="235" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
+       <codeaccessormethod accessType="0" parent_id="235" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="235" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
+       <codeaccessormethod accessType="1" parent_id="235" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="236" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="236" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// The colorspace signature as defined in icm/icc files" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="236" tag="tblock_26" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
+       <ccfdeclarationcodeblock parent_id="236" tag="tblock_26" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="236" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
+       <codeaccessormethod accessType="0" parent_id="236" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="236" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
+       <codeaccessormethod accessType="1" parent_id="236" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Cache for existing transforms" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="238" tag="tblock_29" canDelete="false" indentLevel="1" text="private TransformMap m_transforms;" >
+       <ccfdeclarationcodeblock parent_id="238" tag="tblock_29" canDelete="false" indentLevel="1" text="private TransformMap m_transforms;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Cache for existing transforms" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="238" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
+       <codeaccessormethod accessType="0" parent_id="238" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Cache for existing transforms" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="238" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
+       <codeaccessormethod accessType="1" parent_id="238" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Cache for existing transforms" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="245" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="245" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="245" tag="tblock_32" canDelete="false" indentLevel="1" text="private Q_UINT32 m_cachesize;" >
+       <ccfdeclarationcodeblock parent_id="245" tag="tblock_32" canDelete="false" indentLevel="1" text="private Q_UINT32 m_cachesize;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="245" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
+       <codeaccessormethod accessType="0" parent_id="245" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_cachesize&amp;#010;&amp;#010;@return the value of m_cachesize" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
+       <codeaccessormethod accessType="1" parent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_cachesize&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="246" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="246" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="246" tag="tblock_35" canDelete="false" indentLevel="1" text="private Q_UINT8* m_conversionCache;" >
+       <ccfdeclarationcodeblock parent_id="246" tag="tblock_35" canDelete="false" indentLevel="1" text="private Q_UINT8* m_conversionCache;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
+       <codeaccessormethod accessType="0" parent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_conversionCache&amp;#010;&amp;#010;@return the value of m_conversionCache" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
+       <codeaccessormethod accessType="1" parent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_conversionCache&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="248" field_type="2097190" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="248" field_type="2097190" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU8BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU8BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="351" field_type="7471221" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="351" field_type="7471221" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisF32BaseColorSpace  = new KisF32BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisF32BaseColorSpace  = new KisF32BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisF32BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisF32BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="359" field_type="3866701" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="359" field_type="3866701" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisU16BaseColorSpace  = new KisU16BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisU16BaseColorSpace  = new KisU16BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU16BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU16BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1664" field_type="7274528" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1664" field_type="7274528" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisWetColorSpace  = new KisWetColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisWetColorSpace  = new KisWetColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisWetColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisWetColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1775" field_type="49" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1775" field_type="49" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisWetStickyColorSpace  = new KisWetStickyColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisWetStickyColorSpace  = new KisWetStickyColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisWetStickyColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisWetStickyColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -6512,7 +6512,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="27" tqparent_class="27" fileExt=".java" fileName="KShared" >
+    <classifiercodedocument writeOutCode="true" package="" id="27" parent_class="27" fileExt=".java" fileName="KShared" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6524,7 +6524,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="27" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="27" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KShared&amp;#010;" />
        </header>
@@ -6586,36 +6586,36 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="28" field_type="7077996" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="28" field_type="7077996" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAbstractColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAbstractColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="28" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="28" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -6623,7 +6623,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="32" tqparent_class="32" fileExt=".java" fileName="void" >
+    <classifiercodedocument writeOutCode="true" package="" id="32" parent_class="32" fileExt=".java" fileName="void" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6635,7 +6635,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="32" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="32" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Void&amp;#010;" />
        </header>
@@ -6698,7 +6698,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="33" tqparent_class="33" fileExt=".java" fileName="KisID" >
+    <classifiercodedocument writeOutCode="true" package="" id="33" parent_class="33" fileExt=".java" fileName="KisID" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6710,7 +6710,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="33" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="33" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisID&amp;#010;" />
        </header>
@@ -6773,7 +6773,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="34" tqparent_class="34" fileExt=".java" fileName="const KisID&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="34" parent_class="34" fileExt=".java" fileName="const KisID&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6785,7 +6785,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="34" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="34" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisID&amp;&amp;#010;" />
        </header>
@@ -6848,7 +6848,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="36" tqparent_class="36" fileExt=".java" fileName="DWORD" >
+    <classifiercodedocument writeOutCode="true" package="" id="36" parent_class="36" fileExt=".java" fileName="DWORD" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6860,7 +6860,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="36" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="36" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class DWORD&amp;#010;" />
        </header>
@@ -6923,7 +6923,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="38" tqparent_class="38" fileExt=".java" fileName="icColorSpaceSignature" >
+    <classifiercodedocument writeOutCode="true" package="" id="38" parent_class="38" fileExt=".java" fileName="icColorSpaceSignature" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6935,7 +6935,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="38" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="38" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class IcColorSpaceSignature&amp;#010;" />
        </header>
@@ -6998,7 +6998,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="42" tqparent_class="42" fileExt=".java" fileName="vKisChannelInfoSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="42" parent_class="42" fileExt=".java" fileName="vKisChannelInfoSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7010,7 +7010,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="42" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="42" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisChannelInfoSP&amp;#010;" />
        </header>
@@ -7073,7 +7073,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="44" tqparent_class="44" fileExt=".java" fileName="Q_INT32" >
+    <classifiercodedocument writeOutCode="true" package="" id="44" parent_class="44" fileExt=".java" fileName="Q_INT32" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7085,7 +7085,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="44" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="44" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_INT32&amp;#010;" />
        </header>
@@ -7148,7 +7148,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="49" tqparent_class="49" fileExt=".java" fileName="bool" >
+    <classifiercodedocument writeOutCode="true" package="" id="49" parent_class="49" fileExt=".java" fileName="bool" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7160,7 +7160,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="49" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="49" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Bool&amp;#010;" />
        </header>
@@ -7223,7 +7223,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="53" tqparent_class="53" fileExt=".java" fileName="Q_UINT8" >
+    <classifiercodedocument writeOutCode="true" package="" id="53" parent_class="53" fileExt=".java" fileName="Q_UINT8" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7235,7 +7235,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="53" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="53" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT8&amp;#010;" />
        </header>
@@ -7298,7 +7298,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="54" tqparent_class="54" fileExt=".java" fileName="const Q_UINT8*" >
+    <classifiercodedocument writeOutCode="true" package="" id="54" parent_class="54" fileExt=".java" fileName="const Q_UINT8*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7310,7 +7310,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="54" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="54" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const Q_UINT8*&amp;#010;" />
        </header>
@@ -7373,7 +7373,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="57" tqparent_class="57" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="57" parent_class="57" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7385,7 +7385,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="57" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="57" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QString&amp;#010;" />
        </header>
@@ -7448,7 +7448,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="69" tqparent_class="69" fileExt=".java" fileName="KisCompositeOpList" >
+    <classifiercodedocument writeOutCode="true" package="" id="69" parent_class="69" fileExt=".java" fileName="KisCompositeOpList" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7460,7 +7460,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="69" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="69" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCompositeOpList&amp;#010;" />
        </header>
@@ -7523,7 +7523,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="72" tqparent_class="72" fileExt=".java" fileName="vKisProfileSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="72" parent_class="72" fileExt=".java" fileName="vKisProfileSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7535,7 +7535,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="72" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="72" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisProfileSP&amp;#010;" />
        </header>
@@ -7598,7 +7598,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="75" tqparent_class="75" fileExt=".java" fileName="QColor" >
+    <classifiercodedocument writeOutCode="true" package="" id="75" parent_class="75" fileExt=".java" fileName="QColor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7610,7 +7610,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="75" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="75" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QColor&amp;#010;" />
        </header>
@@ -7673,7 +7673,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="76" tqparent_class="76" fileExt=".java" fileName="const QColor&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="76" parent_class="76" fileExt=".java" fileName="const QColor&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7685,7 +7685,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="76" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="76" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QColor&amp;&amp;#010;" />
        </header>
@@ -7748,7 +7748,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="78" tqparent_class="78" fileExt=".java" fileName="Q_UINT8*" >
+    <classifiercodedocument writeOutCode="true" package="" id="78" parent_class="78" fileExt=".java" fileName="Q_UINT8*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7760,7 +7760,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="78" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="78" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT8*&amp;#010;" />
        </header>
@@ -7823,7 +7823,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="80" tqparent_class="80" fileExt=".java" fileName="KisProfileSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="80" parent_class="80" fileExt=".java" fileName="KisProfileSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7835,7 +7835,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="80" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="80" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProfileSP&amp;#010;" />
        </header>
@@ -7898,7 +7898,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="84" tqparent_class="84" fileExt=".java" fileName="QUANTUM" >
+    <classifiercodedocument writeOutCode="true" package="" id="84" parent_class="84" fileExt=".java" fileName="QUANTUM" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7910,7 +7910,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="84" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="84" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QUANTUM&amp;#010;" />
        </header>
@@ -7973,7 +7973,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="90" tqparent_class="90" fileExt=".java" fileName="QColor*" >
+    <classifiercodedocument writeOutCode="true" package="" id="90" parent_class="90" fileExt=".java" fileName="QColor*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7985,7 +7985,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="90" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="90" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QColor*&amp;#010;" />
        </header>
@@ -8048,7 +8048,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="96" tqparent_class="96" fileExt=".java" fileName="QUANTUM*" >
+    <classifiercodedocument writeOutCode="true" package="" id="96" parent_class="96" fileExt=".java" fileName="QUANTUM*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8060,7 +8060,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="96" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="96" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QUANTUM*&amp;#010;" />
        </header>
@@ -8123,7 +8123,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="109" tqparent_class="109" fileExt=".java" fileName="KisPixel&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="109" parent_class="109" fileExt=".java" fileName="KisPixel&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8135,7 +8135,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="109" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="109" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPixel&amp;&amp;#010;" />
        </header>
@@ -8198,7 +8198,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="121" tqparent_class="121" fileExt=".java" fileName="QImage" >
+    <classifiercodedocument writeOutCode="true" package="" id="121" parent_class="121" fileExt=".java" fileName="QImage" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8210,7 +8210,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="121" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="121" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QImage&amp;#010;" />
        </header>
@@ -8273,7 +8273,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="126" tqparent_class="126" fileExt=".java" fileName="KisAbstractColorSpace*" >
+    <classifiercodedocument writeOutCode="true" package="" id="126" parent_class="126" fileExt=".java" fileName="KisAbstractColorSpace*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8285,7 +8285,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="126" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="126" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAbstractColorSpace*&amp;#010;" />
        </header>
@@ -8348,7 +8348,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="150" tqparent_class="150" fileExt=".java" fileName="Q_UINT16" >
+    <classifiercodedocument writeOutCode="true" package="" id="150" parent_class="150" fileExt=".java" fileName="Q_UINT16" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8360,7 +8360,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="150" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="150" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT16&amp;#010;" />
        </header>
@@ -8423,7 +8423,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="151" tqparent_class="151" fileExt=".java" fileName="Q_UINT16*" >
+    <classifiercodedocument writeOutCode="true" package="" id="151" parent_class="151" fileExt=".java" fileName="Q_UINT16*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8435,7 +8435,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="151" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="151" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT16*&amp;#010;" />
        </header>
@@ -8498,7 +8498,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="153" tqparent_class="153" fileExt=".java" fileName="KisColorAdjustment" >
+    <classifiercodedocument writeOutCode="true" package="" id="153" parent_class="153" fileExt=".java" fileName="KisColorAdjustment" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8510,7 +8510,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="153" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="153" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisColorAdjustment&amp;#010;" />
        </header>
@@ -8573,7 +8573,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="154" tqparent_class="154" fileExt=".java" fileName="KisColorAdjustment*" >
+    <classifiercodedocument writeOutCode="true" package="" id="154" parent_class="154" fileExt=".java" fileName="KisColorAdjustment*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8585,7 +8585,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="154" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="154" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisColorAdjustment*&amp;#010;" />
        </header>
@@ -8648,7 +8648,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="163" tqparent_class="163" fileExt=".java" fileName="Q_INT8" >
+    <classifiercodedocument writeOutCode="true" package="" id="163" parent_class="163" fileExt=".java" fileName="Q_INT8" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8660,7 +8660,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="163" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="163" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_INT8&amp;#010;" />
        </header>
@@ -8723,7 +8723,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="165" tqparent_class="165" fileExt=".java" fileName="const Q_UINT8**" >
+    <classifiercodedocument writeOutCode="true" package="" id="165" parent_class="165" fileExt=".java" fileName="const Q_UINT8**" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8735,7 +8735,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="165" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="165" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const Q_UINT8**&amp;#010;" />
        </header>
@@ -8798,7 +8798,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="171" tqparent_class="171" fileExt=".java" fileName="Q_UINT8**" >
+    <classifiercodedocument writeOutCode="true" package="" id="171" parent_class="171" fileExt=".java" fileName="Q_UINT8**" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8810,7 +8810,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="171" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="171" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT8**&amp;#010;" />
        </header>
@@ -8873,7 +8873,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="173" tqparent_class="173" fileExt=".java" fileName="Q_INT32*" >
+    <classifiercodedocument writeOutCode="true" package="" id="173" parent_class="173" fileExt=".java" fileName="Q_INT32*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8885,7 +8885,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="173" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="173" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_INT32*&amp;#010;" />
        </header>
@@ -8948,7 +8948,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="175" tqparent_class="175" fileExt=".java" fileName="enumChannelFlags" >
+    <classifiercodedocument writeOutCode="true" package="" id="175" parent_class="175" fileExt=".java" fileName="enumChannelFlags" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8960,7 +8960,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="175" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="175" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumChannelFlags&amp;#010;" />
        </header>
@@ -9023,7 +9023,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="201" tqparent_class="201" fileExt=".java" fileName="KisCompositeOp" >
+    <classifiercodedocument writeOutCode="true" package="" id="201" parent_class="201" fileExt=".java" fileName="KisCompositeOp" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9035,7 +9035,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="201" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="201" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCompositeOp&amp;#010;" />
        </header>
@@ -9098,7 +9098,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="202" tqparent_class="202" fileExt=".java" fileName="const KisCompositeOp&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="202" parent_class="202" fileExt=".java" fileName="const KisCompositeOp&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9110,7 +9110,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="202" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="202" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisCompositeOp&amp;&amp;#010;" />
        </header>
@@ -9173,7 +9173,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="222" tqparent_class="222" fileExt=".java" fileName="cmsHTRANSFORM" >
+    <classifiercodedocument writeOutCode="true" package="" id="222" parent_class="222" fileExt=".java" fileName="cmsHTRANSFORM" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9185,7 +9185,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="222" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="222" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CmsHTRANSFORM&amp;#010;" />
        </header>
@@ -9248,7 +9248,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="226" tqparent_class="226" fileExt=".java" fileName=TQSTRINGLIST_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="226" parent_class="226" fileExt=".java" fileName=TQSTRINGLIST_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9260,7 +9260,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="226" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="226" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QStringList&amp;#010;" />
        </header>
@@ -9323,7 +9323,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisAbstractColorSpace" id="237" tqparent_class="237" fileExt=".java" fileName="TransformMap" >
+    <classifiercodedocument writeOutCode="true" package="KisAbstractColorSpace" id="237" parent_class="237" fileExt=".java" fileName="TransformMap" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisAbstractColorSpace;&amp;#010;" >
        <header>
@@ -9335,7 +9335,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="237" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="237" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class TransformMap&amp;#010;" />
        </header>
@@ -9398,7 +9398,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="240" tqparent_class="240" fileExt=".java" fileName="const KisAbstractColorSpace&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="240" parent_class="240" fileExt=".java" fileName="const KisAbstractColorSpace&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9410,7 +9410,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="240" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="240" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisAbstractColorSpace&amp;&amp;#010;" />
        </header>
@@ -9473,7 +9473,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="244" tqparent_class="244" fileExt=".java" fileName="KisAbstractColorSpace&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="244" parent_class="244" fileExt=".java" fileName="KisAbstractColorSpace&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9485,7 +9485,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="244" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="244" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAbstractColorSpace&amp;&amp;#010;" />
        </header>
@@ -9548,7 +9548,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="247" tqparent_class="247" fileExt=".java" fileName="KisU8BaseColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="247" parent_class="247" fileExt=".java" fileName="KisU8BaseColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9560,7 +9560,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="247" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="247" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisU8BaseColorSpace&amp;#010; Copyright (c) 2005 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;This class is the base for all 8-bit/channel colorspaces" />
        </header>
@@ -9570,7 +9570,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="576" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisCmykColorSpace  = new KisCmykColorSpace ( );" >
+          <ccfdeclarationcodeblock parent_id="576" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisCmykColorSpace  = new KisCmykColorSpace ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -9604,27 +9604,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="576" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="576" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="576" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="576" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="576" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="576" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisCmykColorSpace to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="576" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="576" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisCmykColorSpace from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="576" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="576" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -9644,7 +9644,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="251" tag="operation_251" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="251" tag="operation_251" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param cmType &amp;#010;@param colorSpaceSignature &amp;#010;@return void  " />
              </header>
@@ -9660,176 +9660,176 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="248" field_type="3866701" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="248" field_type="3866701" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAbstractColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAbstractColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="248" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="248" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="256" field_type="6619235" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="256" field_type="6619235" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisAlphaColorSpace  = new KisAlphaColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisAlphaColorSpace  = new KisAlphaColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAlphaColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAlphaColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="256" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="576" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="576" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="576" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisCmykColorSpace  = new KisCmykColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="576" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisCmykColorSpace  = new KisCmykColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="576" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="576" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="576" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="576" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="576" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="576" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisCmykColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="576" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="576" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisCmykColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="576" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="576" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="670" field_type="94" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="670" field_type="94" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisGrayColorSpace  = new KisGrayColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisGrayColorSpace  = new KisGrayColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisGrayColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisGrayColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1387" field_type="65" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1387" field_type="65" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisRgbColorSpace  = new KisRgbColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisRgbColorSpace  = new KisRgbColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisRgbColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisRgbColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -9837,7 +9837,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="255" tqparent_class="255" fileExt=".java" fileName="KisAlphaColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="255" parent_class="255" fileExt=".java" fileName="KisAlphaColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9849,7 +9849,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="255" tag="ClassDeclBlock" canDelete="false" >
+      <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." />
        </header>
@@ -9859,12 +9859,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="256" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
+          <ccfdeclarationcodeblock parent_id="256" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="349" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="349" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -9898,37 +9898,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="256" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="256" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="256" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="256" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="256" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="256" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU8BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="256" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="256" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU8BaseColorSpace from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="256" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="256" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="349" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="349" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="349" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="349" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
@@ -9948,122 +9948,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="259" tag="operation_259" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="259" tag="operation_259" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="260" tag="operation_260" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="260" tag="operation_260" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="261" tag="operation_261" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="261" tag="operation_261" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="265" tag="operation_265" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="265" tag="operation_265" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="270" tag="operation_270" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="270" tag="operation_270" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="273" tag="operation_273" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="273" tag="operation_273" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="277" tag="operation_277" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="277" tag="operation_277" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="282" tag="operation_282" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="282" tag="operation_282" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="285" tag="operation_285" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="285" tag="operation_285" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="288" tag="operation_288" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="288" tag="operation_288" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 &amp;#010;@return Q_INT8  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="291" tag="operation_291" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="291" tag="operation_291" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="296" tag="operation_296" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="296" tag="operation_296" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="297" tag="operation_297" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="297" tag="operation_297" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="298" tag="operation_298" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="298" tag="operation_298" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="299" tag="operation_299" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="299" tag="operation_299" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="300" tag="operation_300" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="300" tag="operation_300" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="301" tag="operation_301" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="301" tag="operation_301" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="304" tag="operation_304" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="304" tag="operation_304" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="307" tag="operation_307" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="307" tag="operation_307" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="315" tag="operation_315" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="315" tag="operation_315" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="321" tag="operation_321" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="321" tag="operation_321" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param kernelValues &amp;#010;@param channelFlags &amp;#010;@param dst &amp;#010;@param factor &amp;#010;@param offset &amp;#010;@param nColors &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="329" tag="operation_329" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="329" tag="operation_329" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Convert a byte array of srcLen pixels *src to the specified color space&amp;#010;and put the converted bytes into the prepared byte array *dst.&amp;#010;&amp;#010;Returns false if the conversion failed, true if it succeeded" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="337" tag="operation_337" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="337" tag="operation_337" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="348" tag="operation_348" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="348" tag="operation_348" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
@@ -10079,56 +10079,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="256" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="256" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="256" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="256" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="256" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="256" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="256" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="256" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="256" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="256" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU8BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="256" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="256" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU8BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="256" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="256" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="256" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="349" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="349" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="349" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="349" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="349" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="349" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="349" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="349" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
@@ -10136,7 +10136,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="350" tqparent_class="350" fileExt=".java" fileName="KisF32BaseColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="350" parent_class="350" fileExt=".java" fileName="KisF32BaseColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10148,7 +10148,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="350" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="350" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisF32BaseColorSpace&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;This class is the base for all 32-bit float colorspaces." />
        </header>
@@ -10158,7 +10158,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="880" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisF32RgbColorSpace  = new KisF32RgbColorSpace ( );" >
+          <ccfdeclarationcodeblock parent_id="880" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisF32RgbColorSpace  = new KisF32RgbColorSpace ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -10192,27 +10192,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="880" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="880" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="880" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="880" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="880" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="880" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisF32RgbColorSpace to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="880" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="880" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisF32RgbColorSpace from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="880" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="880" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -10232,7 +10232,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="354" tag="operation_354" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="354" tag="operation_354" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param cmType &amp;#010;@param colorSpaceSignature &amp;#010;@return void  " />
              </header>
@@ -10248,71 +10248,71 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="351" field_type="65" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="351" field_type="65" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAbstractColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAbstractColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="351" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="351" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="880" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="880" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="880" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisF32RgbColorSpace  = new KisF32RgbColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="880" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisF32RgbColorSpace  = new KisF32RgbColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="880" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="880" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="880" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="880" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="880" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="880" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisF32RgbColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="880" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="880" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisF32RgbColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="880" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="880" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -10320,7 +10320,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="358" tqparent_class="358" fileExt=".java" fileName="KisU16BaseColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="358" parent_class="358" fileExt=".java" fileName="KisU16BaseColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10332,7 +10332,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="358" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="358" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisU16BaseColorSpace&amp;#010; Copyright (c) 2005 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;This is the base class for 16-bit/channel colorspaces. It defines&amp;#010;a number of common methods, like handling 16-bit alpha and up-&amp;#010;and down-scaling of channels." />
        </header>
@@ -10342,17 +10342,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
+          <ccfdeclarationcodeblock parent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="364" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+          <ccfdeclarationcodeblock parent_id="364" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="370" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisXyzColorSpace  = new KisXyzColorSpace ( );" >
+          <ccfdeclarationcodeblock parent_id="370" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisXyzColorSpace  = new KisXyzColorSpace ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -10386,47 +10386,47 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
+              <codeaccessormethod accessType="0" parent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;@return the value of U16_OPACITY_OPAQUE" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="363" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
+              <codeaccessormethod accessType="1" parent_id="363" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
+              <codeaccessormethod accessType="0" parent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;@return the value of U16_OPACITY_TRANSPARENT" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
+              <codeaccessormethod accessType="1" parent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="370" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="370" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="370" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="370" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="370" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="370" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisXyzColorSpace to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="370" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="370" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisXyzColorSpace from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="370" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="370" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -10446,7 +10446,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="365" tag="operation_365" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="365" tag="operation_365" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param cmType &amp;#010;@param colorSpaceSignature &amp;#010;@return void  " />
              </header>
@@ -10462,146 +10462,146 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="359" field_type="2097190" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="359" field_type="2097190" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAbstractColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAbstractColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="359" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="359" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="363" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="363" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
+       <ccfdeclarationcodeblock parent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
+       <codeaccessormethod accessType="0" parent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;@return the value of U16_OPACITY_OPAQUE" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="363" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="363" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="364" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="364" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="364" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+       <ccfdeclarationcodeblock parent_id="364" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
+       <codeaccessormethod accessType="0" parent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;@return the value of U16_OPACITY_TRANSPARENT" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
+       <codeaccessormethod accessType="1" parent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="370" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="370" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="370" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisXyzColorSpace  = new KisXyzColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="370" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisXyzColorSpace  = new KisXyzColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="370" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="370" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="370" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="370" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="370" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="370" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisXyzColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="370" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="370" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisXyzColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="370" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="370" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1135" field_type="92" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1135" field_type="92" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisRgbU16ColorSpace  = new KisRgbU16ColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisRgbU16ColorSpace  = new KisRgbU16ColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisRgbU16ColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisRgbU16ColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -10609,7 +10609,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="362" tqparent_class="362" fileExt=".java" fileName="const Q_UINT16" >
+    <classifiercodedocument writeOutCode="true" package="" id="362" parent_class="362" fileExt=".java" fileName="const Q_UINT16" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10621,7 +10621,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="362" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="362" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const Q_UINT16&amp;#010;" />
        </header>
@@ -10684,7 +10684,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="369" tqparent_class="369" fileExt=".java" fileName="KisXyzColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="369" parent_class="369" fileExt=".java" fileName="KisXyzColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10696,7 +10696,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="369" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="369" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisXyzColorSpace&amp;#010; Copyright (c) 2005 Boudewijn Rempt (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." />
        </header>
@@ -10706,42 +10706,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="566" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="566" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="567" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
+          <ccfdeclarationcodeblock parent_id="567" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="568" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
+          <ccfdeclarationcodeblock parent_id="568" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="570" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_X;" >
+          <ccfdeclarationcodeblock parent_id="570" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_X;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="571" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Y;" >
+          <ccfdeclarationcodeblock parent_id="571" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Y;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="572" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Z;" >
+          <ccfdeclarationcodeblock parent_id="572" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Z;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="573" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
+          <ccfdeclarationcodeblock parent_id="573" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="574" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
+          <ccfdeclarationcodeblock parent_id="574" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
            </header>
@@ -10775,82 +10775,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="566" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="566" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="566" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="566" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="567" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
+              <codeaccessormethod accessType="0" parent_id="567" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultToRGB&amp;#010;&amp;#010;@return the value of m_defaultToRGB" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="567" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
+              <codeaccessormethod accessType="1" parent_id="567" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultToRGB&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
+              <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultFromRGB&amp;#010;&amp;#010;@return the value of m_defaultFromRGB" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
+              <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultFromRGB&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="570" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
+              <codeaccessormethod accessType="0" parent_id="570" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_X&amp;#010;&amp;#010;@return the value of PIXEL_X" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="570" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
+              <codeaccessormethod accessType="1" parent_id="570" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_X&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="571" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
+              <codeaccessormethod accessType="0" parent_id="571" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_Y&amp;#010;&amp;#010;@return the value of PIXEL_Y" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="571" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
+              <codeaccessormethod accessType="1" parent_id="571" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_Y&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="572" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
+              <codeaccessormethod accessType="0" parent_id="572" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_Z&amp;#010;&amp;#010;@return the value of PIXEL_Z" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="572" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
+              <codeaccessormethod accessType="1" parent_id="572" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_Z&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="573" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
+              <codeaccessormethod accessType="0" parent_id="573" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_ALPHA" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="573" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
+              <codeaccessormethod accessType="1" parent_id="573" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_ALPHA&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
+              <codeaccessormethod accessType="0" parent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
+              <codeaccessormethod accessType="1" parent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
                </header>
@@ -10870,174 +10870,174 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="378" tag="operation_378" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="378" tag="operation_378" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="379" tag="operation_379" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="379" tag="operation_379" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="380" tag="operation_380" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="380" tag="operation_380" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="384" tag="operation_384" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="384" tag="operation_384" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="389" tag="operation_389" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="389" tag="operation_389" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="392" tag="operation_392" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="392" tag="operation_392" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="396" tag="operation_396" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="396" tag="operation_396" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="400" tag="operation_400" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="400" tag="operation_400" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="405" tag="operation_405" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="405" tag="operation_405" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="408" tag="operation_408" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="408" tag="operation_408" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="411" tag="operation_411" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="411" tag="operation_411" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 &amp;#010;@return Q_INT8  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="414" tag="operation_414" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="414" tag="operation_414" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="419" tag="operation_419" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="419" tag="operation_419" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="420" tag="operation_420" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="420" tag="operation_420" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="421" tag="operation_421" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="421" tag="operation_421" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="422" tag="operation_422" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="422" tag="operation_422" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="423" tag="operation_423" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="423" tag="operation_423" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="424" tag="operation_424" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="424" tag="operation_424" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="427" tag="operation_427" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="427" tag="operation_427" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="430" tag="operation_430" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="430" tag="operation_430" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="438" tag="operation_438" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="438" tag="operation_438" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="444" tag="operation_444" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="444" tag="operation_444" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="455" tag="operation_455" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="455" tag="operation_455" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="456" tag="operation_456" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="466" tag="operation_466" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="476" tag="operation_476" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="486" tag="operation_486" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="496" tag="operation_496" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="506" tag="operation_506" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="516" tag="operation_516" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="526" tag="operation_526" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="536" tag="operation_536" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="546" tag="operation_546" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="556" tag="operation_556" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -11051,196 +11051,196 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="370" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="370" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU16BaseColorSpace  = new KisU16BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU16BaseColorSpace  = new KisU16BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU16BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU16BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="370" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="370" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="566" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="566" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="566" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="566" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="566" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="566" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="566" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="566" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="567" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="567" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="567" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
+       <ccfdeclarationcodeblock parent_id="567" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="567" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="567" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultToRGB&amp;#010;&amp;#010;@return the value of m_defaultToRGB" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="567" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="567" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultToRGB&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="568" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
+       <ccfdeclarationcodeblock parent_id="568" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultFromRGB&amp;#010;&amp;#010;@return the value of m_defaultFromRGB" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultFromRGB&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="570" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="570" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="570" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_X;" >
+       <ccfdeclarationcodeblock parent_id="570" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_X;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="570" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
+       <codeaccessormethod accessType="0" parent_id="570" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_X&amp;#010;&amp;#010;@return the value of PIXEL_X" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="570" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
+       <codeaccessormethod accessType="1" parent_id="570" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_X&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="571" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="571" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="571" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Y;" >
+       <ccfdeclarationcodeblock parent_id="571" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Y;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="571" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
+       <codeaccessormethod accessType="0" parent_id="571" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_Y&amp;#010;&amp;#010;@return the value of PIXEL_Y" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="571" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
+       <codeaccessormethod accessType="1" parent_id="571" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_Y&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="572" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="572" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="572" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Z;" >
+       <ccfdeclarationcodeblock parent_id="572" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_Z;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="572" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
+       <codeaccessormethod accessType="0" parent_id="572" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_Z&amp;#010;&amp;#010;@return the value of PIXEL_Z" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="572" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
+       <codeaccessormethod accessType="1" parent_id="572" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_Z&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="573" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="573" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="573" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="573" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="573" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="573" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_ALPHA" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="573" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="573" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_ALPHA&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="574" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="574" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// A small buffer for conversion from and to qcolor." />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="574" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
+       <ccfdeclarationcodeblock parent_id="574" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
@@ -11248,7 +11248,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisRgbU16ColorSpace" id="373" tqparent_class="373" fileExt=".java" fileName="Pixel" >
+    <classifiercodedocument writeOutCode="true" package="KisRgbU16ColorSpace" id="373" parent_class="373" fileExt=".java" fileName="Pixel" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisRgbU16ColorSpace;&amp;#010;" >
        <header>
@@ -11260,7 +11260,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="373" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="373" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Pixel&amp;#010;" />
        </header>
@@ -11270,37 +11270,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 X;" >
+          <ccfdeclarationcodeblock parent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 X;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="375" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 Y;" >
+          <ccfdeclarationcodeblock parent_id="375" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 Y;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="376" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 Z;" >
+          <ccfdeclarationcodeblock parent_id="376" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 Z;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="377" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 alpha;" >
+          <ccfdeclarationcodeblock parent_id="377" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 alpha;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1130" tag="tblock_11" canDelete="false" indentLevel="1" text="public float blue;" >
+          <ccfdeclarationcodeblock parent_id="1130" tag="tblock_11" canDelete="false" indentLevel="1" text="public float blue;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1131" tag="tblock_14" canDelete="false" indentLevel="1" text="public float green;" >
+          <ccfdeclarationcodeblock parent_id="1131" tag="tblock_14" canDelete="false" indentLevel="1" text="public float green;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1132" tag="tblock_17" canDelete="false" indentLevel="1" text="public float red;" >
+          <ccfdeclarationcodeblock parent_id="1132" tag="tblock_17" canDelete="false" indentLevel="1" text="public float red;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -11334,72 +11334,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
+              <codeaccessormethod accessType="0" parent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of X&amp;#010;&amp;#010;@return the value of X" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="374" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
+              <codeaccessormethod accessType="1" parent_id="374" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of X&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="375" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
+              <codeaccessormethod accessType="0" parent_id="375" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of Y&amp;#010;&amp;#010;@return the value of Y" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="375" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
+              <codeaccessormethod accessType="1" parent_id="375" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of Y&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="376" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
+              <codeaccessormethod accessType="0" parent_id="376" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of Z&amp;#010;&amp;#010;@return the value of Z" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="376" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
+              <codeaccessormethod accessType="1" parent_id="376" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of Z&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="377" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
+              <codeaccessormethod accessType="0" parent_id="377" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of alpha&amp;#010;&amp;#010;@return the value of alpha" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="377" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
+              <codeaccessormethod accessType="1" parent_id="377" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of alpha&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1130" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
+              <codeaccessormethod accessType="0" parent_id="1130" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of blue&amp;#010;&amp;#010;@return the value of blue" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1130" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
+              <codeaccessormethod accessType="1" parent_id="1130" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of blue&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1131" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
+              <codeaccessormethod accessType="0" parent_id="1131" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of green&amp;#010;&amp;#010;@return the value of green" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
+              <codeaccessormethod accessType="1" parent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of green&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
+              <codeaccessormethod accessType="0" parent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of red&amp;#010;&amp;#010;@return the value of red" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
+              <codeaccessormethod accessType="1" parent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of red&amp;#010;&amp;#010;" />
                </header>
@@ -11429,141 +11429,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 X;" >
+       <ccfdeclarationcodeblock parent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 X;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
+       <codeaccessormethod accessType="0" parent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of X&amp;#010;&amp;#010;@return the value of X" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="374" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
+       <codeaccessormethod accessType="1" parent_id="374" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of X&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="375" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 Y;" >
+       <ccfdeclarationcodeblock parent_id="375" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 Y;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="375" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
+       <codeaccessormethod accessType="0" parent_id="375" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of Y&amp;#010;&amp;#010;@return the value of Y" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="375" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
+       <codeaccessormethod accessType="1" parent_id="375" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of Y&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="376" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 Z;" >
+       <ccfdeclarationcodeblock parent_id="376" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 Z;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="376" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
+       <codeaccessormethod accessType="0" parent_id="376" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of Z&amp;#010;&amp;#010;@return the value of Z" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="376" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
+       <codeaccessormethod accessType="1" parent_id="376" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of Z&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="377" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 alpha;" >
+       <ccfdeclarationcodeblock parent_id="377" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 alpha;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="377" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
+       <codeaccessormethod accessType="0" parent_id="377" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of alpha&amp;#010;&amp;#010;@return the value of alpha" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="377" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
+       <codeaccessormethod accessType="1" parent_id="377" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of alpha&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1130" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1130" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1130" tag="tblock_11" canDelete="false" indentLevel="1" text="public float blue;" >
+       <ccfdeclarationcodeblock parent_id="1130" tag="tblock_11" canDelete="false" indentLevel="1" text="public float blue;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1130" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
+       <codeaccessormethod accessType="0" parent_id="1130" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of blue&amp;#010;&amp;#010;@return the value of blue" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1130" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
+       <codeaccessormethod accessType="1" parent_id="1130" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of blue&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1131" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1131" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1131" tag="tblock_14" canDelete="false" indentLevel="1" text="public float green;" >
+       <ccfdeclarationcodeblock parent_id="1131" tag="tblock_14" canDelete="false" indentLevel="1" text="public float green;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1131" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
+       <codeaccessormethod accessType="0" parent_id="1131" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of green&amp;#010;&amp;#010;@return the value of green" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
+       <codeaccessormethod accessType="1" parent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of green&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1132" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1132" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1132" tag="tblock_17" canDelete="false" indentLevel="1" text="public float red;" >
+       <ccfdeclarationcodeblock parent_id="1132" tag="tblock_17" canDelete="false" indentLevel="1" text="public float red;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
+       <codeaccessormethod accessType="0" parent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of red&amp;#010;&amp;#010;@return the value of red" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
+       <codeaccessormethod accessType="1" parent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of red&amp;#010;&amp;#010;" />
         </header>
@@ -11571,7 +11571,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="569" tqparent_class="569" fileExt=".java" fileName="const Q_UINT8" >
+    <classifiercodedocument writeOutCode="true" package="" id="569" parent_class="569" fileExt=".java" fileName="const Q_UINT8" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11583,7 +11583,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="569" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="569" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const Q_UINT8&amp;#010;" />
        </header>
@@ -11646,7 +11646,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="575" tqparent_class="575" fileExt=".java" fileName="KisCmykColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="575" parent_class="575" fileExt=".java" fileName="KisCmykColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11658,7 +11658,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="575" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="575" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCmykColorSpace&amp;#010; Copyright (c) 2003 Boudewijn Rempt (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." />
        </header>
@@ -11668,47 +11668,47 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="660" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="660" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="661" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
+          <ccfdeclarationcodeblock parent_id="661" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="662" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
+          <ccfdeclarationcodeblock parent_id="662" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
+          <ccfdeclarationcodeblock parent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="664" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CYAN;" >
+          <ccfdeclarationcodeblock parent_id="664" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CYAN;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="665" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_MAGENTA;" >
+          <ccfdeclarationcodeblock parent_id="665" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_MAGENTA;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="666" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_YELLOW;" >
+          <ccfdeclarationcodeblock parent_id="666" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_YELLOW;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="667" tag="tblock_20" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLACK;" >
+          <ccfdeclarationcodeblock parent_id="667" tag="tblock_20" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLACK;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="668" tag="tblock_23" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CMYK_ALPHA;" >
+          <ccfdeclarationcodeblock parent_id="668" tag="tblock_23" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CMYK_ALPHA;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -11742,92 +11742,92 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="660" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="660" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="660" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="660" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="661" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
+              <codeaccessormethod accessType="0" parent_id="661" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultToRGB&amp;#010;&amp;#010;@return the value of m_defaultToRGB" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="661" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
+              <codeaccessormethod accessType="1" parent_id="661" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultToRGB&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="662" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
+              <codeaccessormethod accessType="0" parent_id="662" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultFromRGB&amp;#010;&amp;#010;@return the value of m_defaultFromRGB" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="662" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
+              <codeaccessormethod accessType="1" parent_id="662" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultFromRGB&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="663" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
+              <codeaccessormethod accessType="0" parent_id="663" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_qcolordata&amp;#010;&amp;#010;@return the value of m_qcolordata" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="663" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
+              <codeaccessormethod accessType="1" parent_id="663" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_qcolordata&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="664" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
+              <codeaccessormethod accessType="0" parent_id="664" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_CYAN&amp;#010;&amp;#010;@return the value of PIXEL_CYAN" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="664" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
+              <codeaccessormethod accessType="1" parent_id="664" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_CYAN&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="665" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
+              <codeaccessormethod accessType="0" parent_id="665" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_MAGENTA&amp;#010;&amp;#010;@return the value of PIXEL_MAGENTA" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="665" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
+              <codeaccessormethod accessType="1" parent_id="665" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_MAGENTA&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="666" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
+              <codeaccessormethod accessType="0" parent_id="666" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_YELLOW&amp;#010;&amp;#010;@return the value of PIXEL_YELLOW" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="666" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
+              <codeaccessormethod accessType="1" parent_id="666" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_YELLOW&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="667" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
+              <codeaccessormethod accessType="0" parent_id="667" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_BLACK&amp;#010;&amp;#010;@return the value of PIXEL_BLACK" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="667" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
+              <codeaccessormethod accessType="1" parent_id="667" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_BLACK&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="668" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
+              <codeaccessormethod accessType="0" parent_id="668" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_CMYK_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_CMYK_ALPHA" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="668" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
+              <codeaccessormethod accessType="1" parent_id="668" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_CMYK_ALPHA&amp;#010;&amp;#010;" />
                </header>
@@ -11847,122 +11847,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="579" tag="operation_579" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="579" tag="operation_579" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="580" tag="operation_580" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="580" tag="operation_580" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="581" tag="operation_581" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="581" tag="operation_581" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="585" tag="operation_585" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="585" tag="operation_585" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="590" tag="operation_590" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="590" tag="operation_590" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="593" tag="operation_593" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="593" tag="operation_593" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="597" tag="operation_597" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="597" tag="operation_597" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param color &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="601" tag="operation_601" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="601" tag="operation_601" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param color &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="606" tag="operation_606" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="606" tag="operation_606" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="609" tag="operation_609" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="609" tag="operation_609" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="612" tag="operation_612" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="612" tag="operation_612" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="617" tag="operation_617" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="617" tag="operation_617" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="618" tag="operation_618" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="618" tag="operation_618" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="619" tag="operation_619" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="619" tag="operation_619" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="620" tag="operation_620" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="620" tag="operation_620" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="621" tag="operation_621" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="621" tag="operation_621" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="622" tag="operation_622" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="622" tag="operation_622" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="625" tag="operation_625" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="625" tag="operation_625" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="628" tag="operation_628" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="628" tag="operation_628" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="636" tag="operation_636" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="636" tag="operation_636" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param adjust &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="639" tag="operation_639" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="639" tag="operation_639" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="650" tag="operation_650" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="650" tag="operation_650" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="651" tag="operation_651" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="651" tag="operation_651" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="652" tag="operation_652" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="652" tag="operation_652" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dstRowStart &amp;#010;@param dstRowStride &amp;#010;@param srcRowStart &amp;#010;@param srcRowStride &amp;#010;@param rows &amp;#010;@param numColumns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
@@ -11978,216 +11978,216 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="576" field_type="49" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="576" field_type="49" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU8BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU8BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="576" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="576" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="660" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="660" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="660" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="660" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="660" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="660" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="661" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
+       <ccfdeclarationcodeblock parent_id="661" tag="tblock_2" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultToRGB;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="661" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="661" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultToRGB&amp;#010;&amp;#010;@return the value of m_defaultToRGB" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="661" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="661" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultToRGB&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="662" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
+       <ccfdeclarationcodeblock parent_id="662" tag="tblock_5" canDelete="false" indentLevel="1" text="private cmsHTRANSFORM m_defaultFromRGB;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="662" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="662" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_defaultFromRGB&amp;#010;&amp;#010;@return the value of m_defaultFromRGB" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="662" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="662" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_defaultFromRGB&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="663" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="663" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
+       <ccfdeclarationcodeblock parent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_UINT8* m_qcolordata;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="663" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="663" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_qcolordata&amp;#010;&amp;#010;@return the value of m_qcolordata" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="663" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="663" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_qcolordata&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="664" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="664" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="664" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CYAN;" >
+       <ccfdeclarationcodeblock parent_id="664" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CYAN;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="664" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
+       <codeaccessormethod accessType="0" parent_id="664" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_CYAN&amp;#010;&amp;#010;@return the value of PIXEL_CYAN" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="664" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
+       <codeaccessormethod accessType="1" parent_id="664" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_CYAN&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="665" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="665" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="665" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_MAGENTA;" >
+       <ccfdeclarationcodeblock parent_id="665" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_MAGENTA;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="665" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
+       <codeaccessormethod accessType="0" parent_id="665" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_MAGENTA&amp;#010;&amp;#010;@return the value of PIXEL_MAGENTA" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="665" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
+       <codeaccessormethod accessType="1" parent_id="665" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_MAGENTA&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="666" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="666" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="666" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_YELLOW;" >
+       <ccfdeclarationcodeblock parent_id="666" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_YELLOW;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="666" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
+       <codeaccessormethod accessType="0" parent_id="666" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_YELLOW&amp;#010;&amp;#010;@return the value of PIXEL_YELLOW" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="666" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
+       <codeaccessormethod accessType="1" parent_id="666" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_YELLOW&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="667" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="667" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="667" tag="tblock_20" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLACK;" >
+       <ccfdeclarationcodeblock parent_id="667" tag="tblock_20" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLACK;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="667" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
+       <codeaccessormethod accessType="0" parent_id="667" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_BLACK&amp;#010;&amp;#010;@return the value of PIXEL_BLACK" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="667" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
+       <codeaccessormethod accessType="1" parent_id="667" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_BLACK&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="668" tag="tblock_23" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CMYK_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="668" tag="tblock_23" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_CMYK_ALPHA;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="668" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="668" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_CMYK_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_CMYK_ALPHA" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="668" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="668" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_CMYK_ALPHA&amp;#010;&amp;#010;" />
         </header>
@@ -12195,7 +12195,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="669" tqparent_class="669" fileExt=".java" fileName="KisGrayColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="669" parent_class="669" fileExt=".java" fileName="KisGrayColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12207,7 +12207,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="669" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="669" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGrayColorSpace&amp;#010; Copyright (c) 2004 Cyrille Berger &lt;cberger@cberger.net>&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." />
        </header>
@@ -12217,17 +12217,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="860" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="860" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="861" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY;" >
+          <ccfdeclarationcodeblock parent_id="861" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="862" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY_ALPHA;" >
+          <ccfdeclarationcodeblock parent_id="862" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY_ALPHA;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -12261,32 +12261,32 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
+              <codeaccessormethod accessType="0" parent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GRAY&amp;#010;&amp;#010;@return the value of PIXEL_GRAY" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="861" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
+              <codeaccessormethod accessType="1" parent_id="861" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GRAY&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="862" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
+              <codeaccessormethod accessType="0" parent_id="862" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GRAY_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_GRAY_ALPHA" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="862" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
+              <codeaccessormethod accessType="1" parent_id="862" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GRAY_ALPHA&amp;#010;&amp;#010;" />
                </header>
@@ -12306,179 +12306,179 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="673" tag="operation_673" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="673" tag="operation_673" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="674" tag="operation_674" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="674" tag="operation_674" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="675" tag="operation_675" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="675" tag="operation_675" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param gray &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="679" tag="operation_679" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="679" tag="operation_679" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param gray &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="683" tag="operation_683" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="683" tag="operation_683" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="687" tag="operation_687" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="687" tag="operation_687" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="692" tag="operation_692" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="692" tag="operation_692" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="695" tag="operation_695" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="695" tag="operation_695" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="699" tag="operation_699" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="699" tag="operation_699" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="703" tag="operation_703" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="703" tag="operation_703" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="708" tag="operation_708" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="708" tag="operation_708" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="711" tag="operation_711" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="711" tag="operation_711" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="714" tag="operation_714" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="714" tag="operation_714" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 &amp;#010;@return Q_INT8  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="717" tag="operation_717" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="717" tag="operation_717" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="722" tag="operation_722" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="722" tag="operation_722" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="723" tag="operation_723" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="723" tag="operation_723" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="724" tag="operation_724" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="724" tag="operation_724" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="725" tag="operation_725" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="725" tag="operation_725" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="726" tag="operation_726" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="726" tag="operation_726" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="727" tag="operation_727" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="727" tag="operation_727" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="730" tag="operation_730" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="730" tag="operation_730" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="733" tag="operation_733" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="733" tag="operation_733" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="741" tag="operation_741" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="741" tag="operation_741" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="747" tag="operation_747" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="747" tag="operation_747" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="758" tag="operation_758" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="758" tag="operation_758" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="759" tag="operation_759" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="769" tag="operation_769" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="779" tag="operation_779" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="789" tag="operation_789" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="799" tag="operation_799" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="809" tag="operation_809" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="819" tag="operation_819" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="829" tag="operation_829" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="839" tag="operation_839" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="849" tag="operation_849" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -12492,96 +12492,96 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="670" field_type="94" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="670" field_type="94" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU8BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU8BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="670" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="670" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="860" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="860" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="861" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="861" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="861" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY;" >
+       <ccfdeclarationcodeblock parent_id="861" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
+       <codeaccessormethod accessType="0" parent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GRAY&amp;#010;&amp;#010;@return the value of PIXEL_GRAY" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="861" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
+       <codeaccessormethod accessType="1" parent_id="861" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GRAY&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="862" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="862" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="862" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="862" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GRAY_ALPHA;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="862" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="862" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GRAY_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_GRAY_ALPHA" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="862" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="862" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GRAY_ALPHA&amp;#010;&amp;#010;" />
         </header>
@@ -12589,7 +12589,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="859" tqparent_class="859" fileExt=".java" fileName="KisGrayColorSpaceTester" >
+    <classifiercodedocument writeOutCode="true" package="" id="859" parent_class="859" fileExt=".java" fileName="KisGrayColorSpaceTester" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12601,7 +12601,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="859" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="859" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGrayColorSpaceTester&amp;#010;" />
        </header>
@@ -12664,7 +12664,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="863" tqparent_class="863" fileExt=".java" fileName="RGBF32Plugin" >
+    <classifiercodedocument writeOutCode="true" package="" id="863" parent_class="863" fileExt=".java" fileName="RGBF32Plugin" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12676,7 +12676,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="863" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="863" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class RGBF32Plugin&amp;#010; Copyright (c) 2003 Boudewijn Rempt (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;A plugin wrapper around the RGB F32 colour space strategy." />
        </header>
@@ -12686,7 +12686,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
+          <ccfdeclarationcodeblock parent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -12720,12 +12720,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
+              <codeaccessormethod accessType="0" parent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_ColorSpaceRGBF32&amp;#010;&amp;#010;@return the value of m_ColorSpaceRGBF32" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
+              <codeaccessormethod accessType="1" parent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_ColorSpaceRGBF32&amp;#010;&amp;#010;" />
                </header>
@@ -12745,12 +12745,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="869" tag="operation_869" canDelete="false" indentLevel="1" >
+            <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  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
@@ -12766,56 +12766,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="866" field_type="-1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="866" field_type="-1" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public Plugin  = new Plugin ( );" >
+       <ccfdeclarationcodeblock parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public Plugin  = new Plugin ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type Plugin to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type Plugin from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="878" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="878" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
+       <ccfdeclarationcodeblock parent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
+       <codeaccessormethod accessType="0" parent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_ColorSpaceRGBF32&amp;#010;&amp;#010;@return the value of m_ColorSpaceRGBF32" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
+       <codeaccessormethod accessType="1" parent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_ColorSpaceRGBF32&amp;#010;&amp;#010;" />
         </header>
@@ -12823,7 +12823,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="864" tqparent_class="864" fileExt=".java" fileName="KParts" >
+    <classifiercodedocument writeOutCode="true" package="" id="864" parent_class="864" fileExt=".java" fileName="KParts" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12835,7 +12835,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="864" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="864" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KParts&amp;#010;" />
        </header>
@@ -12898,7 +12898,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KParts" id="865" tqparent_class="865" fileExt=".java" fileName="Plugin" >
+    <classifiercodedocument writeOutCode="true" package="KParts" id="865" parent_class="865" fileExt=".java" fileName="Plugin" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KParts;&amp;#010;" >
        <header>
@@ -12910,7 +12910,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="865" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="865" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Plugin&amp;#010;" />
        </header>
@@ -12972,36 +12972,36 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="866" field_type="-1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="866" field_type="-1" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public RGBF32Plugin  = new RGBF32Plugin ( );" >
+       <ccfdeclarationcodeblock parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public RGBF32Plugin  = new RGBF32Plugin ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type RGBF32Plugin to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type RGBF32Plugin from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="866" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="866" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -13009,7 +13009,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="870" tqparent_class="870" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="870" parent_class="870" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13021,7 +13021,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="870" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="870" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QObject&amp;#010;" />
        </header>
@@ -13084,7 +13084,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="871" tqparent_class="871" fileExt=".java" fileName="QObject*" >
+    <classifiercodedocument writeOutCode="true" package="" id="871" parent_class="871" fileExt=".java" fileName="QObject*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13096,7 +13096,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="871" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="871" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QObject*&amp;#010;" />
        </header>
@@ -13159,7 +13159,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="873" tqparent_class="873" fileExt=".java" fileName="const char*" >
+    <classifiercodedocument writeOutCode="true" package="" id="873" parent_class="873" fileExt=".java" fileName="const char*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13171,7 +13171,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="873" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="873" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const char*&amp;#010;" />
        </header>
@@ -13234,7 +13234,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="875" tqparent_class="875" fileExt=".java" fileName="const QStringList&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="875" parent_class="875" fileExt=".java" fileName="const QStringList&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13246,7 +13246,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="875" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="875" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QStringList&amp;&amp;#010;" />
        </header>
@@ -13309,7 +13309,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="879" tqparent_class="879" fileExt=".java" fileName="KisF32RgbColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="879" parent_class="879" fileExt=".java" fileName="KisF32RgbColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13321,7 +13321,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="879" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="879" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisF32RgbColorSpace&amp;#010; Copyright (c) 2002 Patrick Julien  &lt;freak@codepimps.org>&amp;#010; Copyright (c) 2005 Adrian Page &lt;adrian@pagenet.plus.com>&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." />
        </header>
@@ -13331,27 +13331,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1125" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="1125" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1126" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
+          <ccfdeclarationcodeblock parent_id="1126" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1127" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
+          <ccfdeclarationcodeblock parent_id="1127" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1128" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
+          <ccfdeclarationcodeblock parent_id="1128" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1129" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
+          <ccfdeclarationcodeblock parent_id="1129" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -13385,52 +13385,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1125" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="1125" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1125" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1125" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1126" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
+              <codeaccessormethod accessType="0" parent_id="1126" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_BLUE&amp;#010;&amp;#010;@return the value of PIXEL_BLUE" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1126" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
+              <codeaccessormethod accessType="1" parent_id="1126" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_BLUE&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
+              <codeaccessormethod accessType="0" parent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GREEN&amp;#010;&amp;#010;@return the value of PIXEL_GREEN" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
+              <codeaccessormethod accessType="1" parent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GREEN&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
+              <codeaccessormethod accessType="0" parent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_RED&amp;#010;&amp;#010;@return the value of PIXEL_RED" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1128" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
+              <codeaccessormethod accessType="1" parent_id="1128" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_RED&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1129" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
+              <codeaccessormethod accessType="0" parent_id="1129" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_ALPHA" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1129" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
+              <codeaccessormethod accessType="1" parent_id="1129" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_ALPHA&amp;#010;&amp;#010;" />
                </header>
@@ -13450,204 +13450,204 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="883" tag="operation_883" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="883" tag="operation_883" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="884" tag="operation_884" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="884" tag="operation_884" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="885" tag="operation_885" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="885" tag="operation_885" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="891" tag="operation_891" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="891" tag="operation_891" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="898" tag="operation_898" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="898" tag="operation_898" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="902" tag="operation_902" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="902" tag="operation_902" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="907" tag="operation_907" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="907" tag="operation_907" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="910" tag="operation_910" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="910" tag="operation_910" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="914" tag="operation_914" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="914" tag="operation_914" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="918" tag="operation_918" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="918" tag="operation_918" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="923" tag="operation_923" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="923" tag="operation_923" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="926" tag="operation_926" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="926" tag="operation_926" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="929" tag="operation_929" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="929" tag="operation_929" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 &amp;#010;@return Q_INT8  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="932" tag="operation_932" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="932" tag="operation_932" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="937" tag="operation_937" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="937" tag="operation_937" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="938" tag="operation_938" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="938" tag="operation_938" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="939" tag="operation_939" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="939" tag="operation_939" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="940" tag="operation_940" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="940" tag="operation_940" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="941" tag="operation_941" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="941" tag="operation_941" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="942" tag="operation_942" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="942" tag="operation_942" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="945" tag="operation_945" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="945" tag="operation_945" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="948" tag="operation_948" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="948" tag="operation_948" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="956" tag="operation_956" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="956" tag="operation_956" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="957" tag="operation_957" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="957" tag="operation_957" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="963" tag="operation_963" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="963" tag="operation_963" 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 srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &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 srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="974" tag="operation_974" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="984" tag="operation_984" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="994" tag="operation_994" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1114" tag="operation_1114" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -13661,136 +13661,136 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="880" field_type="65" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="880" field_type="65" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisF32BaseColorSpace  = new KisF32BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisF32BaseColorSpace  = new KisF32BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisF32BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisF32BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="880" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="880" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1125" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1125" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1125" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1125" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1125" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1125" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1125" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1125" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1126" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1126" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1126" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
+       <ccfdeclarationcodeblock parent_id="1126" tag="tblock_2" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1126" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
+       <codeaccessormethod accessType="0" parent_id="1126" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_BLUE&amp;#010;&amp;#010;@return the value of PIXEL_BLUE" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1126" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1126" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_BLUE&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1127" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1127" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1127" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
+       <ccfdeclarationcodeblock parent_id="1127" tag="tblock_5" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
+       <codeaccessormethod accessType="0" parent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GREEN&amp;#010;&amp;#010;@return the value of PIXEL_GREEN" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
+       <codeaccessormethod accessType="1" parent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GREEN&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1128" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1128" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1128" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
+       <ccfdeclarationcodeblock parent_id="1128" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
+       <codeaccessormethod accessType="0" parent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_RED&amp;#010;&amp;#010;@return the value of PIXEL_RED" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1128" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
+       <codeaccessormethod accessType="1" parent_id="1128" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_RED&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1129" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1129" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1129" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="1129" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1129" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="1129" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_ALPHA" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1129" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="1129" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_ALPHA&amp;#010;&amp;#010;" />
         </header>
@@ -13798,7 +13798,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="893" tqparent_class="893" fileExt=".java" fileName="float*" >
+    <classifiercodedocument writeOutCode="true" package="" id="893" parent_class="893" fileExt=".java" fileName="float*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13810,7 +13810,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="893" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="893" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Float*&amp;#010;" />
        </header>
@@ -13873,7 +13873,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1124" tqparent_class="1124" fileExt=".java" fileName="KisF32RgbColorSpaceTester" >
+    <classifiercodedocument writeOutCode="true" package="" id="1124" parent_class="1124" fileExt=".java" fileName="KisF32RgbColorSpaceTester" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13885,7 +13885,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1124" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1124" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisF32RgbColorSpaceTester&amp;#010;" />
        </header>
@@ -13948,7 +13948,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1133" tqparent_class="1133" fileExt=".java" fileName="KisF32RgbColorSpaceSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="1133" parent_class="1133" fileExt=".java" fileName="KisF32RgbColorSpaceSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13960,7 +13960,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1133" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1133" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisF32RgbColorSpaceSP&amp;#010;" />
        </header>
@@ -14023,7 +14023,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1134" tqparent_class="1134" fileExt=".java" fileName="KisRgbU16ColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1134" parent_class="1134" fileExt=".java" fileName="KisRgbU16ColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14035,7 +14035,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1134" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1134" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRgbU16ColorSpace&amp;#010; Copyright (c) 2002 Patrick Julien  &lt;freak@codepimps.org>&amp;#010; Copyright (c) 2005 Adrian Page &lt;adrian@pagenet.plus.com>&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." />
        </header>
@@ -14045,37 +14045,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
+          <ccfdeclarationcodeblock parent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1139" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+          <ccfdeclarationcodeblock parent_id="1139" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1381" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="1381" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1382" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
+          <ccfdeclarationcodeblock parent_id="1382" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1383" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
+          <ccfdeclarationcodeblock parent_id="1383" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1384" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
+          <ccfdeclarationcodeblock parent_id="1384" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1385" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
+          <ccfdeclarationcodeblock parent_id="1385" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -14109,72 +14109,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
+              <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;@return the value of U16_OPACITY_OPAQUE" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
+              <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
+              <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;@return the value of U16_OPACITY_TRANSPARENT" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
+              <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1381" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="1381" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1381" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1381" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1382" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
+              <codeaccessormethod accessType="0" parent_id="1382" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_BLUE&amp;#010;&amp;#010;@return the value of PIXEL_BLUE" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
+              <codeaccessormethod accessType="1" parent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_BLUE&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
+              <codeaccessormethod accessType="0" parent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GREEN&amp;#010;&amp;#010;@return the value of PIXEL_GREEN" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
+              <codeaccessormethod accessType="1" parent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GREEN&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
+              <codeaccessormethod accessType="0" parent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_RED&amp;#010;&amp;#010;@return the value of PIXEL_RED" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1384" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
+              <codeaccessormethod accessType="1" parent_id="1384" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_RED&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1385" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
+              <codeaccessormethod accessType="0" parent_id="1385" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_ALPHA" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1385" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
+              <codeaccessormethod accessType="1" parent_id="1385" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_ALPHA&amp;#010;&amp;#010;" />
                </header>
@@ -14194,204 +14194,204 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1140" tag="operation_1140" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1140" tag="operation_1140" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1141" tag="operation_1141" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1141" tag="operation_1141" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1142" tag="operation_1142" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1142" tag="operation_1142" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1148" tag="operation_1148" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1148" tag="operation_1148" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1154" tag="operation_1154" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1154" tag="operation_1154" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1158" tag="operation_1158" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1158" tag="operation_1158" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1163" tag="operation_1163" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1163" tag="operation_1163" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1166" tag="operation_1166" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1166" tag="operation_1166" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1170" tag="operation_1170" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1170" tag="operation_1170" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1174" tag="operation_1174" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1174" tag="operation_1174" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1179" tag="operation_1179" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1179" tag="operation_1179" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1185" tag="operation_1185" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1185" tag="operation_1185" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 &amp;#010;@return Q_INT8  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1188" tag="operation_1188" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1188" tag="operation_1188" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1193" tag="operation_1193" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1193" tag="operation_1193" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1195" tag="operation_1195" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1195" tag="operation_1195" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1197" tag="operation_1197" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1197" tag="operation_1197" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1198" tag="operation_1198" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1198" tag="operation_1198" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1201" tag="operation_1201" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1201" tag="operation_1201" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1204" tag="operation_1204" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1204" tag="operation_1204" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1212" tag="operation_1212" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1212" tag="operation_1212" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1213" tag="operation_1213" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1213" tag="operation_1213" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1219" tag="operation_1219" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1219" tag="operation_1219" 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 srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &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 srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1230" tag="operation_1230" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1250" tag="operation_1250" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1260" tag="operation_1260" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1270" tag="operation_1270" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1320" tag="operation_1320" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1330" tag="operation_1330" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -14405,176 +14405,176 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1135" field_type="92" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1135" field_type="92" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU16BaseColorSpace  = new KisU16BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU16BaseColorSpace  = new KisU16BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU16BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU16BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1135" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1135" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
+       <ccfdeclarationcodeblock parent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_OPAQUE;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
+       <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;@return the value of U16_OPACITY_OPAQUE" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_OPAQUE&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1139" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+       <ccfdeclarationcodeblock parent_id="1139" tag="tblock_2" canDelete="false" indentLevel="1" text="static public const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
+       <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;@return the value of U16_OPACITY_TRANSPARENT" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
+       <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of U16_OPACITY_TRANSPARENT&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1381" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1381" tag="tblock_5" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1381" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1381" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1381" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1381" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1382" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1382" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1382" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
+       <ccfdeclarationcodeblock parent_id="1382" tag="tblock_8" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_BLUE;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1382" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
+       <codeaccessormethod accessType="0" parent_id="1382" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_BLUE&amp;#010;&amp;#010;@return the value of PIXEL_BLUE" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_BLUE&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1383" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
+       <ccfdeclarationcodeblock parent_id="1383" tag="tblock_11" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_GREEN;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
+       <codeaccessormethod accessType="0" parent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_GREEN&amp;#010;&amp;#010;@return the value of PIXEL_GREEN" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
+       <codeaccessormethod accessType="1" parent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_GREEN&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1384" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
+       <ccfdeclarationcodeblock parent_id="1384" tag="tblock_14" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_RED;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
+       <codeaccessormethod accessType="0" parent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_RED&amp;#010;&amp;#010;@return the value of PIXEL_RED" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1384" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
+       <codeaccessormethod accessType="1" parent_id="1384" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_RED&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1385" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1385" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1385" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="1385" tag="tblock_17" canDelete="false" indentLevel="1" text="static private const Q_UINT8 PIXEL_ALPHA;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1385" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="1385" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of PIXEL_ALPHA&amp;#010;&amp;#010;@return the value of PIXEL_ALPHA" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1385" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="1385" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of PIXEL_ALPHA&amp;#010;&amp;#010;" />
         </header>
@@ -14582,7 +14582,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1380" tqparent_class="1380" fileExt=".java" fileName="KisRgbU16ColorSpaceTester" >
+    <classifiercodedocument writeOutCode="true" package="" id="1380" parent_class="1380" fileExt=".java" fileName="KisRgbU16ColorSpaceTester" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14594,7 +14594,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1380" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1380" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRgbU16ColorSpaceTester&amp;#010;" />
        </header>
@@ -14657,7 +14657,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1386" tqparent_class="1386" fileExt=".java" fileName="KisRgbColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1386" parent_class="1386" fileExt=".java" fileName="KisRgbColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14669,7 +14669,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1386" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1386" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRgbColorSpace&amp;#010;" />
        </header>
@@ -14679,7 +14679,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -14713,12 +14713,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
@@ -14738,219 +14738,219 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1390" tag="operation_1390" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1390" tag="operation_1390" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1391" tag="operation_1391" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1391" tag="operation_1391" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1392" tag="operation_1392" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1392" tag="operation_1392" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1398" tag="operation_1398" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1398" tag="operation_1398" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1404" tag="operation_1404" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1404" tag="operation_1404" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1408" tag="operation_1408" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1408" tag="operation_1408" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1413" tag="operation_1413" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1413" tag="operation_1413" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1416" tag="operation_1416" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1416" tag="operation_1416" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1420" tag="operation_1420" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1420" tag="operation_1420" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1424" tag="operation_1424" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1424" tag="operation_1424" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1429" tag="operation_1429" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1429" tag="operation_1429" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1432" tag="operation_1432" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1432" tag="operation_1432" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1435" tag="operation_1435" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1435" tag="operation_1435" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 &amp;#010;@return Q_INT8  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1438" tag="operation_1438" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1438" tag="operation_1438" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1443" tag="operation_1443" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1443" tag="operation_1443" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param kernelValues &amp;#010;@param channelFlags &amp;#010;@param dst &amp;#010;@param factor &amp;#010;@param offset &amp;#010;@param nColors &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1452" tag="operation_1452" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1452" tag="operation_1452" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1453" tag="operation_1453" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1453" tag="operation_1453" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1454" tag="operation_1454" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1454" tag="operation_1454" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1455" tag="operation_1455" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1455" tag="operation_1455" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1456" tag="operation_1456" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1456" tag="operation_1456" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1459" tag="operation_1459" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1459" tag="operation_1459" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1462" tag="operation_1462" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1462" tag="operation_1462" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1470" tag="operation_1470" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1470" tag="operation_1470" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1471" tag="operation_1471" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1471" tag="operation_1471" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param transferValues &amp;#010;@return KisColorAdjustment*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1473" tag="operation_1473" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1473" tag="operation_1473" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param  &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1478" tag="operation_1478" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1478" tag="operation_1478" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Darken all color channels with the given amount. If compensate is true,&amp;#010;the compensation factor will be used to limit the darkening.&amp;#010;&amp;#010;(See the bumpmap filter)" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1485" tag="operation_1485" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1485" tag="operation_1485" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@return Q_UINT8  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1487" tag="operation_1487" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1487" tag="operation_1487" 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 srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &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 srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1498" tag="operation_1498" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1508" tag="operation_1508" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1528" tag="operation_1528" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1538" tag="operation_1538" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1578" tag="operation_1578" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1608" tag="operation_1608" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -14964,56 +14964,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1387" field_type="65" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1387" field_type="65" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisU8BaseColorSpace  = new KisU8BaseColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisU8BaseColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisU8BaseColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1387" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1387" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1638" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1638" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
@@ -15021,7 +15021,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1639" tqparent_class="1639" fileExt=".java" fileName="WetPix" >
+    <classifiercodedocument writeOutCode="true" package="" id="1639" parent_class="1639" fileExt=".java" fileName="WetPix" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15033,7 +15033,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1639" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1639" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class WetPix&amp;#010;" />
        </header>
@@ -15096,7 +15096,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1640" tqparent_class="1640" fileExt=".java" fileName="WetPixDbl" >
+    <classifiercodedocument writeOutCode="true" package="" id="1640" parent_class="1640" fileExt=".java" fileName="WetPixDbl" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15108,7 +15108,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1640" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1640" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class WetPixDbl&amp;#010;" />
        </header>
@@ -15171,7 +15171,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1641" tqparent_class="1641" fileExt=".java" fileName="WetPack" >
+    <classifiercodedocument writeOutCode="true" package="" id="1641" parent_class="1641" fileExt=".java" fileName="WetPack" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15183,7 +15183,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1641" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1641" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class WetPack&amp;#010;" />
        </header>
@@ -15246,7 +15246,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1642" tqparent_class="1642" fileExt=".java" fileName="_WetPix" >
+    <classifiercodedocument writeOutCode="true" package="" id="1642" parent_class="1642" fileExt=".java" fileName="_WetPix" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15258,7 +15258,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1642" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1642" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class _WetPix&amp;#010;White is made up of myth-red, myth-green, and myth-blue. Myth-red&amp;#010;looks red when viewed reflectively, but cyan when viewed&amp;#010;transmissively (thus, it vaguely resembles a dichroic&amp;#010;filter). Myth-red over black is red, and myth-red over white is&amp;#010;white.&amp;#010;&amp;#010;Total red channel concentration is myth-red concentration plus&amp;#010;cyan concentration." />
        </header>
@@ -15268,42 +15268,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 rd;" >
+          <ccfdeclarationcodeblock parent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 rd;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Total red channel concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1644" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 rw;" >
+          <ccfdeclarationcodeblock parent_id="1644" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 rw;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Myth-red concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1645" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 gd;" >
+          <ccfdeclarationcodeblock parent_id="1645" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 gd;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Total green channel concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1646" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 gw;" >
+          <ccfdeclarationcodeblock parent_id="1646" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 gw;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Myth-green concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1647" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT16 bd;" >
+          <ccfdeclarationcodeblock parent_id="1647" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT16 bd;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Total blue channel concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1648" tag="tblock_14" canDelete="false" indentLevel="1" text="public Q_UINT16 bw;" >
+          <ccfdeclarationcodeblock parent_id="1648" tag="tblock_14" canDelete="false" indentLevel="1" text="public Q_UINT16 bw;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Myth-blue concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1649" tag="tblock_17" canDelete="false" indentLevel="1" text="public Q_UINT16 w;" >
+          <ccfdeclarationcodeblock parent_id="1649" tag="tblock_17" canDelete="false" indentLevel="1" text="public Q_UINT16 w;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Water volume" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1650" tag="tblock_20" canDelete="false" indentLevel="1" text="public Q_UINT16 h;" >
+          <ccfdeclarationcodeblock parent_id="1650" tag="tblock_20" canDelete="false" indentLevel="1" text="public Q_UINT16 h;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
            </header>
@@ -15337,82 +15337,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
+              <codeaccessormethod accessType="0" parent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1643" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
+              <codeaccessormethod accessType="1" parent_id="1643" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1644" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
+              <codeaccessormethod accessType="0" parent_id="1644" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1644" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
+              <codeaccessormethod accessType="1" parent_id="1644" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1645" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
+              <codeaccessormethod accessType="0" parent_id="1645" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1645" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
+              <codeaccessormethod accessType="1" parent_id="1645" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1646" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
+              <codeaccessormethod accessType="0" parent_id="1646" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1646" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
+              <codeaccessormethod accessType="1" parent_id="1646" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
+              <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
+              <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
+              <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
+              <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1649" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
+              <codeaccessormethod accessType="0" parent_id="1649" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
+              <codeaccessormethod accessType="1" parent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
+              <codeaccessormethod accessType="0" parent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
+              <codeaccessormethod accessType="1" parent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
                </header>
@@ -15442,161 +15442,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1643" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1643" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Total red channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 rd;" >
+       <ccfdeclarationcodeblock parent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_UINT16 rd;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
+       <codeaccessormethod accessType="0" parent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1643" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1643" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1644" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1644" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Myth-red concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1644" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 rw;" >
+       <ccfdeclarationcodeblock parent_id="1644" tag="tblock_2" canDelete="false" indentLevel="1" text="public Q_UINT16 rw;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1644" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
+       <codeaccessormethod accessType="0" parent_id="1644" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1644" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1644" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1645" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1645" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Total green channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1645" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 gd;" >
+       <ccfdeclarationcodeblock parent_id="1645" tag="tblock_5" canDelete="false" indentLevel="1" text="public Q_UINT16 gd;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1645" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
+       <codeaccessormethod accessType="0" parent_id="1645" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1645" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1645" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Myth-green concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1646" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 gw;" >
+       <ccfdeclarationcodeblock parent_id="1646" tag="tblock_8" canDelete="false" indentLevel="1" text="public Q_UINT16 gw;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1646" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
+       <codeaccessormethod accessType="0" parent_id="1646" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1646" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1646" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Total blue channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1647" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT16 bd;" >
+       <ccfdeclarationcodeblock parent_id="1647" tag="tblock_11" canDelete="false" indentLevel="1" text="public Q_UINT16 bd;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
+       <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Myth-blue concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1648" tag="tblock_14" canDelete="false" indentLevel="1" text="public Q_UINT16 bw;" >
+       <ccfdeclarationcodeblock parent_id="1648" tag="tblock_14" canDelete="false" indentLevel="1" text="public Q_UINT16 bw;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
+       <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1649" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1649" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Water volume" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1649" tag="tblock_17" canDelete="false" indentLevel="1" text="public Q_UINT16 w;" >
+       <ccfdeclarationcodeblock parent_id="1649" tag="tblock_17" canDelete="false" indentLevel="1" text="public Q_UINT16 w;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Water volume" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1649" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
+       <codeaccessormethod accessType="0" parent_id="1649" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
+       <codeaccessormethod accessType="1" parent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1650" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1650" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1650" tag="tblock_20" canDelete="false" indentLevel="1" text="public Q_UINT16 h;" >
+       <ccfdeclarationcodeblock parent_id="1650" tag="tblock_20" canDelete="false" indentLevel="1" text="public Q_UINT16 h;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
+       <codeaccessormethod accessType="0" parent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
+       <codeaccessormethod accessType="1" parent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
         </header>
@@ -15604,7 +15604,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1651" tqparent_class="1651" fileExt=".java" fileName="_WetPack" >
+    <classifiercodedocument writeOutCode="true" package="" id="1651" parent_class="1651" fileExt=".java" fileName="_WetPack" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15616,7 +15616,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1651" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1651" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class _WetPack&amp;#010;" />
        </header>
@@ -15626,12 +15626,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text="public WetPix paint;" >
+          <ccfdeclarationcodeblock parent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text="public WetPix paint;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Paint layer" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1653" tag="tblock_2" canDelete="false" indentLevel="1" text="public WetPix adsorb;" >
+          <ccfdeclarationcodeblock parent_id="1653" tag="tblock_2" canDelete="false" indentLevel="1" text="public WetPix adsorb;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Adsorbtion layer" />
            </header>
@@ -15665,22 +15665,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
+              <codeaccessormethod accessType="0" parent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Paint layer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1652" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
+              <codeaccessormethod accessType="1" parent_id="1652" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Paint layer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
+              <codeaccessormethod accessType="0" parent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Adsorbtion layer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
+              <codeaccessormethod accessType="1" parent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Adsorbtion layer" />
                </header>
@@ -15710,41 +15710,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1652" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1652" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Paint layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text="public WetPix paint;" >
+       <ccfdeclarationcodeblock parent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text="public WetPix paint;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Paint layer" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
+       <codeaccessormethod accessType="0" parent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Paint layer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1652" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
+       <codeaccessormethod accessType="1" parent_id="1652" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Paint layer" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1653" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1653" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Adsorbtion layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1653" tag="tblock_2" canDelete="false" indentLevel="1" text="public WetPix adsorb;" >
+       <ccfdeclarationcodeblock parent_id="1653" tag="tblock_2" canDelete="false" indentLevel="1" text="public WetPix adsorb;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Adsorbtion layer" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
+       <codeaccessormethod accessType="0" parent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Adsorbtion layer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
+       <codeaccessormethod accessType="1" parent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Adsorbtion layer" />
         </header>
@@ -15752,7 +15752,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1654" tqparent_class="1654" fileExt=".java" fileName="_WetPixDbl" >
+    <classifiercodedocument writeOutCode="true" package="" id="1654" parent_class="1654" fileExt=".java" fileName="_WetPixDbl" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15764,7 +15764,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1654" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1654" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class _WetPixDbl&amp;#010;" />
        </header>
@@ -15774,42 +15774,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text="public double rd;" >
+          <ccfdeclarationcodeblock parent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text="public double rd;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Total red channel concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1656" tag="tblock_2" canDelete="false" indentLevel="1" text="public double rw;" >
+          <ccfdeclarationcodeblock parent_id="1656" tag="tblock_2" canDelete="false" indentLevel="1" text="public double rw;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Myth-red concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1657" tag="tblock_5" canDelete="false" indentLevel="1" text="public double gd;" >
+          <ccfdeclarationcodeblock parent_id="1657" tag="tblock_5" canDelete="false" indentLevel="1" text="public double gd;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Total green channel concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1658" tag="tblock_8" canDelete="false" indentLevel="1" text="public double gw;" >
+          <ccfdeclarationcodeblock parent_id="1658" tag="tblock_8" canDelete="false" indentLevel="1" text="public double gw;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Myth-green concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1659" tag="tblock_11" canDelete="false" indentLevel="1" text="public double bd;" >
+          <ccfdeclarationcodeblock parent_id="1659" tag="tblock_11" canDelete="false" indentLevel="1" text="public double bd;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Total blue channel concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1660" tag="tblock_14" canDelete="false" indentLevel="1" text="public double bw;" >
+          <ccfdeclarationcodeblock parent_id="1660" tag="tblock_14" canDelete="false" indentLevel="1" text="public double bw;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Myth-blue concentration" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1661" tag="tblock_17" canDelete="false" indentLevel="1" text="public double w;" >
+          <ccfdeclarationcodeblock parent_id="1661" tag="tblock_17" canDelete="false" indentLevel="1" text="public double w;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Water volume" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1662" tag="tblock_20" canDelete="false" indentLevel="1" text="public double h;" >
+          <ccfdeclarationcodeblock parent_id="1662" tag="tblock_20" canDelete="false" indentLevel="1" text="public double h;" >
            <header>
             <codecomment tag="" indentLevel="1" text="Height of paper surface" />
            </header>
@@ -15843,82 +15843,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
+              <codeaccessormethod accessType="0" parent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
+              <codeaccessormethod accessType="1" parent_id="1655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1656" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
+              <codeaccessormethod accessType="0" parent_id="1656" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1656" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
+              <codeaccessormethod accessType="1" parent_id="1656" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1657" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
+              <codeaccessormethod accessType="0" parent_id="1657" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1657" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
+              <codeaccessormethod accessType="1" parent_id="1657" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1658" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
+              <codeaccessormethod accessType="0" parent_id="1658" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1658" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
+              <codeaccessormethod accessType="1" parent_id="1658" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1659" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
+              <codeaccessormethod accessType="0" parent_id="1659" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1659" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
+              <codeaccessormethod accessType="1" parent_id="1659" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1660" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
+              <codeaccessormethod accessType="0" parent_id="1660" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1660" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
+              <codeaccessormethod accessType="1" parent_id="1660" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1661" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
+              <codeaccessormethod accessType="0" parent_id="1661" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
+              <codeaccessormethod accessType="1" parent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
+              <codeaccessormethod accessType="0" parent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
+              <codeaccessormethod accessType="1" parent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface" />
                </header>
@@ -15948,161 +15948,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Total red channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text="public double rd;" >
+       <ccfdeclarationcodeblock parent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text="public double rd;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
+       <codeaccessormethod accessType="0" parent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1656" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1656" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Myth-red concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1656" tag="tblock_2" canDelete="false" indentLevel="1" text="public double rw;" >
+       <ccfdeclarationcodeblock parent_id="1656" tag="tblock_2" canDelete="false" indentLevel="1" text="public double rw;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1656" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
+       <codeaccessormethod accessType="0" parent_id="1656" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1656" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1656" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1657" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1657" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Total green channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1657" tag="tblock_5" canDelete="false" indentLevel="1" text="public double gd;" >
+       <ccfdeclarationcodeblock parent_id="1657" tag="tblock_5" canDelete="false" indentLevel="1" text="public double gd;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1657" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
+       <codeaccessormethod accessType="0" parent_id="1657" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1657" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1657" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1658" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1658" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Myth-green concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1658" tag="tblock_8" canDelete="false" indentLevel="1" text="public double gw;" >
+       <ccfdeclarationcodeblock parent_id="1658" tag="tblock_8" canDelete="false" indentLevel="1" text="public double gw;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1658" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
+       <codeaccessormethod accessType="0" parent_id="1658" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1658" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1658" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1659" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1659" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Total blue channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1659" tag="tblock_11" canDelete="false" indentLevel="1" text="public double bd;" >
+       <ccfdeclarationcodeblock parent_id="1659" tag="tblock_11" canDelete="false" indentLevel="1" text="public double bd;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1659" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
+       <codeaccessormethod accessType="0" parent_id="1659" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1659" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1659" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Myth-blue concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1660" tag="tblock_14" canDelete="false" indentLevel="1" text="public double bw;" >
+       <ccfdeclarationcodeblock parent_id="1660" tag="tblock_14" canDelete="false" indentLevel="1" text="public double bw;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1660" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
+       <codeaccessormethod accessType="0" parent_id="1660" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1660" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1660" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Water volume" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1661" tag="tblock_17" canDelete="false" indentLevel="1" text="public double w;" >
+       <ccfdeclarationcodeblock parent_id="1661" tag="tblock_17" canDelete="false" indentLevel="1" text="public double w;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Water volume" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1661" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
+       <codeaccessormethod accessType="0" parent_id="1661" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
+       <codeaccessormethod accessType="1" parent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Water volume" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="Height of paper surface" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1662" tag="tblock_20" canDelete="false" indentLevel="1" text="public double h;" >
+       <ccfdeclarationcodeblock parent_id="1662" tag="tblock_20" canDelete="false" indentLevel="1" text="public double h;" >
         <header>
          <codecomment tag="" indentLevel="1" text="Height of paper surface" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
+       <codeaccessormethod accessType="0" parent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
+       <codeaccessormethod accessType="1" parent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Height of paper surface" />
         </header>
@@ -16110,7 +16110,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1663" tqparent_class="1663" fileExt=".java" fileName="KisWetColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1663" parent_class="1663" fileExt=".java" fileName="KisWetColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16122,7 +16122,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1663" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1663" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisWetColorSpace&amp;#010;" />
        </header>
@@ -16132,37 +16132,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1757" tag="tblock_2" canDelete="false" indentLevel="1" text="private Q_UINT32* wet_render_tab;" >
+          <ccfdeclarationcodeblock parent_id="1757" tag="tblock_2" canDelete="false" indentLevel="1" text="private Q_UINT32* wet_render_tab;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QStringList m_paintNames;" >
+          <ccfdeclarationcodeblock parent_id="1758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QStringList m_paintNames;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1760" tag="tblock_8" canDelete="false" indentLevel="1" text="private QMap m_conversionMap;" >
+          <ccfdeclarationcodeblock parent_id="1760" tag="tblock_8" canDelete="false" indentLevel="1" text="private QMap m_conversionMap;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1761" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_paintwetness;" >
+          <ccfdeclarationcodeblock parent_id="1761" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_paintwetness;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1762" tag="tblock_14" canDelete="false" indentLevel="1" text="private int phase;" >
+          <ccfdeclarationcodeblock parent_id="1762" tag="tblock_14" canDelete="false" indentLevel="1" text="private int phase;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1763" tag="tblock_17" canDelete="false" indentLevel="1" text="private int phasebig;" >
+          <ccfdeclarationcodeblock parent_id="1763" tag="tblock_17" canDelete="false" indentLevel="1" text="private int phasebig;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -16196,72 +16196,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
+              <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of wet_render_tab&amp;#010;&amp;#010;@return the value of wet_render_tab" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
+              <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of wet_render_tab&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
+              <codeaccessormethod accessType="0" parent_id="1758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paintNames&amp;#010;&amp;#010;@return the value of m_paintNames" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
+              <codeaccessormethod accessType="1" parent_id="1758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paintNames&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
+              <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_conversionMap&amp;#010;&amp;#010;@return the value of m_conversionMap" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
+              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_conversionMap&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
+              <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paintwetness&amp;#010;&amp;#010;@return the value of m_paintwetness" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
+              <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paintwetness&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
+              <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of phase&amp;#010;&amp;#010;@return the value of phase" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
+              <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of phase&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
+              <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of phasebig&amp;#010;&amp;#010;@return the value of phasebig" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
+              <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of phasebig&amp;#010;&amp;#010;" />
                </header>
@@ -16281,147 +16281,147 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1667" tag="operation_1667" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1667" tag="operation_1667" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1668" tag="operation_1668" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1668" tag="operation_1668" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1669" tag="operation_1669" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1669" tag="operation_1669" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Semi-clever: we have only fifteen wet paint colors that are mapped to the// qcolors that are put in the painter by the special wet paint palette. Other// QColors are mapped to plain water..." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1673" tag="operation_1673" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1673" tag="operation_1673" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1678" tag="operation_1678" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1678" tag="operation_1678" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1681" tag="operation_1681" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1681" tag="operation_1681" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1685" tag="operation_1685" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1685" tag="operation_1685" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1690" tag="operation_1690" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1690" tag="operation_1690" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1693" tag="operation_1693" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1693" tag="operation_1693" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1696" tag="operation_1696" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1696" tag="operation_1696" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1701" tag="operation_1701" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1701" tag="operation_1701" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1702" tag="operation_1702" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1702" tag="operation_1702" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1703" tag="operation_1703" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1703" tag="operation_1703" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1704" tag="operation_1704" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1704" tag="operation_1704" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1705" tag="operation_1705" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1705" tag="operation_1705" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1706" tag="operation_1706" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1706" tag="operation_1706" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1707" tag="operation_1707" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1707" tag="operation_1707" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1710" tag="operation_1710" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1710" tag="operation_1710" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1713" tag="operation_1713" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1713" tag="operation_1713" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1721" tag="operation_1721" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1721" tag="operation_1721" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param adjust &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1724" tag="operation_1724" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1724" tag="operation_1724" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  &amp;#010;@param  &amp;#010;@param  &amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1730" tag="operation_1730" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1730" tag="operation_1730" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1731" tag="operation_1731" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1731" tag="operation_1731" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param b &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1733" tag="operation_1733" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1733" tag="operation_1733" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1735" tag="operation_1735" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1735" tag="operation_1735" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1746" tag="operation_1746" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1746" tag="operation_1746" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// This was static, but since we have only one instance of the color strategy,// it can be just as well a private member variable." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1747" tag="operation_1747" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1747" tag="operation_1747" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Convert a single pixel from its wet representation to rgb" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1751" tag="operation_1751" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1751" tag="operation_1751" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param pack &amp;#010;@return void  " />
              </header>
@@ -16437,176 +16437,176 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1664" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1664" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAbstractColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAbstractColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1664" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1664" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1757" tag="tblock_2" canDelete="false" indentLevel="1" text="private Q_UINT32* wet_render_tab;" >
+       <ccfdeclarationcodeblock parent_id="1757" tag="tblock_2" canDelete="false" indentLevel="1" text="private Q_UINT32* wet_render_tab;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
+       <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of wet_render_tab&amp;#010;&amp;#010;@return the value of wet_render_tab" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
+       <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of wet_render_tab&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QStringList m_paintNames;" >
+       <ccfdeclarationcodeblock parent_id="1758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QStringList m_paintNames;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
+       <codeaccessormethod accessType="0" parent_id="1758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paintNames&amp;#010;&amp;#010;@return the value of m_paintNames" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
+       <codeaccessormethod accessType="1" parent_id="1758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paintNames&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1760" tag="tblock_8" canDelete="false" indentLevel="1" text="private QMap m_conversionMap;" >
+       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_8" canDelete="false" indentLevel="1" text="private QMap m_conversionMap;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
+       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_conversionMap&amp;#010;&amp;#010;@return the value of m_conversionMap" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
+       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_conversionMap&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1761" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_paintwetness;" >
+       <ccfdeclarationcodeblock parent_id="1761" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_paintwetness;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
+       <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paintwetness&amp;#010;&amp;#010;@return the value of m_paintwetness" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
+       <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paintwetness&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1762" tag="tblock_14" canDelete="false" indentLevel="1" text="private int phase;" >
+       <ccfdeclarationcodeblock parent_id="1762" tag="tblock_14" canDelete="false" indentLevel="1" text="private int phase;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
+       <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of phase&amp;#010;&amp;#010;@return the value of phase" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
+       <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of phase&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1763" tag="tblock_17" canDelete="false" indentLevel="1" text="private int phasebig;" >
+       <ccfdeclarationcodeblock parent_id="1763" tag="tblock_17" canDelete="false" indentLevel="1" text="private int phasebig;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
+       <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of phasebig&amp;#010;&amp;#010;@return the value of phasebig" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
+       <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of phasebig&amp;#010;&amp;#010;" />
         </header>
@@ -16614,7 +16614,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1749" tqparent_class="1749" fileExt=".java" fileName="WetPix*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1749" parent_class="1749" fileExt=".java" fileName="WetPix*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16626,7 +16626,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1749" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1749" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class WetPix*&amp;#010;" />
        </header>
@@ -16689,7 +16689,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1753" tqparent_class="1753" fileExt=".java" fileName="WetPack*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1753" parent_class="1753" fileExt=".java" fileName="WetPack*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16701,7 +16701,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1753" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1753" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class WetPack*&amp;#010;" />
        </header>
@@ -16764,7 +16764,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1756" tqparent_class="1756" fileExt=".java" fileName="Q_UINT32*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1756" parent_class="1756" fileExt=".java" fileName="Q_UINT32*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16776,7 +16776,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1756" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1756" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT32*&amp;#010;" />
        </header>
@@ -16839,7 +16839,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1759" tqparent_class="1759" fileExt=".java" fileName="QMap" >
+    <classifiercodedocument writeOutCode="true" package="" id="1759" parent_class="1759" fileExt=".java" fileName="QMap" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16851,7 +16851,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1759" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1759" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QMap&amp;#010;" />
        </header>
@@ -16914,7 +16914,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1765" tqparent_class="1765" fileExt=".java" fileName="enumDirection" >
+    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1765" parent_class="1765" fileExt=".java" fileName="enumDirection" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package WetAndSticky;&amp;#010;" >
        <header>
@@ -16926,7 +16926,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1765" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1765" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumDirection&amp;#010;A color is specified as a vector in HLS space.  Hue is a value&amp;#010;in the range 0..360 degrees with 0 degrees being red.  Saturation&amp;#010;and Lightness are both in the range [0,1].  A lightness of 0 means&amp;#010;black, with 1 being white.  A totally saturated color has saturation&amp;#010;of 1." />
        </header>
@@ -16989,7 +16989,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1771" tqparent_class="1771" fileExt=".java" fileName="CELL" >
+    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1771" parent_class="1771" fileExt=".java" fileName="CELL" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package WetAndSticky;&amp;#010;" >
        <header>
@@ -17001,7 +17001,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1771" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1771" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CELL&amp;#010;" />
        </header>
@@ -17064,7 +17064,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1772" tqparent_class="1772" fileExt=".java" fileName="cell" >
+    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1772" parent_class="1772" fileExt=".java" fileName="cell" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package WetAndSticky;&amp;#010;" >
        <header>
@@ -17076,7 +17076,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1772" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1772" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Cell&amp;#010;" />
        </header>
@@ -17139,7 +17139,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1773" tqparent_class="1773" fileExt=".java" fileName="CELL_PTR" >
+    <classifiercodedocument writeOutCode="true" package="WetAndSticky" id="1773" parent_class="1773" fileExt=".java" fileName="CELL_PTR" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package WetAndSticky;&amp;#010;" >
        <header>
@@ -17151,7 +17151,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1773" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1773" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CELL_PTR&amp;#010;" />
        </header>
@@ -17214,7 +17214,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1774" tqparent_class="1774" fileExt=".java" fileName="KisWetStickyColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1774" parent_class="1774" fileExt=".java" fileName="KisWetStickyColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17226,7 +17226,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1774" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1774" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisWetStickyColorSpace&amp;#010;" />
        </header>
@@ -17236,7 +17236,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+          <ccfdeclarationcodeblock parent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -17270,12 +17270,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
@@ -17295,144 +17295,144 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1778" tag="operation_1778" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1778" tag="operation_1778" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1779" tag="operation_1779" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1779" tag="operation_1779" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1780" tag="operation_1780" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1780" tag="operation_1780" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1784" tag="operation_1784" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1784" tag="operation_1784" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1789" tag="operation_1789" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1789" tag="operation_1789" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1792" tag="operation_1792" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1792" tag="operation_1792" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1796" tag="operation_1796" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1796" tag="operation_1796" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1801" tag="operation_1801" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1801" tag="operation_1801" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1804" tag="operation_1804" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1804" tag="operation_1804" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile &amp;#010;@return KisPixel  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1807" tag="operation_1807" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1807" tag="operation_1807" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisChannelInfoSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1808" tag="operation_1808" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1808" tag="operation_1808" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1809" tag="operation_1809" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1809" tag="operation_1809" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1810" tag="operation_1810" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1810" tag="operation_1810" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1811" tag="operation_1811" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1811" tag="operation_1811" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1812" tag="operation_1812" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1812" tag="operation_1812" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1813" tag="operation_1813" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1813" tag="operation_1813" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex &amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure &amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1827" tag="operation_1827" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1827" tag="operation_1827" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param adjust &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1830" tag="operation_1830" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1830" tag="operation_1830" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1836" tag="operation_1836" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1836" tag="operation_1836" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1841" tag="operation_1841" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1841" tag="operation_1841" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1845" tag="operation_1845" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1845" tag="operation_1845" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCompositeOpList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1846" tag="operation_1846" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1846" tag="operation_1846" canDelete="false" indentLevel="1" >
              <header>
-              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
+              <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1857" tag="operation_1857" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1857" tag="operation_1857" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param srcProfile &amp;#010;@param dst &amp;#010;@param dstColorStrategy &amp;#010;@param dstProfile &amp;#010;@param numPixels &amp;#010;@param renderingIntent &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1865" tag="operation_1865" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" >
+            <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity &amp;#010;@return void  " />
              </header>
             </codeoperation>
            </textblocks>
@@ -17446,56 +17446,56 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1775" field_type="144905952" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1775" field_type="144905952" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
+       <ccfdeclarationcodeblock parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisAbstractColorSpace  = new KisAbstractColorSpace ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAbstractColorSpace to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAbstractColorSpace from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1775" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1775" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1895" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1895" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text="private vKisChannelInfoSP m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
@@ -17503,7 +17503,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="12050" tqparent_class="12050" fileExt=".java" fileName="KisColorSpaceDescriptor" >
+    <classifiercodedocument writeOutCode="true" package="" id="12050" parent_class="12050" fileExt=".java" fileName="KisColorSpaceDescriptor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17515,7 +17515,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="12050" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="12050" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisColorSpaceDescriptor&amp;#010;" />
        </header>
@@ -17580,7 +17580,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
     </classifiercodedocument>
    </codegenerator>
    <codegenerator language="Cpp" >
-    <classifiercodedocument writeOutCode="true" package="" id="11" tqparent_class="11" fileExt=".cpp" fileName="qpainter" >
+    <classifiercodedocument writeOutCode="true" package="" id="11" parent_class="11" fileExt=".cpp" fileName="qpainter" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;qpainter.h&quot;&amp;#010;" >
        <header>
@@ -17605,7 +17605,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="12" tqparent_class="12" fileExt=".cpp" fileName="kisiteratorpixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="12" parent_class="12" fileExt=".cpp" fileName="kisiteratorpixel" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisiteratorpixel.h&quot;&amp;#010;" >
        <header>
@@ -17630,7 +17630,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="13" tqparent_class="13" fileExt=".cpp" fileName="kispixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="13" parent_class="13" fileExt=".cpp" fileName="kispixel" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kispixel.h&quot;&amp;#010;" >
        <header>
@@ -17655,7 +17655,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="14" tqparent_class="14" fileExt=".cpp" fileName="kispixelro" >
+    <classifiercodedocument writeOutCode="true" package="" id="14" parent_class="14" fileExt=".cpp" fileName="kispixelro" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kispixelro.h&quot;&amp;#010;" >
        <header>
@@ -17680,7 +17680,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="15" tqparent_class="15" fileExt=".cpp" fileName="kisprofilepair" >
+    <classifiercodedocument writeOutCode="true" package="" id="15" parent_class="15" fileExt=".cpp" fileName="kisprofilepair" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisprofilepair.h&quot;&amp;#010;" >
        <header>
@@ -17705,7 +17705,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="17" tqparent_class="17" fileExt=".cpp" fileName="transform" >
+    <classifiercodedocument writeOutCode="true" package="" id="17" parent_class="17" fileExt=".cpp" fileName="transform" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;transform.h&quot;&amp;#010;" >
        <header>
@@ -17723,52 +17723,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="19" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="19" text="return srcProfile;" >
+        <codeaccessormethod accessType="0" parent_id="19" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="19" text="return srcProfile;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="19" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="19" text="srcProfile = value;" >
+        <codeaccessormethod accessType="1" parent_id="19" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="19" text="srcProfile = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="21" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="21" text="return srcCmType;" >
+        <codeaccessormethod accessType="0" parent_id="21" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="21" text="return srcCmType;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="21" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="21" text="srcCmType = value;" >
+        <codeaccessormethod accessType="1" parent_id="21" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="21" text="srcCmType = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="22" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="22" text="return dstProfile;" >
+        <codeaccessormethod accessType="0" parent_id="22" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="22" text="return dstProfile;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="22" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="22" text="dstProfile = value;" >
+        <codeaccessormethod accessType="1" parent_id="22" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="22" text="dstProfile = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="23" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="23" text="return dstType;" >
+        <codeaccessormethod accessType="0" parent_id="23" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="23" text="return dstType;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="23" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="23" text="dstType = value;" >
+        <codeaccessormethod accessType="1" parent_id="23" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="23" text="dstType = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="24" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="24" text="return renderIntent;" >
+        <codeaccessormethod accessType="0" parent_id="24" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="24" text="return renderIntent;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="24" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="24" text="renderIntent = value;" >
+        <codeaccessormethod accessType="1" parent_id="24" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="24" text="renderIntent = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -17780,101 +17780,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="19" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="19" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="19" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="19" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="19" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="19" text="return srcProfile;" >
+       <codeaccessormethod accessType="0" parent_id="19" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="19" text="return srcProfile;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="19" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="19" text="srcProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="19" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="19" text="srcProfile = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="21" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="21" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="21" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="21" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="21" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="21" text="return srcCmType;" >
+       <codeaccessormethod accessType="0" parent_id="21" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="21" text="return srcCmType;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="21" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="21" text="srcCmType = value;" >
+       <codeaccessormethod accessType="1" parent_id="21" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="21" text="srcCmType = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="22" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="22" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="22" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="22" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="22" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="22" text="return dstProfile;" >
+       <codeaccessormethod accessType="0" parent_id="22" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="22" text="return dstProfile;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="22" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="22" text="dstProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="22" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="22" text="dstProfile = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="23" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="23" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="23" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="23" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="23" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="23" text="return dstType;" >
+       <codeaccessormethod accessType="0" parent_id="23" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="23" text="return dstType;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="23" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="23" text="dstType = value;" >
+       <codeaccessormethod accessType="1" parent_id="23" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="23" text="dstType = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="24" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="24" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="24" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="24" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="24" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="24" text="return renderIntent;" >
+       <codeaccessormethod accessType="0" parent_id="24" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="24" text="return renderIntent;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="24" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="24" text="renderIntent = value;" >
+       <codeaccessormethod accessType="1" parent_id="24" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="24" text="renderIntent = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -17882,7 +17882,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="18" tqparent_class="18" fileExt=".cpp" fileName="kisprofile" >
+    <classifiercodedocument writeOutCode="true" package="" id="18" parent_class="18" fileExt=".cpp" fileName="kisprofile" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisprofile.h&quot;&amp;#010;" >
        <header>
@@ -17907,7 +17907,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="20" tqparent_class="20" fileExt=".cpp" fileName="q_uint32" >
+    <classifiercodedocument writeOutCode="true" package="" id="20" parent_class="20" fileExt=".cpp" fileName="q_uint32" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;q_uint32.h&quot;&amp;#010;" >
        <header>
@@ -17932,7 +17932,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="25" tqparent_class="25" fileExt=".cpp" fileName="struct kiscoloradjustment" >
+    <classifiercodedocument writeOutCode="true" package="" id="25" parent_class="25" fileExt=".cpp" fileName="struct kiscoloradjustment" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;struct kiscoloradjustment.h&quot;&amp;#010;" >
        <header>
@@ -17957,7 +17957,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="26" tqparent_class="26" fileExt=".cpp" fileName="kisabstractcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="26" parent_class="26" fileExt=".cpp" fileName="kisabstractcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisabstractcolorspace.h&quot;&amp;#010;" >
        <header>
@@ -17975,382 +17975,382 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="227" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="227" text="return m_profileFilenames;" >
+        <codeaccessormethod accessType="0" parent_id="227" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="227" text="return m_profileFilenames;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="227" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="227" text="m_profileFilenames = value;" >
+        <codeaccessormethod accessType="1" parent_id="227" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="227" text="m_profileFilenames = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="228" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="228" text="return m_defaultProfile;" >
+        <codeaccessormethod accessType="0" parent_id="228" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="228" text="return m_defaultProfile;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="228" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="228" text="m_defaultProfile = value;" >
+        <codeaccessormethod accessType="1" parent_id="228" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="228" text="m_defaultProfile = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="229" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="229" text="return m_qcolordata;" >
+        <codeaccessormethod accessType="0" parent_id="229" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="229" text="return m_qcolordata;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="229" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="229" text="m_qcolordata = value;" >
+        <codeaccessormethod accessType="1" parent_id="229" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="229" text="m_qcolordata = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="230" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="230" text="return m_alphaPos;" >
+        <codeaccessormethod accessType="0" parent_id="230" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="230" text="return m_alphaPos;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="230" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="230" text="m_alphaPos = value;" >
+        <codeaccessormethod accessType="1" parent_id="230" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="230" text="m_alphaPos = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="231" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="231" text="return m_alphaSize;" >
+        <codeaccessormethod accessType="0" parent_id="231" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="231" text="return m_alphaSize;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="231" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="231" text="m_alphaSize = value;" >
+        <codeaccessormethod accessType="1" parent_id="231" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="231" text="m_alphaSize = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="232" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="232" text="return m_defaultToRGB;" >
+        <codeaccessormethod accessType="0" parent_id="232" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="232" text="return m_defaultToRGB;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="232" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="232" text="m_defaultToRGB = value;" >
+        <codeaccessormethod accessType="1" parent_id="232" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="232" text="m_defaultToRGB = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="233" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="233" text="return m_defaultFromRGB;" >
+        <codeaccessormethod accessType="0" parent_id="233" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="233" text="return m_defaultFromRGB;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="233" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="233" text="m_defaultFromRGB = value;" >
+        <codeaccessormethod accessType="1" parent_id="233" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="233" text="m_defaultFromRGB = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="234" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="234" text="return m_id;" >
+        <codeaccessormethod accessType="0" parent_id="234" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="234" text="return m_id;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="234" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="234" text="m_id = value;" >
+        <codeaccessormethod accessType="1" parent_id="234" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="234" text="m_id = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="235" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="235" text="return m_cmType;" >
+        <codeaccessormethod accessType="0" parent_id="235" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="235" text="return m_cmType;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@return the value of m_cmType" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="235" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="235" text="m_cmType = value;" >
+        <codeaccessormethod accessType="1" parent_id="235" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="235" text="m_cmType = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@param value the value of m_cmType" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="236" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="236" text="return m_colorSpaceSignature;" >
+        <codeaccessormethod accessType="0" parent_id="236" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="236" text="return m_colorSpaceSignature;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@return the value of m_colorSpaceSignature" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="236" tag="hblock_tag_19" canDelete="false" writeOutText="false" classfield_id="236" text="m_colorSpaceSignature = value;" >
+        <codeaccessormethod accessType="1" parent_id="236" tag="hblock_tag_19" canDelete="false" writeOutText="false" classfield_id="236" text="m_colorSpaceSignature = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@param value the value of m_colorSpaceSignature" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="238" tag="hblock_tag_20" canDelete="false" writeOutText="false" classfield_id="238" text="return m_transforms;" >
+        <codeaccessormethod accessType="0" parent_id="238" tag="hblock_tag_20" canDelete="false" writeOutText="false" classfield_id="238" text="return m_transforms;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@return the value of m_transforms" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="238" tag="hblock_tag_21" canDelete="false" writeOutText="false" classfield_id="238" text="m_transforms = value;" >
+        <codeaccessormethod accessType="1" parent_id="238" tag="hblock_tag_21" canDelete="false" writeOutText="false" classfield_id="238" text="m_transforms = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@param value the value of m_transforms" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="245" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="245" text="return m_cachesize;" >
+        <codeaccessormethod accessType="0" parent_id="245" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="245" text="return m_cachesize;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="245" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="245" text="m_cachesize = value;" >
+        <codeaccessormethod accessType="1" parent_id="245" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="245" text="m_cachesize = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="246" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="246" text="return m_conversionCache;" >
+        <codeaccessormethod accessType="0" parent_id="246" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="246" text="return m_conversionCache;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="246" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="246" text="m_conversionCache = value;" >
+        <codeaccessormethod accessType="1" parent_id="246" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="246" text="m_conversionCache = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="31" tag="operation_31" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="31" tag="operation_31" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Create a new colorspace strategy.&amp;#010;&amp;#010;@param id The Chalk identification of this color model.&amp;#010;@param cmType The littlecms colorstrategy type we wrap.&amp;#010;@param colorSpaceSignature The icc signature for the colorspace we are." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="40" tag="operation_40" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="40" tag="operation_40" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="41" tag="operation_41" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="41" tag="operation_41" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="//========== Channels =====================================================//// Return a vector describing all the channels this color model has." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="43" tag="operation_43" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="43" tag="operation_43" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="The total number of channels for a single pixel in this color model" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="45" tag="operation_45" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="45" tag="operation_45" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="The total number of color channels (excludes alpha and substance) for a single&amp;#010;pixel in this color model." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="46" tag="operation_46" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="46" tag="operation_46" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="47" tag="operation_47" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="47" tag="operation_47" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="The size in bytes of a single pixel in this color model" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="48" tag="operation_48" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="48" tag="operation_48" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Whether this color model has a channel of type ALPHA" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="50" tag="operation_50" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="50" tag="operation_50" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="51" tag="operation_51" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="51" tag="operation_51" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="52" tag="operation_52" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="52" tag="operation_52" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Return a string with the channel's value suitable for display in the gui." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="58" tag="operation_58" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="58" tag="operation_58" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Return a string with the channel's value with integer&amp;#010;channels normalised to the floating point range 0 to 1, if appropriate." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="61" tag="operation_61" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="61" tag="operation_61" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="62" tag="operation_62" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="62" tag="operation_62" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="64" tag="operation_64" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="64" tag="operation_64" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="65" tag="operation_65" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="65" tag="operation_65" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="67" tag="operation_67" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="67" tag="operation_67" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="68" tag="operation_68" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="68" tag="operation_68" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="//========== Capabilities =================================================///**&amp;#010;Returns the list of user-visible composite ops supported by this colourspace. Internal&amp;#010;ops such as COPY, CLEAR, and ERASE, are not included as these make no sense&amp;#010;for layers in the full image model." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="70" tag="operation_70" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="70" tag="operation_70" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="71" tag="operation_71" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="71" tag="operation_71" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="//========== Display profiles =============================================///**&amp;#010;Get a list of profiles that apply to this color space" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="73" tag="operation_73" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="73" tag="operation_73" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Return the number of profiles available for this color space" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="74" tag="operation_74" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="74" tag="operation_74" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="//================= Conversion functions ==================================///**&amp;#010;The nativeColor methods take a given color defined as an RGB QColor&amp;#010;and fills a byte array with the corresponding color in the&amp;#010;the colorspace managed by this strategy.&amp;#010;&amp;#010;The profile parameter is the profile of the paint device; the other profile&amp;#010;is the display profile -- since we are moving from QColor&amp;#010;that have most likely been picked from the display itself.&amp;#010;&amp;#010;XXX: We actually do not use the display yet, nor the paint device profile" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="82" tag="operation_82" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="82" tag="operation_82" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="88" tag="operation_88" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="88" tag="operation_88" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="The toQColor methods take a byte array that is at least pixelSize() long&amp;#010;and converts the contents to a QColor, using the given profile as a source&amp;#010;profile and the display profile as a destination profile.&amp;#010;&amp;#010;XXX: We actually do not use the display yet, nor the paint device profile&amp;#010;" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="93" tag="operation_93" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="93" tag="operation_93" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="99" tag="operation_99" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="99" tag="operation_99" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Get the alpha value of the given pixel.&amp;#010;XXX: Change to float/int to match setAlpha() when that changes." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="102" tag="operation_102" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="102" tag="operation_102" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="105" tag="operation_105" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="105" tag="operation_105" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="108" tag="operation_108" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="108" tag="operation_108" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="This function is used to convert a KisPixelRepresentation from this color strategy to the specified&amp;#010;color strategy." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="113" tag="operation_113" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="113" tag="operation_113" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Convert the pixels in data to (8-bit BGRA) QImage using the specified profiles.&amp;#010;The pixels are supposed to be encoded in this color model.&amp;#010;&amp;#010;@param data A pointer to a contiguous memory region containing width * height pixels&amp;#010;@param width in pixels&amp;#010;@param height in pixels&amp;#010;@param srcProfile source profile&amp;#010;@param dstProfile destination profile&amp;#010;@param renderingIntent the rendering intent&amp;#010;@param exposure The exposure setting for rendering a preview of a high dynamic range image." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="122" tag="operation_122" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="122" tag="operation_122" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Convert a byte array of srcLen pixels *src to the specified color space&amp;#010;and put the converted bytes into the prepared byte array *dst.&amp;#010;&amp;#010;Returns false if the conversion failed, true if it succeeded" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="131" tag="operation_131" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="131" tag="operation_131" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Convert the value of the channel at the specified position into&amp;#010;an 8-bit value." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="134" tag="operation_134" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="134" tag="operation_134" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Convert the value of the channel at the specified position into&amp;#010;a 16-bit value. This may be upscaling or downscaling, depending&amp;#010;on the defined value of the channel" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="137" tag="operation_137" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="137" tag="operation_137" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="//============================== Manipulation fucntions ==========================//// // The manipulation functions have default implementations that _convert_ the pixel// to a QColor and back. Reimplement these methods in your color strategy!///**&amp;#010;Set the alpha channel to the given value.&amp;#010;&amp;#010;pixels -- a pointer to the pixels that will have their alpha set to this value&amp;#010;alpha --  XXX: This must become int or float&amp;#010;nPixels -- the number of pixels&amp;#010;&amp;#010;XXX: Also add a function that modifies the current alpha with the given alpha, i.e., premultiply them?" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="141" tag="operation_141" canDelete="false" writeOutText="false" >
+        <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." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="145" tag="operation_145" canDelete="false" writeOutText="false" >
+        <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." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="149" tag="operation_149" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="149" tag="operation_149" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Create an adjustment object for adjusting the brightness and contrast&amp;#010;transferValues is a 256 bins array with values from 0 to 0xFFFF" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="155" tag="operation_155" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="155" tag="operation_155" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Apply the adjustment created with onr of the other functions" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="160" tag="operation_160" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="160" tag="operation_160" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="// XXX: What with alpha channels? YYY: Add an overloaded function that takes alpha into account?/**&amp;#010;Get the difference between 2 colors, normalized in the range (0,255)" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="164" tag="operation_164" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="164" tag="operation_164" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Mix the colors given their weights and return in dst&amp;#010;The sum of weights is assumed 255" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="170" tag="operation_170" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="170" tag="operation_170" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Convolve the given array of pointers to pixels and return the result&amp;#010;in dst. The kernel values are clamped between -128 and 128" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="181" tag="operation_181" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="181" tag="operation_181" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Darken all color channels with the given amount. If compensate is true,&amp;#010;the compensation factor will be used to limit the darkening.&amp;#010;&amp;#010;(See the bumpmap filter)" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="188" tag="operation_188" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="188" tag="operation_188" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Calculate the intensity of the given pixel, scaled down to the range 0-255. XXX: Maybe this should be more flexible" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="190" tag="operation_190" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="190" tag="operation_190" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Compose two arrays of pixels together. If source and target&amp;#010;are not the same colour model, the source pixels will be&amp;#010;converted to the target model." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="206" tag="operation_206" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="206" tag="operation_206" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Compose two byte arrays containing pixels in the same color&amp;#010;model together." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="217" tag="operation_217" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="217" tag="operation_217" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="223" tag="operation_223" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="223" tag="operation_223" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="224" tag="operation_224" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="224" tag="operation_224" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="239" tag="operation_239" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="239" tag="operation_239" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="242" tag="operation_242" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="242" tag="operation_242" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -18362,261 +18362,261 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="227" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="227" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="227" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="227" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="227" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="227" text="return m_profileFilenames;" >
+       <codeaccessormethod accessType="0" parent_id="227" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="227" text="return m_profileFilenames;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="227" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="227" text="m_profileFilenames = value;" >
+       <codeaccessormethod accessType="1" parent_id="227" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="227" text="m_profileFilenames = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="228" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="228" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="228" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="228" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="228" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="228" text="return m_defaultProfile;" >
+       <codeaccessormethod accessType="0" parent_id="228" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="228" text="return m_defaultProfile;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="228" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="228" text="m_defaultProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="228" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="228" text="m_defaultProfile = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="229" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="229" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// A small buffer for conversion from and to qcolor." />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="229" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="229" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="229" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="229" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="229" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="229" text="return m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="229" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="229" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="229" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="229" text="m_qcolordata = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="230" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="230" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="230" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="230" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="230" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="230" text="return m_alphaPos;" >
+       <codeaccessormethod accessType="0" parent_id="230" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="230" text="return m_alphaPos;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="230" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="230" text="m_alphaPos = value;" >
+       <codeaccessormethod accessType="1" parent_id="230" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="230" text="m_alphaPos = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="231" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="231" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="231" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="231" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="231" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="231" text="return m_alphaSize;" >
+       <codeaccessormethod accessType="0" parent_id="231" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="231" text="return m_alphaSize;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="231" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="231" text="m_alphaSize = value;" >
+       <codeaccessormethod accessType="1" parent_id="231" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="231" text="m_alphaSize = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="232" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="232" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="232" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="232" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="232" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="232" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="232" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="232" text="return m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="232" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="232" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="232" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="232" text="m_defaultToRGB = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="233" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="233" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="233" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="233" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="233" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="233" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="233" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="233" text="return m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="233" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="233" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="233" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="233" text="m_defaultFromRGB = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="234" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="234" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="234" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="234" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="234" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="234" text="return m_id;" >
+       <codeaccessormethod accessType="0" parent_id="234" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="234" text="return m_id;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="234" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="234" text="m_id = value;" >
+       <codeaccessormethod accessType="1" parent_id="234" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="234" text="m_id = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="235" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="235" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// The colorspace type as defined by littlecms" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="235" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="235" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="235" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="235" text="return m_cmType;" >
+       <codeaccessormethod accessType="0" parent_id="235" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="235" text="return m_cmType;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@return the value of m_cmType" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="235" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="235" text="m_cmType = value;" >
+       <codeaccessormethod accessType="1" parent_id="235" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="235" text="m_cmType = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@param value the value of m_cmType" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="236" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="236" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// The colorspace signature as defined in icm/icc files" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="236" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="236" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="236" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="236" text="return m_colorSpaceSignature;" >
+       <codeaccessormethod accessType="0" parent_id="236" tag="hblock_tag_18" canDelete="false" writeOutText="false" classfield_id="236" text="return m_colorSpaceSignature;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@return the value of m_colorSpaceSignature" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="236" tag="hblock_tag_19" canDelete="false" writeOutText="false" classfield_id="236" text="m_colorSpaceSignature = value;" >
+       <codeaccessormethod accessType="1" parent_id="236" tag="hblock_tag_19" canDelete="false" writeOutText="false" classfield_id="236" text="m_colorSpaceSignature = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@param value the value of m_colorSpaceSignature" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// Cache for existing transforms" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="238" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="238" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="238" tag="hblock_tag_20" canDelete="false" writeOutText="false" classfield_id="238" text="return m_transforms;" >
+       <codeaccessormethod accessType="0" parent_id="238" tag="hblock_tag_20" canDelete="false" writeOutText="false" classfield_id="238" text="return m_transforms;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@return the value of m_transforms" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="238" tag="hblock_tag_21" canDelete="false" writeOutText="false" classfield_id="238" text="m_transforms = value;" >
+       <codeaccessormethod accessType="1" parent_id="238" tag="hblock_tag_21" canDelete="false" writeOutText="false" classfield_id="238" text="m_transforms = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@param value the value of m_transforms" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="245" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="245" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="245" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="245" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="245" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="245" text="return m_cachesize;" >
+       <codeaccessormethod accessType="0" parent_id="245" tag="hblock_tag_22" canDelete="false" writeOutText="false" classfield_id="245" text="return m_cachesize;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="245" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="245" text="m_cachesize = value;" >
+       <codeaccessormethod accessType="1" parent_id="245" tag="hblock_tag_23" canDelete="false" writeOutText="false" classfield_id="245" text="m_cachesize = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="246" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="246" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="246" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="246" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="246" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="246" text="return m_conversionCache;" >
+       <codeaccessormethod accessType="0" parent_id="246" tag="hblock_tag_24" canDelete="false" writeOutText="false" classfield_id="246" text="return m_conversionCache;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="246" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="246" text="m_conversionCache = value;" >
+       <codeaccessormethod accessType="1" parent_id="246" tag="hblock_tag_25" canDelete="false" writeOutText="false" classfield_id="246" text="m_conversionCache = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -18624,7 +18624,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="27" tqparent_class="27" fileExt=".cpp" fileName="kshared" >
+    <classifiercodedocument writeOutCode="true" package="" id="27" parent_class="27" fileExt=".cpp" fileName="kshared" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kshared.h&quot;&amp;#010;" >
        <header>
@@ -18649,7 +18649,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="33" tqparent_class="33" fileExt=".cpp" fileName="kisid" >
+    <classifiercodedocument writeOutCode="true" package="" id="33" parent_class="33" fileExt=".cpp" fileName="kisid" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisid.h&quot;&amp;#010;" >
        <header>
@@ -18674,7 +18674,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="36" tqparent_class="36" fileExt=".cpp" fileName="dword" >
+    <classifiercodedocument writeOutCode="true" package="" id="36" parent_class="36" fileExt=".cpp" fileName="dword" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;dword.h&quot;&amp;#010;" >
        <header>
@@ -18699,7 +18699,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="38" tqparent_class="38" fileExt=".cpp" fileName="iccolorspacesignature" >
+    <classifiercodedocument writeOutCode="true" package="" id="38" parent_class="38" fileExt=".cpp" fileName="iccolorspacesignature" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;iccolorspacesignature.h&quot;&amp;#010;" >
        <header>
@@ -18724,7 +18724,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="42" tqparent_class="42" fileExt=".cpp" fileName="vkischannelinfosp" >
+    <classifiercodedocument writeOutCode="true" package="" id="42" parent_class="42" fileExt=".cpp" fileName="vkischannelinfosp" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;vkischannelinfosp.h&quot;&amp;#010;" >
        <header>
@@ -18749,7 +18749,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="44" tqparent_class="44" fileExt=".cpp" fileName="q_int32" >
+    <classifiercodedocument writeOutCode="true" package="" id="44" parent_class="44" fileExt=".cpp" fileName="q_int32" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;q_int32.h&quot;&amp;#010;" >
        <header>
@@ -18774,7 +18774,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="49" tqparent_class="49" fileExt=".cpp" fileName="bool" >
+    <classifiercodedocument writeOutCode="true" package="" id="49" parent_class="49" fileExt=".cpp" fileName="bool" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;bool.h&quot;&amp;#010;" >
        <header>
@@ -18799,7 +18799,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="53" tqparent_class="53" fileExt=".cpp" fileName="q_uint8" >
+    <classifiercodedocument writeOutCode="true" package="" id="53" parent_class="53" fileExt=".cpp" fileName="q_uint8" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;q_uint8.h&quot;&amp;#010;" >
        <header>
@@ -18824,7 +18824,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="57" tqparent_class="57" fileExt=".cpp" fileName="qstring" >
+    <classifiercodedocument writeOutCode="true" package="" id="57" parent_class="57" fileExt=".cpp" fileName="qstring" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;qstring.h&quot;&amp;#010;" >
        <header>
@@ -18849,7 +18849,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="69" tqparent_class="69" fileExt=".cpp" fileName="kiscompositeoplist" >
+    <classifiercodedocument writeOutCode="true" package="" id="69" parent_class="69" fileExt=".cpp" fileName="kiscompositeoplist" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kiscompositeoplist.h&quot;&amp;#010;" >
        <header>
@@ -18874,7 +18874,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="72" tqparent_class="72" fileExt=".cpp" fileName="vkisprofilesp" >
+    <classifiercodedocument writeOutCode="true" package="" id="72" parent_class="72" fileExt=".cpp" fileName="vkisprofilesp" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;vkisprofilesp.h&quot;&amp;#010;" >
        <header>
@@ -18899,7 +18899,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="75" tqparent_class="75" fileExt=".cpp" fileName="qcolor" >
+    <classifiercodedocument writeOutCode="true" package="" id="75" parent_class="75" fileExt=".cpp" fileName="qcolor" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;qcolor.h&quot;&amp;#010;" >
        <header>
@@ -18924,7 +18924,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="80" tqparent_class="80" fileExt=".cpp" fileName="kisprofilesp" >
+    <classifiercodedocument writeOutCode="true" package="" id="80" parent_class="80" fileExt=".cpp" fileName="kisprofilesp" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisprofilesp.h&quot;&amp;#010;" >
        <header>
@@ -18949,7 +18949,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="84" tqparent_class="84" fileExt=".cpp" fileName="quantum" >
+    <classifiercodedocument writeOutCode="true" package="" id="84" parent_class="84" fileExt=".cpp" fileName="quantum" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;quantum.h&quot;&amp;#010;" >
        <header>
@@ -18974,7 +18974,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="121" tqparent_class="121" fileExt=".cpp" fileName="qimage" >
+    <classifiercodedocument writeOutCode="true" package="" id="121" parent_class="121" fileExt=".cpp" fileName="qimage" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;qimage.h&quot;&amp;#010;" >
        <header>
@@ -18999,7 +18999,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="150" tqparent_class="150" fileExt=".cpp" fileName="q_uint16" >
+    <classifiercodedocument writeOutCode="true" package="" id="150" parent_class="150" fileExt=".cpp" fileName="q_uint16" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;q_uint16.h&quot;&amp;#010;" >
        <header>
@@ -19024,7 +19024,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="153" tqparent_class="153" fileExt=".cpp" fileName="kiscoloradjustment" >
+    <classifiercodedocument writeOutCode="true" package="" id="153" parent_class="153" fileExt=".cpp" fileName="kiscoloradjustment" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kiscoloradjustment.h&quot;&amp;#010;" >
        <header>
@@ -19049,7 +19049,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="163" tqparent_class="163" fileExt=".cpp" fileName="q_int8" >
+    <classifiercodedocument writeOutCode="true" package="" id="163" parent_class="163" fileExt=".cpp" fileName="q_int8" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;q_int8.h&quot;&amp;#010;" >
        <header>
@@ -19074,7 +19074,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="175" tqparent_class="175" fileExt=".cpp" fileName="enumchannelflags" >
+    <classifiercodedocument writeOutCode="true" package="" id="175" parent_class="175" fileExt=".cpp" fileName="enumchannelflags" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;enumchannelflags.h&quot;&amp;#010;" >
        <header>
@@ -19099,7 +19099,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="201" tqparent_class="201" fileExt=".cpp" fileName="kiscompositeop" >
+    <classifiercodedocument writeOutCode="true" package="" id="201" parent_class="201" fileExt=".cpp" fileName="kiscompositeop" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kiscompositeop.h&quot;&amp;#010;" >
        <header>
@@ -19124,7 +19124,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="222" tqparent_class="222" fileExt=".cpp" fileName="cmshtransform" >
+    <classifiercodedocument writeOutCode="true" package="" id="222" parent_class="222" fileExt=".cpp" fileName="cmshtransform" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;cmshtransform.h&quot;&amp;#010;" >
        <header>
@@ -19149,7 +19149,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="226" tqparent_class="226" fileExt=".cpp" fileName="qstringlist" >
+    <classifiercodedocument writeOutCode="true" package="" id="226" parent_class="226" fileExt=".cpp" fileName="qstringlist" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;qstringlist.h&quot;&amp;#010;" >
        <header>
@@ -19174,7 +19174,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="kisabstractcolorspace" id="237" tqparent_class="237" fileExt=".cpp" fileName="transformmap" >
+    <classifiercodedocument writeOutCode="true" package="kisabstractcolorspace" id="237" parent_class="237" fileExt=".cpp" fileName="transformmap" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;transformmap.h&quot;&amp;#010;" >
        <header>
@@ -19199,7 +19199,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="247" tqparent_class="247" fileExt=".cpp" fileName="kisu8basecolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="247" parent_class="247" fileExt=".cpp" fileName="kisu8basecolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisu8basecolorspace.h&quot;&amp;#010;" >
        <header>
@@ -19217,7 +19217,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="251" tag="operation_251" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="251" tag="operation_251" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19230,7 +19230,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="255" tqparent_class="255" fileExt=".cpp" fileName="kisalphacolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="255" parent_class="255" fileExt=".cpp" fileName="kisalphacolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisalphacolorspace.h&quot;&amp;#010;" >
        <header>
@@ -19248,132 +19248,132 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="349" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="349" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="349" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="349" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="349" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="349" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="349" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="349" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="259" tag="operation_259" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="259" tag="operation_259" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="260" tag="operation_260" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="260" tag="operation_260" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="261" tag="operation_261" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="261" tag="operation_261" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="265" tag="operation_265" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="265" tag="operation_265" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="270" tag="operation_270" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="270" tag="operation_270" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="273" tag="operation_273" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="273" tag="operation_273" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="277" tag="operation_277" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="277" tag="operation_277" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="282" tag="operation_282" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="282" tag="operation_282" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="285" tag="operation_285" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="285" tag="operation_285" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="288" tag="operation_288" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="288" tag="operation_288" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="291" tag="operation_291" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="291" tag="operation_291" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="296" tag="operation_296" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="296" tag="operation_296" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="297" tag="operation_297" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="297" tag="operation_297" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="298" tag="operation_298" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="298" tag="operation_298" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="299" tag="operation_299" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="299" tag="operation_299" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="300" tag="operation_300" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="300" tag="operation_300" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="301" tag="operation_301" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="301" tag="operation_301" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="304" tag="operation_304" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="304" tag="operation_304" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="307" tag="operation_307" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="307" tag="operation_307" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="315" tag="operation_315" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="315" tag="operation_315" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="321" tag="operation_321" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="321" tag="operation_321" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="329" tag="operation_329" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="329" tag="operation_329" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Convert a byte array of srcLen pixels *src to the specified color space&amp;#010;and put the converted bytes into the prepared byte array *dst.&amp;#010;&amp;#010;Returns false if the conversion failed, true if it succeeded" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="337" tag="operation_337" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="337" tag="operation_337" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="348" tag="operation_348" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="348" tag="operation_348" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19385,21 +19385,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="349" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="349" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="349" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="349" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="349" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="349" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="349" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="349" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="349" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="349" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="349" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="349" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -19407,7 +19407,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="350" tqparent_class="350" fileExt=".cpp" fileName="kisf32basecolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="350" parent_class="350" fileExt=".cpp" fileName="kisf32basecolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisf32basecolorspace.h&quot;&amp;#010;" >
        <header>
@@ -19425,7 +19425,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeoperation tqparent_id="354" tag="operation_354" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="354" tag="operation_354" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19438,7 +19438,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="358" tqparent_class="358" fileExt=".cpp" fileName="kisu16basecolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="358" parent_class="358" fileExt=".cpp" fileName="kisu16basecolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisu16basecolorspace.h&quot;&amp;#010;" >
        <header>
@@ -19456,27 +19456,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="363" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
+        <codeaccessormethod accessType="0" parent_id="363" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="363" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
+        <codeaccessormethod accessType="1" parent_id="363" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="364" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
+        <codeaccessormethod accessType="0" parent_id="364" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="364" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
+        <codeaccessormethod accessType="1" parent_id="364" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="365" tag="operation_365" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="365" tag="operation_365" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19488,41 +19488,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="363" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="363" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="363" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="363" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="363" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
+       <codeaccessormethod accessType="0" parent_id="363" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="363" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="363" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="364" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="364" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="364" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="364" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="364" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
+       <codeaccessormethod accessType="0" parent_id="364" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="364" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
+       <codeaccessormethod accessType="1" parent_id="364" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -19530,7 +19530,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="369" tqparent_class="369" fileExt=".cpp" fileName="kisxyzcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="369" parent_class="369" fileExt=".cpp" fileName="kisxyzcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisxyzcolorspace.h&quot;&amp;#010;" >
        <header>
@@ -19548,252 +19548,252 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="570" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="570" text="return PIXEL_X;" >
+        <codeaccessormethod accessType="0" parent_id="570" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="570" text="return PIXEL_X;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="570" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="570" text="PIXEL_X = value;" >
+        <codeaccessormethod accessType="1" parent_id="570" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="570" text="PIXEL_X = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="571" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="571" text="return PIXEL_Y;" >
+        <codeaccessormethod accessType="0" parent_id="571" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="571" text="return PIXEL_Y;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="571" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="571" text="PIXEL_Y = value;" >
+        <codeaccessormethod accessType="1" parent_id="571" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="571" text="PIXEL_Y = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="572" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="572" text="return PIXEL_Z;" >
+        <codeaccessormethod accessType="0" parent_id="572" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="572" text="return PIXEL_Z;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="572" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="572" text="PIXEL_Z = value;" >
+        <codeaccessormethod accessType="1" parent_id="572" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="572" text="PIXEL_Z = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="573" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="573" text="return PIXEL_ALPHA;" >
+        <codeaccessormethod accessType="0" parent_id="573" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="573" text="return PIXEL_ALPHA;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="573" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="573" text="PIXEL_ALPHA = value;" >
+        <codeaccessormethod accessType="1" parent_id="573" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="573" text="PIXEL_ALPHA = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="566" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="566" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="566" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="566" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="566" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="566" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="566" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="566" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="567" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="567" text="return m_defaultToRGB;" >
+        <codeaccessormethod accessType="0" parent_id="567" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="567" text="return m_defaultToRGB;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="567" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="567" text="m_defaultToRGB = value;" >
+        <codeaccessormethod accessType="1" parent_id="567" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="567" text="m_defaultToRGB = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="568" text="return m_defaultFromRGB;" >
+        <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="568" text="return m_defaultFromRGB;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="568" text="m_defaultFromRGB = value;" >
+        <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="568" text="m_defaultFromRGB = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="574" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="574" text="return m_qcolordata;" >
+        <codeaccessormethod accessType="0" parent_id="574" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="574" text="return m_qcolordata;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="574" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="574" text="m_qcolordata = value;" >
+        <codeaccessormethod accessType="1" parent_id="574" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="574" text="m_qcolordata = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="378" tag="operation_378" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="378" tag="operation_378" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="379" tag="operation_379" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="379" tag="operation_379" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="380" tag="operation_380" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="380" tag="operation_380" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="384" tag="operation_384" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="384" tag="operation_384" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="389" tag="operation_389" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="389" tag="operation_389" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="392" tag="operation_392" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="392" tag="operation_392" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="396" tag="operation_396" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="396" tag="operation_396" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="400" tag="operation_400" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="400" tag="operation_400" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="405" tag="operation_405" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="405" tag="operation_405" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="408" tag="operation_408" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="408" tag="operation_408" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="411" tag="operation_411" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="411" tag="operation_411" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="414" tag="operation_414" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="414" tag="operation_414" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="419" tag="operation_419" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="419" tag="operation_419" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="420" tag="operation_420" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="420" tag="operation_420" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="421" tag="operation_421" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="421" tag="operation_421" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="422" tag="operation_422" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="422" tag="operation_422" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="423" tag="operation_423" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="423" tag="operation_423" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="424" tag="operation_424" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="424" tag="operation_424" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="427" tag="operation_427" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="427" tag="operation_427" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="430" tag="operation_430" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="430" tag="operation_430" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="438" tag="operation_438" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="438" tag="operation_438" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="444" tag="operation_444" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="444" tag="operation_444" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="455" tag="operation_455" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="455" tag="operation_455" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="456" tag="operation_456" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="456" tag="operation_456" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="466" tag="operation_466" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="466" tag="operation_466" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="476" tag="operation_476" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="476" tag="operation_476" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="486" tag="operation_486" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="486" tag="operation_486" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="496" tag="operation_496" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="496" tag="operation_496" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="506" tag="operation_506" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="506" tag="operation_506" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="516" tag="operation_516" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="516" tag="operation_516" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="526" tag="operation_526" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="526" tag="operation_526" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="536" tag="operation_536" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="536" tag="operation_536" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="546" tag="operation_546" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="546" tag="operation_546" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="556" tag="operation_556" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="556" tag="operation_556" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -19805,161 +19805,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="566" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="566" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="566" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="566" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="566" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="566" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="566" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="566" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="566" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="566" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="566" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="566" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="567" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="567" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="567" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="567" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="567" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="567" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="567" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="567" text="return m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="567" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="567" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="567" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="567" text="m_defaultToRGB = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="568" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="568" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="568" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="568" text="return m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="568" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="568" text="m_defaultFromRGB = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="570" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="570" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="570" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="570" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="570" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="570" text="return PIXEL_X;" >
+       <codeaccessormethod accessType="0" parent_id="570" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="570" text="return PIXEL_X;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="570" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="570" text="PIXEL_X = value;" >
+       <codeaccessormethod accessType="1" parent_id="570" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="570" text="PIXEL_X = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="571" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="571" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="571" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="571" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="571" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="571" text="return PIXEL_Y;" >
+       <codeaccessormethod accessType="0" parent_id="571" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="571" text="return PIXEL_Y;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="571" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="571" text="PIXEL_Y = value;" >
+       <codeaccessormethod accessType="1" parent_id="571" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="571" text="PIXEL_Y = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="572" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="572" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="572" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="572" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="572" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="572" text="return PIXEL_Z;" >
+       <codeaccessormethod accessType="0" parent_id="572" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="572" text="return PIXEL_Z;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="572" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="572" text="PIXEL_Z = value;" >
+       <codeaccessormethod accessType="1" parent_id="572" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="572" text="PIXEL_Z = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="573" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="573" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="573" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="573" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="573" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="573" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="573" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="573" text="return PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="573" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="573" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="573" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="573" text="PIXEL_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="574" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="574" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// A small buffer for conversion from and to qcolor." />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="574" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="574" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="574" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="574" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="574" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="574" text="return m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="574" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="574" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="574" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="574" text="m_qcolordata = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
         </header>
@@ -19967,7 +19967,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="kisrgbu16colorspace" id="373" tqparent_class="373" fileExt=".cpp" fileName="pixel" >
+    <classifiercodedocument writeOutCode="true" package="kisrgbu16colorspace" id="373" parent_class="373" fileExt=".cpp" fileName="pixel" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;pixel.h&quot;&amp;#010;" >
        <header>
@@ -19985,72 +19985,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="374" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="374" text="return X;" >
+        <codeaccessormethod accessType="0" parent_id="374" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="374" text="return X;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="374" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="374" text="X = value;" >
+        <codeaccessormethod accessType="1" parent_id="374" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="374" text="X = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="375" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="375" text="return Y;" >
+        <codeaccessormethod accessType="0" parent_id="375" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="375" text="return Y;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="375" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="375" text="Y = value;" >
+        <codeaccessormethod accessType="1" parent_id="375" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="375" text="Y = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="376" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="376" text="return Z;" >
+        <codeaccessormethod accessType="0" parent_id="376" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="376" text="return Z;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="376" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="376" text="Z = value;" >
+        <codeaccessormethod accessType="1" parent_id="376" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="376" text="Z = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="377" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="377" text="return alpha;" >
+        <codeaccessormethod accessType="0" parent_id="377" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="377" text="return alpha;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="377" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="377" text="alpha = value;" >
+        <codeaccessormethod accessType="1" parent_id="377" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="377" text="alpha = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1130" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1130" text="return blue;" >
+        <codeaccessormethod accessType="0" parent_id="1130" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1130" text="return blue;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1130" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1130" text="blue = value;" >
+        <codeaccessormethod accessType="1" parent_id="1130" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1130" text="blue = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1131" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1131" text="return green;" >
+        <codeaccessormethod accessType="0" parent_id="1131" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1131" text="return green;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1131" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1131" text="green = value;" >
+        <codeaccessormethod accessType="1" parent_id="1131" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1131" text="green = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1132" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1132" text="return red;" >
+        <codeaccessormethod accessType="0" parent_id="1132" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1132" text="return red;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1132" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1132" text="red = value;" >
+        <codeaccessormethod accessType="1" parent_id="1132" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1132" text="red = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -20062,141 +20062,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="374" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="374" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="374" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="374" text="return X;" >
+       <codeaccessormethod accessType="0" parent_id="374" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="374" text="return X;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="374" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="374" text="X = value;" >
+       <codeaccessormethod accessType="1" parent_id="374" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="374" text="X = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="375" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="375" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="375" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="375" text="return Y;" >
+       <codeaccessormethod accessType="0" parent_id="375" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="375" text="return Y;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="375" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="375" text="Y = value;" >
+       <codeaccessormethod accessType="1" parent_id="375" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="375" text="Y = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="376" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="376" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="376" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="376" text="return Z;" >
+       <codeaccessormethod accessType="0" parent_id="376" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="376" text="return Z;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="376" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="376" text="Z = value;" >
+       <codeaccessormethod accessType="1" parent_id="376" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="376" text="Z = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="377" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="377" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="377" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="377" text="return alpha;" >
+       <codeaccessormethod accessType="0" parent_id="377" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="377" text="return alpha;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="377" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="377" text="alpha = value;" >
+       <codeaccessormethod accessType="1" parent_id="377" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="377" text="alpha = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1130" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1130" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1130" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1130" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1130" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1130" text="return blue;" >
+       <codeaccessormethod accessType="0" parent_id="1130" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1130" text="return blue;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1130" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1130" text="blue = value;" >
+       <codeaccessormethod accessType="1" parent_id="1130" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1130" text="blue = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1131" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1131" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1131" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1131" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1131" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1131" text="return green;" >
+       <codeaccessormethod accessType="0" parent_id="1131" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1131" text="return green;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1131" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1131" text="green = value;" >
+       <codeaccessormethod accessType="1" parent_id="1131" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1131" text="green = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1132" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1132" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1132" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1132" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1132" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1132" text="return red;" >
+       <codeaccessormethod accessType="0" parent_id="1132" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1132" text="return red;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1132" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1132" text="red = value;" >
+       <codeaccessormethod accessType="1" parent_id="1132" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1132" text="red = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -20204,7 +20204,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="575" tqparent_class="575" fileExt=".cpp" fileName="kiscmykcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="575" parent_class="575" fileExt=".cpp" fileName="kiscmykcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kiscmykcolorspace.h&quot;&amp;#010;" >
        <header>
@@ -20222,212 +20222,212 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="664" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="664" text="return PIXEL_CYAN;" >
+        <codeaccessormethod accessType="0" parent_id="664" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="664" text="return PIXEL_CYAN;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="664" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="664" text="PIXEL_CYAN = value;" >
+        <codeaccessormethod accessType="1" parent_id="664" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="664" text="PIXEL_CYAN = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="665" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="665" text="return PIXEL_MAGENTA;" >
+        <codeaccessormethod accessType="0" parent_id="665" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="665" text="return PIXEL_MAGENTA;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="665" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="665" text="PIXEL_MAGENTA = value;" >
+        <codeaccessormethod accessType="1" parent_id="665" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="665" text="PIXEL_MAGENTA = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="666" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="666" text="return PIXEL_YELLOW;" >
+        <codeaccessormethod accessType="0" parent_id="666" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="666" text="return PIXEL_YELLOW;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="666" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="666" text="PIXEL_YELLOW = value;" >
+        <codeaccessormethod accessType="1" parent_id="666" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="666" text="PIXEL_YELLOW = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="667" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="667" text="return PIXEL_BLACK;" >
+        <codeaccessormethod accessType="0" parent_id="667" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="667" text="return PIXEL_BLACK;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="667" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="667" text="PIXEL_BLACK = value;" >
+        <codeaccessormethod accessType="1" parent_id="667" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="667" text="PIXEL_BLACK = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="668" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
+        <codeaccessormethod accessType="0" parent_id="668" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="668" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
+        <codeaccessormethod accessType="1" parent_id="668" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="660" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="660" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="660" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="660" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="661" text="return m_defaultToRGB;" >
+        <codeaccessormethod accessType="0" parent_id="661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="661" text="return m_defaultToRGB;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="661" text="m_defaultToRGB = value;" >
+        <codeaccessormethod accessType="1" parent_id="661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="661" text="m_defaultToRGB = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="662" text="return m_defaultFromRGB;" >
+        <codeaccessormethod accessType="0" parent_id="662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="662" text="return m_defaultFromRGB;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="662" text="m_defaultFromRGB = value;" >
+        <codeaccessormethod accessType="1" parent_id="662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="662" text="m_defaultFromRGB = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="663" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="663" text="return m_qcolordata;" >
+        <codeaccessormethod accessType="0" parent_id="663" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="663" text="return m_qcolordata;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="663" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="663" text="m_qcolordata = value;" >
+        <codeaccessormethod accessType="1" parent_id="663" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="663" text="m_qcolordata = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="579" tag="operation_579" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="579" tag="operation_579" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="580" tag="operation_580" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="580" tag="operation_580" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="581" tag="operation_581" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="581" tag="operation_581" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="585" tag="operation_585" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="585" tag="operation_585" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="590" tag="operation_590" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="590" tag="operation_590" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="593" tag="operation_593" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="593" tag="operation_593" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="597" tag="operation_597" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="597" tag="operation_597" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="601" tag="operation_601" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="601" tag="operation_601" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="606" tag="operation_606" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="606" tag="operation_606" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="609" tag="operation_609" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="609" tag="operation_609" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="612" tag="operation_612" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="612" tag="operation_612" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="617" tag="operation_617" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="617" tag="operation_617" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="618" tag="operation_618" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="618" tag="operation_618" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="619" tag="operation_619" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="619" tag="operation_619" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="620" tag="operation_620" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="620" tag="operation_620" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="621" tag="operation_621" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="621" tag="operation_621" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="622" tag="operation_622" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="622" tag="operation_622" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="625" tag="operation_625" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="625" tag="operation_625" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="628" tag="operation_628" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="628" tag="operation_628" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="636" tag="operation_636" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="636" tag="operation_636" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="639" tag="operation_639" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="639" tag="operation_639" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="650" tag="operation_650" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="650" tag="operation_650" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="651" tag="operation_651" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="651" tag="operation_651" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="652" tag="operation_652" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="652" tag="operation_652" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -20439,181 +20439,181 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="660" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="660" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="660" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="660" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="660" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="660" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="661" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="661" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="661" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="661" text="return m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="661" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="661" text="m_defaultToRGB = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="662" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="662" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="662" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="662" text="return m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="662" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="662" text="m_defaultFromRGB = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="663" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="663" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="663" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="663" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="663" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="663" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="663" tag="hblock_tag_16" canDelete="false" writeOutText="false" classfield_id="663" text="return m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="663" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="663" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="663" tag="hblock_tag_17" canDelete="false" writeOutText="false" classfield_id="663" text="m_qcolordata = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="664" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="664" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="664" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="664" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="664" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="664" text="return PIXEL_CYAN;" >
+       <codeaccessormethod accessType="0" parent_id="664" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="664" text="return PIXEL_CYAN;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="664" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="664" text="PIXEL_CYAN = value;" >
+       <codeaccessormethod accessType="1" parent_id="664" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="664" text="PIXEL_CYAN = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="665" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="665" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="665" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="665" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="665" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="665" text="return PIXEL_MAGENTA;" >
+       <codeaccessormethod accessType="0" parent_id="665" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="665" text="return PIXEL_MAGENTA;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="665" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="665" text="PIXEL_MAGENTA = value;" >
+       <codeaccessormethod accessType="1" parent_id="665" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="665" text="PIXEL_MAGENTA = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="666" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="666" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="666" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="666" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="666" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="666" text="return PIXEL_YELLOW;" >
+       <codeaccessormethod accessType="0" parent_id="666" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="666" text="return PIXEL_YELLOW;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="666" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="666" text="PIXEL_YELLOW = value;" >
+       <codeaccessormethod accessType="1" parent_id="666" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="666" text="PIXEL_YELLOW = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="667" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="667" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="667" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="667" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="667" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="667" text="return PIXEL_BLACK;" >
+       <codeaccessormethod accessType="0" parent_id="667" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="667" text="return PIXEL_BLACK;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="667" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="667" text="PIXEL_BLACK = value;" >
+       <codeaccessormethod accessType="1" parent_id="667" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="667" text="PIXEL_BLACK = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="668" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="668" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="668" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="668" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="668" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="668" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -20621,7 +20621,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="669" tqparent_class="669" fileExt=".cpp" fileName="kisgraycolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="669" parent_class="669" fileExt=".cpp" fileName="kisgraycolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisgraycolorspace.h&quot;&amp;#010;" >
        <header>
@@ -20639,207 +20639,207 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="861" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="861" text="return PIXEL_GRAY;" >
+        <codeaccessormethod accessType="0" parent_id="861" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="861" text="return PIXEL_GRAY;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="861" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="861" text="PIXEL_GRAY = value;" >
+        <codeaccessormethod accessType="1" parent_id="861" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="861" text="PIXEL_GRAY = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="862" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
+        <codeaccessormethod accessType="0" parent_id="862" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="862" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
+        <codeaccessormethod accessType="1" parent_id="862" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="860" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="860" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="860" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="860" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="673" tag="operation_673" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="673" tag="operation_673" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="674" tag="operation_674" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="674" tag="operation_674" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="675" tag="operation_675" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="675" tag="operation_675" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="679" tag="operation_679" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="679" tag="operation_679" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="683" tag="operation_683" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="683" tag="operation_683" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="687" tag="operation_687" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="687" tag="operation_687" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="692" tag="operation_692" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="692" tag="operation_692" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="695" tag="operation_695" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="695" tag="operation_695" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="699" tag="operation_699" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="699" tag="operation_699" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="703" tag="operation_703" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="703" tag="operation_703" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="708" tag="operation_708" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="708" tag="operation_708" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="711" tag="operation_711" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="711" tag="operation_711" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="714" tag="operation_714" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="714" tag="operation_714" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="717" tag="operation_717" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="717" tag="operation_717" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="722" tag="operation_722" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="722" tag="operation_722" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="723" tag="operation_723" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="723" tag="operation_723" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="724" tag="operation_724" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="724" tag="operation_724" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="725" tag="operation_725" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="725" tag="operation_725" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="726" tag="operation_726" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="726" tag="operation_726" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="727" tag="operation_727" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="727" tag="operation_727" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="730" tag="operation_730" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="730" tag="operation_730" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="733" tag="operation_733" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="733" tag="operation_733" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="741" tag="operation_741" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="741" tag="operation_741" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="747" tag="operation_747" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="747" tag="operation_747" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="758" tag="operation_758" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="758" tag="operation_758" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="759" tag="operation_759" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="759" tag="operation_759" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="769" tag="operation_769" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="769" tag="operation_769" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="779" tag="operation_779" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="779" tag="operation_779" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="789" tag="operation_789" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="789" tag="operation_789" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="799" tag="operation_799" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="799" tag="operation_799" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="809" tag="operation_809" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="809" tag="operation_809" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="819" tag="operation_819" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="819" tag="operation_819" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="829" tag="operation_829" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="829" tag="operation_829" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="839" tag="operation_839" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="839" tag="operation_839" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="849" tag="operation_849" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="849" tag="operation_849" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -20851,61 +20851,61 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="860" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="860" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="860" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="860" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="860" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="860" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="861" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="861" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="861" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="861" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="861" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="861" text="return PIXEL_GRAY;" >
+       <codeaccessormethod accessType="0" parent_id="861" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="861" text="return PIXEL_GRAY;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="861" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="861" text="PIXEL_GRAY = value;" >
+       <codeaccessormethod accessType="1" parent_id="861" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="861" text="PIXEL_GRAY = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="862" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="862" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="862" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="862" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="862" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="862" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="862" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="862" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -20913,7 +20913,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="859" tqparent_class="859" fileExt=".cpp" fileName="kisgraycolorspacetester" >
+    <classifiercodedocument writeOutCode="true" package="" id="859" parent_class="859" fileExt=".cpp" fileName="kisgraycolorspacetester" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisgraycolorspacetester.h&quot;&amp;#010;" >
        <header>
@@ -20938,7 +20938,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="863" tqparent_class="863" fileExt=".cpp" fileName="rgbf32plugin" >
+    <classifiercodedocument writeOutCode="true" package="" id="863" parent_class="863" fileExt=".cpp" fileName="rgbf32plugin" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;rgbf32plugin.h&quot;&amp;#010;" >
        <header>
@@ -20956,22 +20956,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="878" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
+        <codeaccessormethod accessType="0" parent_id="878" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="878" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
+        <codeaccessormethod accessType="1" parent_id="878" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="869" tag="operation_869" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="869" tag="operation_869" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="877" tag="operation_877" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="877" tag="operation_877" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -20983,21 +20983,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="878" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="878" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="878" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="878" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="878" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
+       <codeaccessormethod accessType="0" parent_id="878" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="878" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
+       <codeaccessormethod accessType="1" parent_id="878" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -21005,7 +21005,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="864" tqparent_class="864" fileExt=".cpp" fileName="kparts" >
+    <classifiercodedocument writeOutCode="true" package="" id="864" parent_class="864" fileExt=".cpp" fileName="kparts" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kparts.h&quot;&amp;#010;" >
        <header>
@@ -21030,7 +21030,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="kparts" id="865" tqparent_class="865" fileExt=".cpp" fileName="plugin" >
+    <classifiercodedocument writeOutCode="true" package="kparts" id="865" parent_class="865" fileExt=".cpp" fileName="plugin" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;plugin.h&quot;&amp;#010;" >
        <header>
@@ -21055,7 +21055,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="870" tqparent_class="870" fileExt=".cpp" fileName="qobject" >
+    <classifiercodedocument writeOutCode="true" package="" id="870" parent_class="870" fileExt=".cpp" fileName="qobject" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;qobject.h&quot;&amp;#010;" >
        <header>
@@ -21080,7 +21080,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="879" tqparent_class="879" fileExt=".cpp" fileName="kisf32rgbcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="879" parent_class="879" fileExt=".cpp" fileName="kisf32rgbcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisf32rgbcolorspace.h&quot;&amp;#010;" >
        <header>
@@ -21098,252 +21098,252 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1126" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1126" text="return PIXEL_BLUE;" >
+        <codeaccessormethod accessType="0" parent_id="1126" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1126" text="return PIXEL_BLUE;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1126" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1126" text="PIXEL_BLUE = value;" >
+        <codeaccessormethod accessType="1" parent_id="1126" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1126" text="PIXEL_BLUE = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1127" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1127" text="return PIXEL_GREEN;" >
+        <codeaccessormethod accessType="0" parent_id="1127" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1127" text="return PIXEL_GREEN;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1127" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1127" text="PIXEL_GREEN = value;" >
+        <codeaccessormethod accessType="1" parent_id="1127" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1127" text="PIXEL_GREEN = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1128" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1128" text="return PIXEL_RED;" >
+        <codeaccessormethod accessType="0" parent_id="1128" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1128" text="return PIXEL_RED;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1128" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1128" text="PIXEL_RED = value;" >
+        <codeaccessormethod accessType="1" parent_id="1128" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1128" text="PIXEL_RED = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1129" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1129" text="return PIXEL_ALPHA;" >
+        <codeaccessormethod accessType="0" parent_id="1129" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1129" text="return PIXEL_ALPHA;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1129" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1129" text="PIXEL_ALPHA = value;" >
+        <codeaccessormethod accessType="1" parent_id="1129" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1129" text="PIXEL_ALPHA = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1125" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1125" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="1125" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1125" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1125" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1125" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="1125" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1125" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="883" tag="operation_883" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="883" tag="operation_883" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="884" tag="operation_884" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="884" tag="operation_884" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="885" tag="operation_885" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="885" tag="operation_885" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="891" tag="operation_891" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="891" tag="operation_891" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="898" tag="operation_898" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="898" tag="operation_898" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="902" tag="operation_902" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="902" tag="operation_902" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="907" tag="operation_907" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="907" tag="operation_907" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="910" tag="operation_910" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="910" tag="operation_910" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="914" tag="operation_914" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="914" tag="operation_914" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="918" tag="operation_918" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="918" tag="operation_918" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="923" tag="operation_923" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="923" tag="operation_923" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="926" tag="operation_926" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="926" tag="operation_926" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="929" tag="operation_929" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="929" tag="operation_929" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="932" tag="operation_932" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="932" tag="operation_932" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="937" tag="operation_937" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="937" tag="operation_937" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="938" tag="operation_938" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="938" tag="operation_938" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="939" tag="operation_939" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="939" tag="operation_939" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="940" tag="operation_940" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="940" tag="operation_940" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="941" tag="operation_941" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="941" tag="operation_941" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="942" tag="operation_942" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="942" tag="operation_942" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="945" tag="operation_945" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="945" tag="operation_945" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="948" tag="operation_948" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="948" tag="operation_948" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="956" tag="operation_956" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="956" tag="operation_956" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="957" tag="operation_957" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="957" tag="operation_957" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="963" tag="operation_963" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="963" tag="operation_963" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="974" tag="operation_974" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="974" tag="operation_974" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="984" tag="operation_984" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="984" tag="operation_984" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="994" tag="operation_994" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="994" tag="operation_994" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1004" tag="operation_1004" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1014" tag="operation_1014" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1014" tag="operation_1014" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1024" tag="operation_1024" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1024" tag="operation_1024" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1034" tag="operation_1034" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1034" tag="operation_1034" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1044" tag="operation_1044" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1044" tag="operation_1044" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1054" tag="operation_1054" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1064" tag="operation_1064" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1074" tag="operation_1074" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1074" tag="operation_1074" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1084" tag="operation_1084" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1094" tag="operation_1094" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1104" tag="operation_1104" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1104" tag="operation_1104" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1114" tag="operation_1114" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1114" tag="operation_1114" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -21355,101 +21355,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1125" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1125" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1125" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1125" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1125" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1125" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1125" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1125" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1125" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1125" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1125" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1125" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1126" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1126" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1126" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1126" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1126" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1126" text="return PIXEL_BLUE;" >
+       <codeaccessormethod accessType="0" parent_id="1126" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1126" text="return PIXEL_BLUE;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1126" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1126" text="PIXEL_BLUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1126" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1126" text="PIXEL_BLUE = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1127" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1127" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1127" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1127" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1127" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1127" text="return PIXEL_GREEN;" >
+       <codeaccessormethod accessType="0" parent_id="1127" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1127" text="return PIXEL_GREEN;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1127" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1127" text="PIXEL_GREEN = value;" >
+       <codeaccessormethod accessType="1" parent_id="1127" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1127" text="PIXEL_GREEN = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1128" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1128" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1128" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1128" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1128" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1128" text="return PIXEL_RED;" >
+       <codeaccessormethod accessType="0" parent_id="1128" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1128" text="return PIXEL_RED;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1128" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1128" text="PIXEL_RED = value;" >
+       <codeaccessormethod accessType="1" parent_id="1128" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1128" text="PIXEL_RED = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1129" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1129" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1129" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1129" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1129" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1129" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="1129" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1129" text="return PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1129" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1129" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="1129" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1129" text="PIXEL_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -21457,7 +21457,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1124" tqparent_class="1124" fileExt=".cpp" fileName="kisf32rgbcolorspacetester" >
+    <classifiercodedocument writeOutCode="true" package="" id="1124" parent_class="1124" fileExt=".cpp" fileName="kisf32rgbcolorspacetester" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisf32rgbcolorspacetester.h&quot;&amp;#010;" >
        <header>
@@ -21482,7 +21482,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1133" tqparent_class="1133" fileExt=".cpp" fileName="kisf32rgbcolorspacesp" >
+    <classifiercodedocument writeOutCode="true" package="" id="1133" parent_class="1133" fileExt=".cpp" fileName="kisf32rgbcolorspacesp" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisf32rgbcolorspacesp.h&quot;&amp;#010;" >
        <header>
@@ -21507,7 +21507,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1134" tqparent_class="1134" fileExt=".cpp" fileName="kisrgbu16colorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1134" parent_class="1134" fileExt=".cpp" fileName="kisrgbu16colorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisrgbu16colorspace.h&quot;&amp;#010;" >
        <header>
@@ -21525,272 +21525,272 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
+        <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
+        <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
+        <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
+        <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1382" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1382" text="return PIXEL_BLUE;" >
+        <codeaccessormethod accessType="0" parent_id="1382" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1382" text="return PIXEL_BLUE;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1382" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1382" text="PIXEL_BLUE = value;" >
+        <codeaccessormethod accessType="1" parent_id="1382" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1382" text="PIXEL_BLUE = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1383" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1383" text="return PIXEL_GREEN;" >
+        <codeaccessormethod accessType="0" parent_id="1383" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1383" text="return PIXEL_GREEN;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1383" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1383" text="PIXEL_GREEN = value;" >
+        <codeaccessormethod accessType="1" parent_id="1383" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1383" text="PIXEL_GREEN = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1384" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1384" text="return PIXEL_RED;" >
+        <codeaccessormethod accessType="0" parent_id="1384" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1384" text="return PIXEL_RED;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1384" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1384" text="PIXEL_RED = value;" >
+        <codeaccessormethod accessType="1" parent_id="1384" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1384" text="PIXEL_RED = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1385" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1385" text="return PIXEL_ALPHA;" >
+        <codeaccessormethod accessType="0" parent_id="1385" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1385" text="return PIXEL_ALPHA;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1385" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1385" text="PIXEL_ALPHA = value;" >
+        <codeaccessormethod accessType="1" parent_id="1385" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1385" text="PIXEL_ALPHA = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1381" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1381" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="1381" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1381" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1381" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1381" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="1381" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1381" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1140" tag="operation_1140" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1140" tag="operation_1140" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1141" tag="operation_1141" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1141" tag="operation_1141" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1142" tag="operation_1142" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1142" tag="operation_1142" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1148" tag="operation_1148" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1148" tag="operation_1148" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1154" tag="operation_1154" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1154" tag="operation_1154" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1158" tag="operation_1158" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1158" tag="operation_1158" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1163" tag="operation_1163" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1163" tag="operation_1163" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1166" tag="operation_1166" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1166" tag="operation_1166" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1170" tag="operation_1170" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1170" tag="operation_1170" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1174" tag="operation_1174" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1174" tag="operation_1174" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1179" tag="operation_1179" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1179" tag="operation_1179" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1182" tag="operation_1182" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1182" tag="operation_1182" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1185" tag="operation_1185" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1185" tag="operation_1185" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1188" tag="operation_1188" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1188" tag="operation_1188" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1193" tag="operation_1193" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1193" tag="operation_1193" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1194" tag="operation_1194" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1194" tag="operation_1194" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1195" tag="operation_1195" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1195" tag="operation_1195" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1196" tag="operation_1196" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1196" tag="operation_1196" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1197" tag="operation_1197" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1197" tag="operation_1197" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1198" tag="operation_1198" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1198" tag="operation_1198" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1201" tag="operation_1201" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1201" tag="operation_1201" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1204" tag="operation_1204" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1204" tag="operation_1204" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1212" tag="operation_1212" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1212" tag="operation_1212" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1213" tag="operation_1213" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1213" tag="operation_1213" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1219" tag="operation_1219" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1219" tag="operation_1219" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1230" tag="operation_1230" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1230" tag="operation_1230" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1240" tag="operation_1240" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1240" tag="operation_1240" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1250" tag="operation_1250" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1250" tag="operation_1250" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1260" tag="operation_1260" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1260" tag="operation_1260" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1270" tag="operation_1270" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1270" tag="operation_1270" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1280" tag="operation_1280" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1280" tag="operation_1280" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1290" tag="operation_1290" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1290" tag="operation_1290" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1300" tag="operation_1300" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1300" tag="operation_1300" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1310" tag="operation_1310" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1310" tag="operation_1310" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1320" tag="operation_1320" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1320" tag="operation_1320" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1330" tag="operation_1330" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1330" tag="operation_1330" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1340" tag="operation_1340" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1340" tag="operation_1340" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1350" tag="operation_1350" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1350" tag="operation_1350" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1360" tag="operation_1360" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1360" tag="operation_1360" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1370" tag="operation_1370" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1370" tag="operation_1370" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -21802,141 +21802,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1138" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1138" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
+       <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1139" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1139" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
+       <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
+       <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1381" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1381" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1381" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1381" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1381" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1381" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1381" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1381" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1381" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1381" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1382" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1382" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1382" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1382" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1382" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1382" text="return PIXEL_BLUE;" >
+       <codeaccessormethod accessType="0" parent_id="1382" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1382" text="return PIXEL_BLUE;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1382" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1382" text="PIXEL_BLUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1382" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1382" text="PIXEL_BLUE = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1383" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1383" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1383" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1383" text="return PIXEL_GREEN;" >
+       <codeaccessormethod accessType="0" parent_id="1383" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1383" text="return PIXEL_GREEN;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1383" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1383" text="PIXEL_GREEN = value;" >
+       <codeaccessormethod accessType="1" parent_id="1383" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1383" text="PIXEL_GREEN = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1384" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1384" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1384" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1384" text="return PIXEL_RED;" >
+       <codeaccessormethod accessType="0" parent_id="1384" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1384" text="return PIXEL_RED;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1384" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1384" text="PIXEL_RED = value;" >
+       <codeaccessormethod accessType="1" parent_id="1384" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1384" text="PIXEL_RED = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1385" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1385" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1385" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1385" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1385" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1385" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="1385" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1385" text="return PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1385" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1385" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="1385" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1385" text="PIXEL_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -21944,7 +21944,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1380" tqparent_class="1380" fileExt=".cpp" fileName="kisrgbu16colorspacetester" >
+    <classifiercodedocument writeOutCode="true" package="" id="1380" parent_class="1380" fileExt=".cpp" fileName="kisrgbu16colorspacetester" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisrgbu16colorspacetester.h&quot;&amp;#010;" >
        <header>
@@ -21969,7 +21969,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1386" tqparent_class="1386" fileExt=".cpp" fileName="kisrgbcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1386" parent_class="1386" fileExt=".cpp" fileName="kisrgbcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kisrgbcolorspace.h&quot;&amp;#010;" >
        <header>
@@ -21987,227 +21987,227 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1638" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1638" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="1638" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1638" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1638" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1638" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="1638" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1638" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1390" tag="operation_1390" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1390" tag="operation_1390" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1391" tag="operation_1391" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1391" tag="operation_1391" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1392" tag="operation_1392" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1392" tag="operation_1392" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1398" tag="operation_1398" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1398" tag="operation_1398" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1404" tag="operation_1404" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1404" tag="operation_1404" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1408" tag="operation_1408" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1408" tag="operation_1408" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1413" tag="operation_1413" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1413" tag="operation_1413" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1416" tag="operation_1416" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1416" tag="operation_1416" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1420" tag="operation_1420" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1420" tag="operation_1420" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1424" tag="operation_1424" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1424" tag="operation_1424" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1429" tag="operation_1429" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1429" tag="operation_1429" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1432" tag="operation_1432" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1432" tag="operation_1432" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1435" tag="operation_1435" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1435" tag="operation_1435" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1438" tag="operation_1438" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1438" tag="operation_1438" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1443" tag="operation_1443" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1443" tag="operation_1443" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1451" tag="operation_1451" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1451" tag="operation_1451" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1452" tag="operation_1452" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1452" tag="operation_1452" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1453" tag="operation_1453" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1453" tag="operation_1453" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1454" tag="operation_1454" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1454" tag="operation_1454" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1455" tag="operation_1455" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1455" tag="operation_1455" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1456" tag="operation_1456" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1456" tag="operation_1456" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1459" tag="operation_1459" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1459" tag="operation_1459" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1462" tag="operation_1462" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1462" tag="operation_1462" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1470" tag="operation_1470" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1470" tag="operation_1470" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1471" tag="operation_1471" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1471" tag="operation_1471" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1473" tag="operation_1473" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1473" tag="operation_1473" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1478" tag="operation_1478" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1478" tag="operation_1478" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="Darken all color channels with the given amount. If compensate is true,&amp;#010;the compensation factor will be used to limit the darkening.&amp;#010;&amp;#010;(See the bumpmap filter)" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1485" tag="operation_1485" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1485" tag="operation_1485" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1487" tag="operation_1487" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1487" tag="operation_1487" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1498" tag="operation_1498" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1498" tag="operation_1498" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1508" tag="operation_1508" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1508" tag="operation_1508" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1518" tag="operation_1518" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1528" tag="operation_1528" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1528" tag="operation_1528" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1538" tag="operation_1538" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1538" tag="operation_1538" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1548" tag="operation_1548" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1558" tag="operation_1558" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1558" tag="operation_1558" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1568" tag="operation_1568" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1568" tag="operation_1568" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1578" tag="operation_1578" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1578" tag="operation_1578" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1588" tag="operation_1588" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1598" tag="operation_1598" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1598" tag="operation_1598" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1608" tag="operation_1608" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1608" tag="operation_1608" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1618" tag="operation_1618" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1618" tag="operation_1618" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1628" tag="operation_1628" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1628" tag="operation_1628" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -22219,21 +22219,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1638" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1638" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1638" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1638" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1638" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1638" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1638" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1638" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1638" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1638" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1638" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1638" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -22241,7 +22241,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1639" tqparent_class="1639" fileExt=".cpp" fileName="wetpix" >
+    <classifiercodedocument writeOutCode="true" package="" id="1639" parent_class="1639" fileExt=".cpp" fileName="wetpix" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;wetpix.h&quot;&amp;#010;" >
        <header>
@@ -22266,7 +22266,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1640" tqparent_class="1640" fileExt=".cpp" fileName="wetpixdbl" >
+    <classifiercodedocument writeOutCode="true" package="" id="1640" parent_class="1640" fileExt=".cpp" fileName="wetpixdbl" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;wetpixdbl.h&quot;&amp;#010;" >
        <header>
@@ -22291,7 +22291,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1641" tqparent_class="1641" fileExt=".cpp" fileName="wetpack" >
+    <classifiercodedocument writeOutCode="true" package="" id="1641" parent_class="1641" fileExt=".cpp" fileName="wetpack" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;wetpack.h&quot;&amp;#010;" >
        <header>
@@ -22316,7 +22316,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1642" tqparent_class="1642" fileExt=".cpp" fileName="_wetpix" >
+    <classifiercodedocument writeOutCode="true" package="" id="1642" parent_class="1642" fileExt=".cpp" fileName="_wetpix" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;_wetpix.h&quot;&amp;#010;" >
        <header>
@@ -22334,82 +22334,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1643" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1643" text="return rd;" >
+        <codeaccessormethod accessType="0" parent_id="1643" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1643" text="return rd;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1643" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1643" text="rd = value;" >
+        <codeaccessormethod accessType="1" parent_id="1643" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1643" text="rd = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1644" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1644" text="return rw;" >
+        <codeaccessormethod accessType="0" parent_id="1644" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1644" text="return rw;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1644" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1644" text="rw = value;" >
+        <codeaccessormethod accessType="1" parent_id="1644" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1644" text="rw = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1645" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1645" text="return gd;" >
+        <codeaccessormethod accessType="0" parent_id="1645" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1645" text="return gd;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1645" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1645" text="gd = value;" >
+        <codeaccessormethod accessType="1" parent_id="1645" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1645" text="gd = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1646" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1646" text="return gw;" >
+        <codeaccessormethod accessType="0" parent_id="1646" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1646" text="return gw;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1646" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1646" text="gw = value;" >
+        <codeaccessormethod accessType="1" parent_id="1646" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1646" text="gw = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1647" text="return bd;" >
+        <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1647" text="return bd;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1647" text="bd = value;" >
+        <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1647" text="bd = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1648" text="return bw;" >
+        <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1648" text="return bw;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1648" text="bw = value;" >
+        <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1648" text="bw = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1649" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1649" text="return w;" >
+        <codeaccessormethod accessType="0" parent_id="1649" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1649" text="return w;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1649" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1649" text="w = value;" >
+        <codeaccessormethod accessType="1" parent_id="1649" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1649" text="w = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1650" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1650" text="return h;" >
+        <codeaccessormethod accessType="0" parent_id="1650" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1650" text="return h;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@return the value of h" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1650" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1650" text="h = value;" >
+        <codeaccessormethod accessType="1" parent_id="1650" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1650" text="h = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@param value the value of h" />
          </header>
@@ -22421,161 +22421,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1643" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1643" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total red channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1643" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1643" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1643" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1643" text="return rd;" >
+       <codeaccessormethod accessType="0" parent_id="1643" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1643" text="return rd;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1643" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1643" text="rd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1643" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1643" text="rd = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1644" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1644" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-red concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1644" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1644" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1644" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1644" text="return rw;" >
+       <codeaccessormethod accessType="0" parent_id="1644" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1644" text="return rw;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1644" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1644" text="rw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1644" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1644" text="rw = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1645" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1645" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total green channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1645" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1645" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1645" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1645" text="return gd;" >
+       <codeaccessormethod accessType="0" parent_id="1645" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1645" text="return gd;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1645" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1645" text="gd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1645" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1645" text="gd = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-green concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1646" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1646" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1646" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1646" text="return gw;" >
+       <codeaccessormethod accessType="0" parent_id="1646" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1646" text="return gw;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1646" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1646" text="gw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1646" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1646" text="gw = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total blue channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1647" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1647" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1647" text="return bd;" >
+       <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1647" text="return bd;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1647" text="bd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1647" text="bd = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-blue concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1648" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1648" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1648" text="return bw;" >
+       <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1648" text="return bw;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1648" text="bw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1648" text="bw = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1649" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1649" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Water volume" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1649" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1649" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1649" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1649" text="return w;" >
+       <codeaccessormethod accessType="0" parent_id="1649" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1649" text="return w;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1649" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1649" text="w = value;" >
+       <codeaccessormethod accessType="1" parent_id="1649" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1649" text="w = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1650" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1650" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1650" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1650" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1650" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1650" text="return h;" >
+       <codeaccessormethod accessType="0" parent_id="1650" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1650" text="return h;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@return the value of h" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1650" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1650" text="h = value;" >
+       <codeaccessormethod accessType="1" parent_id="1650" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1650" text="h = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@param value the value of h" />
         </header>
@@ -22583,7 +22583,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1651" tqparent_class="1651" fileExt=".cpp" fileName="_wetpack" >
+    <classifiercodedocument writeOutCode="true" package="" id="1651" parent_class="1651" fileExt=".cpp" fileName="_wetpack" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;_wetpack.h&quot;&amp;#010;" >
        <header>
@@ -22601,22 +22601,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1652" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1652" text="return paint;" >
+        <codeaccessormethod accessType="0" parent_id="1652" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1652" text="return paint;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of paint&amp;#010;Paint layer&amp;#010;@return the value of paint" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1652" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1652" text="paint = value;" >
+        <codeaccessormethod accessType="1" parent_id="1652" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1652" text="paint = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of paint&amp;#010;Paint layer&amp;#010;@param value the value of paint" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1653" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1653" text="return adsorb;" >
+        <codeaccessormethod accessType="0" parent_id="1653" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1653" text="return adsorb;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@return the value of adsorb" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1653" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1653" text="adsorb = value;" >
+        <codeaccessormethod accessType="1" parent_id="1653" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1653" text="adsorb = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@param value the value of adsorb" />
          </header>
@@ -22628,41 +22628,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1652" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1652" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Paint layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1652" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1652" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1652" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1652" text="return paint;" >
+       <codeaccessormethod accessType="0" parent_id="1652" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1652" text="return paint;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of paint&amp;#010;Paint layer&amp;#010;@return the value of paint" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1652" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1652" text="paint = value;" >
+       <codeaccessormethod accessType="1" parent_id="1652" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1652" text="paint = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of paint&amp;#010;Paint layer&amp;#010;@param value the value of paint" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1653" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1653" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Adsorbtion layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1653" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1653" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1653" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1653" text="return adsorb;" >
+       <codeaccessormethod accessType="0" parent_id="1653" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1653" text="return adsorb;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@return the value of adsorb" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1653" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1653" text="adsorb = value;" >
+       <codeaccessormethod accessType="1" parent_id="1653" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1653" text="adsorb = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@param value the value of adsorb" />
         </header>
@@ -22670,7 +22670,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1654" tqparent_class="1654" fileExt=".cpp" fileName="_wetpixdbl" >
+    <classifiercodedocument writeOutCode="true" package="" id="1654" parent_class="1654" fileExt=".cpp" fileName="_wetpixdbl" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;_wetpixdbl.h&quot;&amp;#010;" >
        <header>
@@ -22688,82 +22688,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1655" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1655" text="return rd;" >
+        <codeaccessormethod accessType="0" parent_id="1655" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1655" text="return rd;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1655" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1655" text="rd = value;" >
+        <codeaccessormethod accessType="1" parent_id="1655" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1655" text="rd = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1656" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1656" text="return rw;" >
+        <codeaccessormethod accessType="0" parent_id="1656" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1656" text="return rw;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1656" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1656" text="rw = value;" >
+        <codeaccessormethod accessType="1" parent_id="1656" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1656" text="rw = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1657" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1657" text="return gd;" >
+        <codeaccessormethod accessType="0" parent_id="1657" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1657" text="return gd;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1657" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1657" text="gd = value;" >
+        <codeaccessormethod accessType="1" parent_id="1657" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1657" text="gd = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1658" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1658" text="return gw;" >
+        <codeaccessormethod accessType="0" parent_id="1658" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1658" text="return gw;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1658" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1658" text="gw = value;" >
+        <codeaccessormethod accessType="1" parent_id="1658" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1658" text="gw = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1659" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1659" text="return bd;" >
+        <codeaccessormethod accessType="0" parent_id="1659" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1659" text="return bd;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1659" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1659" text="bd = value;" >
+        <codeaccessormethod accessType="1" parent_id="1659" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1659" text="bd = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1660" text="return bw;" >
+        <codeaccessormethod accessType="0" parent_id="1660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1660" text="return bw;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1660" text="bw = value;" >
+        <codeaccessormethod accessType="1" parent_id="1660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1660" text="bw = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1661" text="return w;" >
+        <codeaccessormethod accessType="0" parent_id="1661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1661" text="return w;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1661" text="w = value;" >
+        <codeaccessormethod accessType="1" parent_id="1661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1661" text="w = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1662" text="return h;" >
+        <codeaccessormethod accessType="0" parent_id="1662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1662" text="return h;" >
          <header>
           <cppcodedocumentation tag="" text="Get the value of h&amp;#010;Height of paper surface&amp;#010;@return the value of h" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1662" text="h = value;" >
+        <codeaccessormethod accessType="1" parent_id="1662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1662" text="h = value;" >
          <header>
           <cppcodedocumentation tag="" text="Set the value of h&amp;#010;Height of paper surface&amp;#010;@param value the value of h" />
          </header>
@@ -22775,161 +22775,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total red channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1655" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1655" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1655" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1655" text="return rd;" >
+       <codeaccessormethod accessType="0" parent_id="1655" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1655" text="return rd;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1655" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1655" text="rd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1655" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1655" text="rd = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1656" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1656" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-red concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1656" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1656" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1656" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1656" text="return rw;" >
+       <codeaccessormethod accessType="0" parent_id="1656" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1656" text="return rw;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1656" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1656" text="rw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1656" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1656" text="rw = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1657" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1657" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total green channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1657" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1657" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1657" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1657" text="return gd;" >
+       <codeaccessormethod accessType="0" parent_id="1657" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1657" text="return gd;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1657" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1657" text="gd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1657" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1657" text="gd = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1658" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1658" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-green concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1658" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1658" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1658" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1658" text="return gw;" >
+       <codeaccessormethod accessType="0" parent_id="1658" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1658" text="return gw;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1658" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1658" text="gw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1658" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1658" text="gw = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1659" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1659" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total blue channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1659" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1659" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1659" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1659" text="return bd;" >
+       <codeaccessormethod accessType="0" parent_id="1659" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1659" text="return bd;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1659" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1659" text="bd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1659" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1659" text="bd = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-blue concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1660" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1660" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1660" text="return bw;" >
+       <codeaccessormethod accessType="0" parent_id="1660" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1660" text="return bw;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1660" text="bw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1660" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1660" text="bw = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Water volume" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1661" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1661" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1661" text="return w;" >
+       <codeaccessormethod accessType="0" parent_id="1661" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1661" text="return w;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1661" text="w = value;" >
+       <codeaccessormethod accessType="1" parent_id="1661" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1661" text="w = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Height of paper surface" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1662" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1662" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1662" text="return h;" >
+       <codeaccessormethod accessType="0" parent_id="1662" tag="hblock_tag_14" canDelete="false" writeOutText="false" classfield_id="1662" text="return h;" >
         <header>
          <cppcodedocumentation tag="" text="Get the value of h&amp;#010;Height of paper surface&amp;#010;@return the value of h" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1662" text="h = value;" >
+       <codeaccessormethod accessType="1" parent_id="1662" tag="hblock_tag_15" canDelete="false" writeOutText="false" classfield_id="1662" text="h = value;" >
         <header>
          <cppcodedocumentation tag="" text="Set the value of h&amp;#010;Height of paper surface&amp;#010;@param value the value of h" />
         </header>
@@ -22937,7 +22937,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1663" tqparent_class="1663" fileExt=".cpp" fileName="kiswetcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1663" parent_class="1663" fileExt=".cpp" fileName="kiswetcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kiswetcolorspace.h&quot;&amp;#010;" >
        <header>
@@ -22955,217 +22955,217 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1755" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1755" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1755" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1755" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1757" text="return wet_render_tab;" >
+        <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1757" text="return wet_render_tab;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1757" text="wet_render_tab = value;" >
+        <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1757" text="wet_render_tab = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1758" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1758" text="return m_paintNames;" >
+        <codeaccessormethod accessType="0" parent_id="1758" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1758" text="return m_paintNames;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1758" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1758" text="m_paintNames = value;" >
+        <codeaccessormethod accessType="1" parent_id="1758" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1758" text="m_paintNames = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1760" text="return m_conversionMap;" >
+        <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1760" text="return m_conversionMap;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1760" text="m_conversionMap = value;" >
+        <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1760" text="m_conversionMap = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1761" text="return m_paintwetness;" >
+        <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1761" text="return m_paintwetness;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1761" text="m_paintwetness = value;" >
+        <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1761" text="m_paintwetness = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1762" text="return phase;" >
+        <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1762" text="return phase;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1762" text="phase = value;" >
+        <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1762" text="phase = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1763" text="return phasebig;" >
+        <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1763" text="return phasebig;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1763" text="phasebig = value;" >
+        <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1763" text="phasebig = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1667" tag="operation_1667" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1667" tag="operation_1667" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1668" tag="operation_1668" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1668" tag="operation_1668" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1669" tag="operation_1669" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1669" tag="operation_1669" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="// Semi-clever: we have only fifteen wet paint colors that are mapped to the// qcolors that are put in the painter by the special wet paint palette. Other// QColors are mapped to plain water..." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1673" tag="operation_1673" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1673" tag="operation_1673" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1678" tag="operation_1678" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1678" tag="operation_1678" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1681" tag="operation_1681" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1681" tag="operation_1681" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1685" tag="operation_1685" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1685" tag="operation_1685" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1690" tag="operation_1690" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1690" tag="operation_1690" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1693" tag="operation_1693" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1693" tag="operation_1693" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1696" tag="operation_1696" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1696" tag="operation_1696" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1701" tag="operation_1701" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1701" tag="operation_1701" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1702" tag="operation_1702" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1702" tag="operation_1702" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1703" tag="operation_1703" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1703" tag="operation_1703" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1704" tag="operation_1704" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1704" tag="operation_1704" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1705" tag="operation_1705" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1705" tag="operation_1705" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1706" tag="operation_1706" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1706" tag="operation_1706" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1707" tag="operation_1707" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1707" tag="operation_1707" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1710" tag="operation_1710" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1710" tag="operation_1710" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1713" tag="operation_1713" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1713" tag="operation_1713" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1721" tag="operation_1721" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1721" tag="operation_1721" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1724" tag="operation_1724" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1724" tag="operation_1724" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1730" tag="operation_1730" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1730" tag="operation_1730" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1731" tag="operation_1731" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1731" tag="operation_1731" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1733" tag="operation_1733" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1733" tag="operation_1733" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1734" tag="operation_1734" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1735" tag="operation_1735" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1735" tag="operation_1735" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1746" tag="operation_1746" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1746" tag="operation_1746" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="// This was static, but since we have only one instance of the color strategy,// it can be just as well a private member variable." />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1747" tag="operation_1747" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1747" tag="operation_1747" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" text="// Convert a single pixel from its wet representation to rgb" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1751" tag="operation_1751" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1751" tag="operation_1751" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -23177,141 +23177,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1755" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1755" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1755" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1755" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1755" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1755" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1757" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1757" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1757" text="return wet_render_tab;" >
+       <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_2" canDelete="false" writeOutText="false" classfield_id="1757" text="return wet_render_tab;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1757" text="wet_render_tab = value;" >
+       <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_3" canDelete="false" writeOutText="false" classfield_id="1757" text="wet_render_tab = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1758" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1758" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1758" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1758" text="return m_paintNames;" >
+       <codeaccessormethod accessType="0" parent_id="1758" tag="hblock_tag_4" canDelete="false" writeOutText="false" classfield_id="1758" text="return m_paintNames;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1758" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1758" text="m_paintNames = value;" >
+       <codeaccessormethod accessType="1" parent_id="1758" tag="hblock_tag_5" canDelete="false" writeOutText="false" classfield_id="1758" text="m_paintNames = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1760" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1760" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1760" text="return m_conversionMap;" >
+       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_6" canDelete="false" writeOutText="false" classfield_id="1760" text="return m_conversionMap;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1760" text="m_conversionMap = value;" >
+       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_7" canDelete="false" writeOutText="false" classfield_id="1760" text="m_conversionMap = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1761" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1761" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1761" text="return m_paintwetness;" >
+       <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_8" canDelete="false" writeOutText="false" classfield_id="1761" text="return m_paintwetness;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1761" text="m_paintwetness = value;" >
+       <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_9" canDelete="false" writeOutText="false" classfield_id="1761" text="m_paintwetness = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1762" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1762" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1762" text="return phase;" >
+       <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_10" canDelete="false" writeOutText="false" classfield_id="1762" text="return phase;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1762" text="phase = value;" >
+       <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_11" canDelete="false" writeOutText="false" classfield_id="1762" text="phase = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1763" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1763" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1763" text="return phasebig;" >
+       <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_12" canDelete="false" writeOutText="false" classfield_id="1763" text="return phasebig;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1763" text="phasebig = value;" >
+       <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_13" canDelete="false" writeOutText="false" classfield_id="1763" text="phasebig = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -23319,7 +23319,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1759" tqparent_class="1759" fileExt=".cpp" fileName="qmap" >
+    <classifiercodedocument writeOutCode="true" package="" id="1759" parent_class="1759" fileExt=".cpp" fileName="qmap" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;qmap.h&quot;&amp;#010;" >
        <header>
@@ -23344,7 +23344,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="1771" tqparent_class="1771" fileExt=".cpp" fileName="cell" >
+    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="1771" parent_class="1771" fileExt=".cpp" fileName="cell" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;cell.h&quot;&amp;#010;" >
        <header>
@@ -23369,7 +23369,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="1772" tqparent_class="1772" fileExt=".cpp" fileName="cell" >
+    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="1772" parent_class="1772" fileExt=".cpp" fileName="cell" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;cell.h&quot;&amp;#010;" >
        <header>
@@ -23394,7 +23394,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="1765" tqparent_class="1765" fileExt=".cpp" fileName="enumdirection" >
+    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="1765" parent_class="1765" fileExt=".cpp" fileName="enumdirection" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;enumdirection.h&quot;&amp;#010;" >
        <header>
@@ -23419,7 +23419,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1774" tqparent_class="1774" fileExt=".cpp" fileName="kiswetstickycolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="1774" parent_class="1774" fileExt=".cpp" fileName="kiswetstickycolorspace" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kiswetstickycolorspace.h&quot;&amp;#010;" >
        <header>
@@ -23437,152 +23437,152 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" text="Methods" />
        </header>
        <textblocks>
-        <codeaccessormethod accessType="0" tqparent_id="1895" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1895" text="return m_channels;" >
+        <codeaccessormethod accessType="0" parent_id="1895" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1895" text="return m_channels;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeaccessormethod accessType="1" tqparent_id="1895" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1895" text="m_channels = value;" >
+        <codeaccessormethod accessType="1" parent_id="1895" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1895" text="m_channels = value;" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeaccessormethod>
-        <codeoperation tqparent_id="1778" tag="operation_1778" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1778" tag="operation_1778" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1779" tag="operation_1779" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1779" tag="operation_1779" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1780" tag="operation_1780" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1780" tag="operation_1780" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1784" tag="operation_1784" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1784" tag="operation_1784" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1789" tag="operation_1789" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1789" tag="operation_1789" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1792" tag="operation_1792" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1792" tag="operation_1792" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1796" tag="operation_1796" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1796" tag="operation_1796" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1801" tag="operation_1801" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1801" tag="operation_1801" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1804" tag="operation_1804" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1804" tag="operation_1804" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1807" tag="operation_1807" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1807" tag="operation_1807" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1808" tag="operation_1808" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1808" tag="operation_1808" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1809" tag="operation_1809" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1809" tag="operation_1809" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1810" tag="operation_1810" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1810" tag="operation_1810" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1811" tag="operation_1811" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1811" tag="operation_1811" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1812" tag="operation_1812" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1812" tag="operation_1812" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1813" tag="operation_1813" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1813" tag="operation_1813" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1816" tag="operation_1816" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1816" tag="operation_1816" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1819" tag="operation_1819" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1819" tag="operation_1819" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1827" tag="operation_1827" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1827" tag="operation_1827" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1830" tag="operation_1830" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1830" tag="operation_1830" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1836" tag="operation_1836" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1836" tag="operation_1836" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1841" tag="operation_1841" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1841" tag="operation_1841" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1845" tag="operation_1845" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1845" tag="operation_1845" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1846" tag="operation_1846" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1846" tag="operation_1846" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1857" tag="operation_1857" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1857" tag="operation_1857" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1865" tag="operation_1865" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1865" tag="operation_1865" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1875" tag="operation_1875" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1875" tag="operation_1875" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
         </codeoperation>
-        <codeoperation tqparent_id="1885" tag="operation_1885" canDelete="false" writeOutText="false" >
+        <codeoperation parent_id="1885" tag="operation_1885" canDelete="false" writeOutText="false" >
          <header>
           <cppcodedocumentation tag="" />
          </header>
@@ -23594,21 +23594,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1895" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1895" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1895" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
+       <ccfdeclarationcodeblock parent_id="1895" tag="" canDelete="false" indentLevel="1" text="FIX ME;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1895" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1895" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1895" tag="hblock_tag_0" canDelete="false" writeOutText="false" classfield_id="1895" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1895" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1895" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1895" tag="hblock_tag_1" canDelete="false" writeOutText="false" classfield_id="1895" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" />
         </header>
@@ -23622,7 +23622,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
     </codedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="12050" tqparent_class="12050" fileExt=".cpp" fileName="kiscolorspacedescriptor" >
+    <classifiercodedocument writeOutCode="true" package="" id="12050" parent_class="12050" fileExt=".cpp" fileName="kiscolorspacedescriptor" >
      <textblocks>
       <codeblockwithcomments tag="includes" text="#include &quot;kiscolorspacedescriptor.h&quot;&amp;#010;" >
        <header>
@@ -23647,7 +23647,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader11" tqparent_class="11" fileExt=".h" fileName="qpainter" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader11" parent_class="11" fileExt=".h" fileName="qpainter" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QPAINTER_H&amp;#010;#define QPAINTER_H" >
        <header>
@@ -23674,7 +23674,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="11" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="11" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QPainter&amp;#010;" />
          </header>
@@ -23853,7 +23853,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader12" tqparent_class="12" fileExt=".h" fileName="kisiteratorpixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader12" parent_class="12" fileExt=".h" fileName="kisiteratorpixel" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISITERATORPIXEL_H&amp;#010;#define KISITERATORPIXEL_H" >
        <header>
@@ -23880,7 +23880,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="12" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="12" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisIteratorPixel&amp;#010;" />
          </header>
@@ -24059,7 +24059,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader13" tqparent_class="13" fileExt=".h" fileName="kispixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader13" parent_class="13" fileExt=".h" fileName="kispixel" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPIXEL_H&amp;#010;#define KISPIXEL_H" >
        <header>
@@ -24086,7 +24086,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="13" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="13" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisPixel&amp;#010;" />
          </header>
@@ -24265,7 +24265,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader14" tqparent_class="14" fileExt=".h" fileName="kispixelro" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader14" parent_class="14" fileExt=".h" fileName="kispixelro" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPIXELRO_H&amp;#010;#define KISPIXELRO_H" >
        <header>
@@ -24292,7 +24292,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="14" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="14" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisPixelRO&amp;#010;" />
          </header>
@@ -24471,7 +24471,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader15" tqparent_class="15" fileExt=".h" fileName="kisprofilepair" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader15" parent_class="15" fileExt=".h" fileName="kisprofilepair" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPROFILEPAIR_H&amp;#010;#define KISPROFILEPAIR_H" >
        <header>
@@ -24498,7 +24498,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="15" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="15" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisProfilePair&amp;#010;" />
          </header>
@@ -24677,7 +24677,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader17" tqparent_class="17" fileExt=".h" fileName="transform" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader17" parent_class="17" fileExt=".h" fileName="transform" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef TRANSFORM_H&amp;#010;#define TRANSFORM_H" >
        <header>
@@ -24704,7 +24704,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="17" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="17" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class transform&amp;#010;// This would be better, I guess." />
          </header>
@@ -24719,27 +24719,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisProfile srcProfile;" >
+              <ccfdeclarationcodeblock parent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisProfile srcProfile;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="21" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32 srcCmType;" >
+              <ccfdeclarationcodeblock parent_id="21" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32 srcCmType;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="22" tag="tblock_2" canDelete="false" indentLevel="1" text=" KisProfile dstProfile;" >
+              <ccfdeclarationcodeblock parent_id="22" tag="tblock_2" canDelete="false" indentLevel="1" text=" KisProfile dstProfile;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="23" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT32 dstType;" >
+              <ccfdeclarationcodeblock parent_id="23" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT32 dstType;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="24" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT32 renderIntent;" >
+              <ccfdeclarationcodeblock parent_id="24" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT32 renderIntent;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -24779,52 +24779,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
+                  <codeaccessormethod accessType="0" parent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="19" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
+                  <codeaccessormethod accessType="1" parent_id="19" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="21" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
+                  <codeaccessormethod accessType="0" parent_id="21" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="21" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
+                  <codeaccessormethod accessType="1" parent_id="21" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="22" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
+                  <codeaccessormethod accessType="0" parent_id="22" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="22" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
+                  <codeaccessormethod accessType="1" parent_id="22" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
+                  <codeaccessormethod accessType="0" parent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="23" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
+                  <codeaccessormethod accessType="1" parent_id="23" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
+                  <codeaccessormethod accessType="0" parent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
+                  <codeaccessormethod accessType="1" parent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -24959,101 +24959,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="19" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="19" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisProfile srcProfile;" >
+       <ccfdeclarationcodeblock parent_id="19" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisProfile srcProfile;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
+       <codeaccessormethod accessType="0" parent_id="19" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="19" text="return srcProfile;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="19" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="19" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="19" text="srcProfile = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="21" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="21" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="21" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32 srcCmType;" >
+       <ccfdeclarationcodeblock parent_id="21" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32 srcCmType;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="21" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
+       <codeaccessormethod accessType="0" parent_id="21" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="21" text="return srcCmType;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="21" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
+       <codeaccessormethod accessType="1" parent_id="21" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="21" text="srcCmType = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="22" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="22" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="22" tag="tblock_2" canDelete="false" indentLevel="1" text=" KisProfile dstProfile;" >
+       <ccfdeclarationcodeblock parent_id="22" tag="tblock_2" canDelete="false" indentLevel="1" text=" KisProfile dstProfile;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="22" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
+       <codeaccessormethod accessType="0" parent_id="22" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="22" text="return dstProfile;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="22" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="22" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="22" text="dstProfile = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="23" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="23" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="23" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT32 dstType;" >
+       <ccfdeclarationcodeblock parent_id="23" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT32 dstType;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
+       <codeaccessormethod accessType="0" parent_id="23" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="23" text="return dstType;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="23" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
+       <codeaccessormethod accessType="1" parent_id="23" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="23" text="dstType = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="24" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="24" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="24" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT32 renderIntent;" >
+       <ccfdeclarationcodeblock parent_id="24" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT32 renderIntent;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
+       <codeaccessormethod accessType="0" parent_id="24" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="24" text="return renderIntent;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
+       <codeaccessormethod accessType="1" parent_id="24" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="24" text="renderIntent = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -25061,7 +25061,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader18" tqparent_class="18" fileExt=".h" fileName="kisprofile" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader18" parent_class="18" fileExt=".h" fileName="kisprofile" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPROFILE_H&amp;#010;#define KISPROFILE_H" >
        <header>
@@ -25088,7 +25088,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="18" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="18" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisProfile&amp;#010;" />
          </header>
@@ -25267,7 +25267,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader20" tqparent_class="20" fileExt=".h" fileName="q_uint32" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader20" parent_class="20" fileExt=".h" fileName="q_uint32" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef Q_UINT32_H&amp;#010;#define Q_UINT32_H" >
        <header>
@@ -25294,7 +25294,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="20" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="20" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class Q_UINT32&amp;#010;" />
          </header>
@@ -25473,7 +25473,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader25" tqparent_class="25" fileExt=".h" fileName="struct kiscoloradjustment" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader25" parent_class="25" fileExt=".h" fileName="struct kiscoloradjustment" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef STRUCT_KISCOLORADJUSTMENT_H&amp;#010;#define STRUCT_KISCOLORADJUSTMENT_H" >
        <header>
@@ -25500,7 +25500,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="25" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="25" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class struct KisColorAdjustment&amp;#010;" />
          </header>
@@ -25679,7 +25679,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader26" tqparent_class="26" fileExt=".h" fileName="kisabstractcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader26" parent_class="26" fileExt=".h" fileName="kisabstractcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISABSTRACTCOLORSPACE_H&amp;#010;#define KISABSTRACTCOLORSPACE_H" >
        <header>
@@ -25706,7 +25706,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="26" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="26" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisAbstractColorSpace&amp;#010;A colorspace strategy is the definition of a certain color model&amp;#010;in Chalk." />
          </header>
@@ -25763,222 +25763,222 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="31" tag="operation_31" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="31" tag="operation_31" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Create a new colorspace strategy.&amp;#010;&amp;#010;@param id The Chalk identification of this color model.&amp;#010;@param cmType The littlecms colorstrategy type we wrap.&amp;#010;@param colorSpaceSignature The icc signature for the colorspace we are." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="40" tag="operation_40" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="40" tag="operation_40" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="41" tag="operation_41" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="41" tag="operation_41" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="//========== Channels =====================================================//// Return a vector describing all the channels this color model has." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="43" tag="operation_43" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="43" tag="operation_43" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="The total number of channels for a single pixel in this color model" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="45" tag="operation_45" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="45" tag="operation_45" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="The total number of color channels (excludes alpha and substance) for a single&amp;#010;pixel in this color model." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="46" tag="operation_46" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="46" tag="operation_46" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="47" tag="operation_47" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="47" tag="operation_47" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="The size in bytes of a single pixel in this color model" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="48" tag="operation_48" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="48" tag="operation_48" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Whether this color model has a channel of type ALPHA" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="50" tag="operation_50" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="50" tag="operation_50" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="51" tag="operation_51" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="51" tag="operation_51" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="52" tag="operation_52" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="52" tag="operation_52" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Return a string with the channel's value suitable for display in the gui." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="58" tag="operation_58" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="58" tag="operation_58" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Return a string with the channel's value with integer&amp;#010;channels normalised to the floating point range 0 to 1, if appropriate." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="61" tag="operation_61" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="61" tag="operation_61" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="62" tag="operation_62" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="62" tag="operation_62" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param type " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="64" tag="operation_64" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="64" tag="operation_64" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="65" tag="operation_65" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="65" tag="operation_65" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param signature " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="67" tag="operation_67" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="67" tag="operation_67" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="68" tag="operation_68" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="68" tag="operation_68" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="//========== Capabilities =================================================///**&amp;#010;Returns the list of user-visible composite ops supported by this colourspace. Internal&amp;#010;ops such as COPY, CLEAR, and ERASE, are not included as these make no sense&amp;#010;for layers in the full image model." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="70" tag="operation_70" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="70" tag="operation_70" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="71" tag="operation_71" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="71" tag="operation_71" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="//========== Display profiles =============================================///**&amp;#010;Get a list of profiles that apply to this color space" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="73" tag="operation_73" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="73" tag="operation_73" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Return the number of profiles available for this color space" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="74" tag="operation_74" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="74" tag="operation_74" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="//================= Conversion functions ==================================///**&amp;#010;The nativeColor methods take a given color defined as an RGB QColor&amp;#010;and fills a byte array with the corresponding color in the&amp;#010;the colorspace managed by this strategy.&amp;#010;&amp;#010;The profile parameter is the profile of the paint device; the other profile&amp;#010;is the display profile -- since we are moving from QColor&amp;#010;that have most likely been picked from the display itself.&amp;#010;&amp;#010;XXX: We actually do not use the display yet, nor the paint device profile" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="82" tag="operation_82" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="82" tag="operation_82" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="88" tag="operation_88" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="88" tag="operation_88" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="The toQColor methods take a byte array that is at least pixelSize() long&amp;#010;and converts the contents to a QColor, using the given profile as a source&amp;#010;profile and the display profile as a destination profile.&amp;#010;&amp;#010;XXX: We actually do not use the display yet, nor the paint device profile&amp;#010;" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="93" tag="operation_93" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="93" tag="operation_93" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="99" tag="operation_99" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="99" tag="operation_99" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Get the alpha value of the given pixel.&amp;#010;XXX: Change to float/int to match setAlpha() when that changes." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="102" tag="operation_102" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="102" tag="operation_102" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="105" tag="operation_105" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="105" tag="operation_105" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="108" tag="operation_108" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="108" tag="operation_108" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="This function is used to convert a KisPixelRepresentation from this color strategy to the specified&amp;#010;color strategy." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="113" tag="operation_113" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="113" tag="operation_113" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Convert the pixels in data to (8-bit BGRA) QImage using the specified profiles.&amp;#010;The pixels are supposed to be encoded in this color model.&amp;#010;&amp;#010;@param data A pointer to a contiguous memory region containing width * height pixels&amp;#010;@param width in pixels&amp;#010;@param height in pixels&amp;#010;@param srcProfile source profile&amp;#010;@param dstProfile destination profile&amp;#010;@param renderingIntent the rendering intent&amp;#010;@param exposure The exposure setting for rendering a preview of a high dynamic range image." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="122" tag="operation_122" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="122" tag="operation_122" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Convert a byte array of srcLen pixels *src to the specified color space&amp;#010;and put the converted bytes into the prepared byte array *dst.&amp;#010;&amp;#010;Returns false if the conversion failed, true if it succeeded" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="131" tag="operation_131" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="131" tag="operation_131" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Convert the value of the channel at the specified position into&amp;#010;an 8-bit value." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="134" tag="operation_134" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="134" tag="operation_134" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Convert the value of the channel at the specified position into&amp;#010;a 16-bit value. This may be upscaling or downscaling, depending&amp;#010;on the defined value of the channel" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="137" tag="operation_137" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="137" tag="operation_137" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="//============================== Manipulation fucntions ==========================//// // The manipulation functions have default implementations that _convert_ the pixel// to a QColor and back. Reimplement these methods in your color strategy!///**&amp;#010;Set the alpha channel to the given value.&amp;#010;&amp;#010;pixels -- a pointer to the pixels that will have their alpha set to this value&amp;#010;alpha --  XXX: This must become int or float&amp;#010;nPixels -- the number of pixels&amp;#010;&amp;#010;XXX: Also add a function that modifies the current alpha with the given alpha, i.e., premultiply them?" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="141" tag="operation_141" canDelete="false" indentLevel="1" >
+                <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." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="145" tag="operation_145" canDelete="false" indentLevel="1" >
+                <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." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="149" tag="operation_149" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="149" tag="operation_149" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Create an adjustment object for adjusting the brightness and contrast&amp;#010;transferValues is a 256 bins array with values from 0 to 0xFFFF" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="155" tag="operation_155" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="155" tag="operation_155" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Apply the adjustment created with onr of the other functions" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="160" tag="operation_160" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="160" tag="operation_160" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="// XXX: What with alpha channels? YYY: Add an overloaded function that takes alpha into account?/**&amp;#010;Get the difference between 2 colors, normalized in the range (0,255)" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="164" tag="operation_164" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="164" tag="operation_164" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Mix the colors given their weights and return in dst&amp;#010;The sum of weights is assumed 255" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="170" tag="operation_170" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="170" tag="operation_170" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Convolve the given array of pointers to pixels and return the result&amp;#010;in dst. The kernel values are clamped between -128 and 128" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="181" tag="operation_181" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="181" tag="operation_181" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Darken all color channels with the given amount. If compensate is true,&amp;#010;the compensation factor will be used to limit the darkening.&amp;#010;&amp;#010;(See the bumpmap filter)" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="188" tag="operation_188" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="188" tag="operation_188" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Calculate the intensity of the given pixel, scaled down to the range 0-255. XXX: Maybe this should be more flexible" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="190" tag="operation_190" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="190" tag="operation_190" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Compose two arrays of pixels together. If source and target&amp;#010;are not the same colour model, the source pixels will be&amp;#010;converted to the target model." />
                  </header>
@@ -25999,37 +25999,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text=" QStringList m_profileFilenames;" >
+              <ccfdeclarationcodeblock parent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text=" QStringList m_profileFilenames;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="228" tag="tblock_1" canDelete="false" indentLevel="1" text=" KisProfileSP m_defaultProfile;" >
+              <ccfdeclarationcodeblock parent_id="228" tag="tblock_1" canDelete="false" indentLevel="1" text=" KisProfileSP m_defaultProfile;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="229" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
+              <ccfdeclarationcodeblock parent_id="229" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="230" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaPos;" >
+              <ccfdeclarationcodeblock parent_id="230" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaPos;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="231" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaSize;" >
+              <ccfdeclarationcodeblock parent_id="231" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaSize;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="232" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
+              <ccfdeclarationcodeblock parent_id="232" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="233" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
+              <ccfdeclarationcodeblock parent_id="233" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -26063,72 +26063,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
+                  <codeaccessormethod accessType="0" parent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="227" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
+                  <codeaccessormethod accessType="1" parent_id="227" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="228" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
+                  <codeaccessormethod accessType="0" parent_id="228" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="228" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
+                  <codeaccessormethod accessType="1" parent_id="228" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="229" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
+                  <codeaccessormethod accessType="0" parent_id="229" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="229" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
+                  <codeaccessormethod accessType="1" parent_id="229" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="230" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
+                  <codeaccessormethod accessType="0" parent_id="230" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="230" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
+                  <codeaccessormethod accessType="1" parent_id="230" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="231" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
+                  <codeaccessormethod accessType="0" parent_id="231" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="231" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
+                  <codeaccessormethod accessType="1" parent_id="231" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="232" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
+                  <codeaccessormethod accessType="0" parent_id="232" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="232" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
+                  <codeaccessormethod accessType="1" parent_id="232" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="233" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
+                  <codeaccessormethod accessType="0" parent_id="233" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="233" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
+                  <codeaccessormethod accessType="1" parent_id="233" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -26142,22 +26142,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="206" tag="operation_206" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="206" tag="operation_206" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Compose two byte arrays containing pixels in the same color&amp;#010;model together." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="217" tag="operation_217" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="217" tag="operation_217" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dstColorStrategy &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="223" tag="operation_223" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="223" tag="operation_223" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="224" tag="operation_224" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="224" tag="operation_224" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param profile " />
                  </header>
@@ -26178,32 +26178,32 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="234" tag="tblock_7" canDelete="false" indentLevel="1" text=" KisID m_id;" >
+              <ccfdeclarationcodeblock parent_id="234" tag="tblock_7" canDelete="false" indentLevel="1" text=" KisID m_id;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="235" tag="tblock_8" canDelete="false" indentLevel="1" text=" DWORD m_cmType;" >
+              <ccfdeclarationcodeblock parent_id="235" tag="tblock_8" canDelete="false" indentLevel="1" text=" DWORD m_cmType;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="236" tag="tblock_9" canDelete="false" indentLevel="1" text=" icColorSpaceSignature m_colorSpaceSignature;" >
+              <ccfdeclarationcodeblock parent_id="236" tag="tblock_9" canDelete="false" indentLevel="1" text=" icColorSpaceSignature m_colorSpaceSignature;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="238" tag="tblock_10" canDelete="false" indentLevel="1" text=" TransformMap m_transforms;" >
+              <ccfdeclarationcodeblock parent_id="238" tag="tblock_10" canDelete="false" indentLevel="1" text=" TransformMap m_transforms;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="// Cache for existing transforms" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="245" tag="tblock_11" canDelete="false" indentLevel="1" text=" Q_UINT32 m_cachesize;" >
+              <ccfdeclarationcodeblock parent_id="245" tag="tblock_11" canDelete="false" indentLevel="1" text=" Q_UINT32 m_cachesize;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="246" tag="tblock_12" canDelete="false" indentLevel="1" text=" Q_UINT8* m_conversionCache;" >
+              <ccfdeclarationcodeblock parent_id="246" tag="tblock_12" canDelete="false" indentLevel="1" text=" Q_UINT8* m_conversionCache;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -26237,62 +26237,62 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="234" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
+                  <codeaccessormethod accessType="0" parent_id="234" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="234" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
+                  <codeaccessormethod accessType="1" parent_id="234" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="235" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
+                  <codeaccessormethod accessType="0" parent_id="235" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@return the value of m_cmType" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="235" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
+                  <codeaccessormethod accessType="1" parent_id="235" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@param value the value of m_cmType" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="236" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
+                  <codeaccessormethod accessType="0" parent_id="236" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@return the value of m_colorSpaceSignature" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="236" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
+                  <codeaccessormethod accessType="1" parent_id="236" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@param value the value of m_colorSpaceSignature" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="238" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
+                  <codeaccessormethod accessType="0" parent_id="238" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@return the value of m_transforms" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="238" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
+                  <codeaccessormethod accessType="1" parent_id="238" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@param value the value of m_transforms" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
+                  <codeaccessormethod accessType="0" parent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="245" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
+                  <codeaccessormethod accessType="1" parent_id="245" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
+                  <codeaccessormethod accessType="0" parent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
+                  <codeaccessormethod accessType="1" parent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -26306,12 +26306,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="239" tag="operation_239" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="239" tag="operation_239" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="242" tag="operation_242" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="242" tag="operation_242" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  " />
                  </header>
@@ -26336,261 +26336,261 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="227" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="227" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text=" QStringList m_profileFilenames;" >
+       <ccfdeclarationcodeblock parent_id="227" tag="tblock_0" canDelete="false" indentLevel="1" text=" QStringList m_profileFilenames;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
+       <codeaccessormethod accessType="0" parent_id="227" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="227" text="return m_profileFilenames;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="227" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
+       <codeaccessormethod accessType="1" parent_id="227" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="227" text="m_profileFilenames = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="228" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="228" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="228" tag="tblock_1" canDelete="false" indentLevel="1" text=" KisProfileSP m_defaultProfile;" >
+       <ccfdeclarationcodeblock parent_id="228" tag="tblock_1" canDelete="false" indentLevel="1" text=" KisProfileSP m_defaultProfile;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="228" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
+       <codeaccessormethod accessType="0" parent_id="228" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="228" text="return m_defaultProfile;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="228" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
+       <codeaccessormethod accessType="1" parent_id="228" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="228" text="m_defaultProfile = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="229" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="229" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// A small buffer for conversion from and to qcolor." />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="229" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
+       <ccfdeclarationcodeblock parent_id="229" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="229" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="229" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="229" text="return m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="229" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="229" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="229" text="m_qcolordata = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="230" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="230" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="230" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaPos;" >
+       <ccfdeclarationcodeblock parent_id="230" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaPos;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="230" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
+       <codeaccessormethod accessType="0" parent_id="230" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="230" text="return m_alphaPos;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="230" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
+       <codeaccessormethod accessType="1" parent_id="230" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="230" text="m_alphaPos = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="231" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="231" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="231" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaSize;" >
+       <ccfdeclarationcodeblock parent_id="231" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_INT32 m_alphaSize;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="231" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
+       <codeaccessormethod accessType="0" parent_id="231" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="231" text="return m_alphaSize;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="231" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
+       <codeaccessormethod accessType="1" parent_id="231" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="231" text="m_alphaSize = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="232" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="232" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="232" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
+       <ccfdeclarationcodeblock parent_id="232" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="232" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="232" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="232" text="return m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="232" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="232" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="232" text="m_defaultToRGB = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="233" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="233" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="233" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
+       <ccfdeclarationcodeblock parent_id="233" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="233" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="233" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="233" text="return m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="233" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="233" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="233" text="m_defaultFromRGB = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="234" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="234" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="234" tag="tblock_7" canDelete="false" indentLevel="1" text=" KisID m_id;" >
+       <ccfdeclarationcodeblock parent_id="234" tag="tblock_7" canDelete="false" indentLevel="1" text=" KisID m_id;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="234" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
+       <codeaccessormethod accessType="0" parent_id="234" tag="hblock_tag_26" canDelete="false" indentLevel="1" classfield_id="234" text="return m_id;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="234" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
+       <codeaccessormethod accessType="1" parent_id="234" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="234" text="m_id = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="235" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="235" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// The colorspace type as defined by littlecms" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="235" tag="tblock_8" canDelete="false" indentLevel="1" text=" DWORD m_cmType;" >
+       <ccfdeclarationcodeblock parent_id="235" tag="tblock_8" canDelete="false" indentLevel="1" text=" DWORD m_cmType;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="// The colorspace type as defined by littlecms" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="235" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
+       <codeaccessormethod accessType="0" parent_id="235" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="235" text="return m_cmType;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@return the value of m_cmType" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="235" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
+       <codeaccessormethod accessType="1" parent_id="235" tag="hblock_tag_29" canDelete="false" indentLevel="1" classfield_id="235" text="m_cmType = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_cmType&amp;#010;// The colorspace type as defined by littlecms&amp;#010;@param value the value of m_cmType" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="236" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="236" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// The colorspace signature as defined in icm/icc files" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="236" tag="tblock_9" canDelete="false" indentLevel="1" text=" icColorSpaceSignature m_colorSpaceSignature;" >
+       <ccfdeclarationcodeblock parent_id="236" tag="tblock_9" canDelete="false" indentLevel="1" text=" icColorSpaceSignature m_colorSpaceSignature;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="// The colorspace signature as defined in icm/icc files" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="236" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
+       <codeaccessormethod accessType="0" parent_id="236" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="236" text="return m_colorSpaceSignature;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@return the value of m_colorSpaceSignature" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="236" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
+       <codeaccessormethod accessType="1" parent_id="236" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="236" text="m_colorSpaceSignature = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_colorSpaceSignature&amp;#010;// The colorspace signature as defined in icm/icc files&amp;#010;@param value the value of m_colorSpaceSignature" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="238" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// Cache for existing transforms" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="238" tag="tblock_10" canDelete="false" indentLevel="1" text=" TransformMap m_transforms;" >
+       <ccfdeclarationcodeblock parent_id="238" tag="tblock_10" canDelete="false" indentLevel="1" text=" TransformMap m_transforms;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="// Cache for existing transforms" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="238" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
+       <codeaccessormethod accessType="0" parent_id="238" tag="hblock_tag_32" canDelete="false" indentLevel="1" classfield_id="238" text="return m_transforms;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@return the value of m_transforms" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="238" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
+       <codeaccessormethod accessType="1" parent_id="238" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="238" text="m_transforms = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_transforms&amp;#010;// Cache for existing transforms&amp;#010;@param value the value of m_transforms" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="245" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="245" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="245" tag="tblock_11" canDelete="false" indentLevel="1" text=" Q_UINT32 m_cachesize;" >
+       <ccfdeclarationcodeblock parent_id="245" tag="tblock_11" canDelete="false" indentLevel="1" text=" Q_UINT32 m_cachesize;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
+       <codeaccessormethod accessType="0" parent_id="245" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="245" text="return m_cachesize;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="245" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
+       <codeaccessormethod accessType="1" parent_id="245" tag="hblock_tag_35" canDelete="false" indentLevel="1" classfield_id="245" text="m_cachesize = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="246" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="246" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="246" tag="tblock_12" canDelete="false" indentLevel="1" text=" Q_UINT8* m_conversionCache;" >
+       <ccfdeclarationcodeblock parent_id="246" tag="tblock_12" canDelete="false" indentLevel="1" text=" Q_UINT8* m_conversionCache;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
+       <codeaccessormethod accessType="0" parent_id="246" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="246" text="return m_conversionCache;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
+       <codeaccessormethod accessType="1" parent_id="246" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="246" text="m_conversionCache = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -26598,7 +26598,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader27" tqparent_class="27" fileExt=".h" fileName="kshared" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader27" parent_class="27" fileExt=".h" fileName="kshared" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KSHARED_H&amp;#010;#define KSHARED_H" >
        <header>
@@ -26625,7 +26625,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="27" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="27" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KShared&amp;#010;" />
          </header>
@@ -26804,7 +26804,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader33" tqparent_class="33" fileExt=".h" fileName="kisid" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader33" parent_class="33" fileExt=".h" fileName="kisid" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISID_H&amp;#010;#define KISID_H" >
        <header>
@@ -26831,7 +26831,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="33" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="33" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisID&amp;#010;" />
          </header>
@@ -27010,7 +27010,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader36" tqparent_class="36" fileExt=".h" fileName="dword" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader36" parent_class="36" fileExt=".h" fileName="dword" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef DWORD_H&amp;#010;#define DWORD_H" >
        <header>
@@ -27037,7 +27037,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="36" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="36" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class DWORD&amp;#010;" />
          </header>
@@ -27216,7 +27216,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader38" tqparent_class="38" fileExt=".h" fileName="iccolorspacesignature" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader38" parent_class="38" fileExt=".h" fileName="iccolorspacesignature" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef ICCOLORSPACESIGNATURE_H&amp;#010;#define ICCOLORSPACESIGNATURE_H" >
        <header>
@@ -27243,7 +27243,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="38" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="38" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class icColorSpaceSignature&amp;#010;" />
          </header>
@@ -27422,7 +27422,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader42" tqparent_class="42" fileExt=".h" fileName="vkischannelinfosp" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader42" parent_class="42" fileExt=".h" fileName="vkischannelinfosp" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef VKISCHANNELINFOSP_H&amp;#010;#define VKISCHANNELINFOSP_H" >
        <header>
@@ -27449,7 +27449,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="42" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="42" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class vKisChannelInfoSP&amp;#010;" />
          </header>
@@ -27628,7 +27628,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader44" tqparent_class="44" fileExt=".h" fileName="q_int32" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader44" parent_class="44" fileExt=".h" fileName="q_int32" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef Q_INT32_H&amp;#010;#define Q_INT32_H" >
        <header>
@@ -27655,7 +27655,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="44" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="44" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class Q_INT32&amp;#010;" />
          </header>
@@ -27834,7 +27834,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader49" tqparent_class="49" fileExt=".h" fileName="bool" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader49" parent_class="49" fileExt=".h" fileName="bool" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef BOOL_H&amp;#010;#define BOOL_H" >
        <header>
@@ -27861,7 +27861,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="49" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="49" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class bool&amp;#010;" />
          </header>
@@ -28040,7 +28040,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader53" tqparent_class="53" fileExt=".h" fileName="q_uint8" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader53" parent_class="53" fileExt=".h" fileName="q_uint8" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef Q_UINT8_H&amp;#010;#define Q_UINT8_H" >
        <header>
@@ -28067,7 +28067,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="53" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="53" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class Q_UINT8&amp;#010;" />
          </header>
@@ -28246,7 +28246,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader57" tqparent_class="57" fileExt=".h" fileName="qstring" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader57" parent_class="57" fileExt=".h" fileName="qstring" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QSTRING_H&amp;#010;#define QSTRING_H" >
        <header>
@@ -28273,7 +28273,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="57" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="57" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QString&amp;#010;" />
          </header>
@@ -28452,7 +28452,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader69" tqparent_class="69" fileExt=".h" fileName="kiscompositeoplist" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader69" parent_class="69" fileExt=".h" fileName="kiscompositeoplist" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCOMPOSITEOPLIST_H&amp;#010;#define KISCOMPOSITEOPLIST_H" >
        <header>
@@ -28479,7 +28479,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="69" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="69" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisCompositeOpList&amp;#010;" />
          </header>
@@ -28658,7 +28658,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader72" tqparent_class="72" fileExt=".h" fileName="vkisprofilesp" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader72" parent_class="72" fileExt=".h" fileName="vkisprofilesp" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef VKISPROFILESP_H&amp;#010;#define VKISPROFILESP_H" >
        <header>
@@ -28685,7 +28685,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="72" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="72" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class vKisProfileSP&amp;#010;" />
          </header>
@@ -28864,7 +28864,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader75" tqparent_class="75" fileExt=".h" fileName="qcolor" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader75" parent_class="75" fileExt=".h" fileName="qcolor" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QCOLOR_H&amp;#010;#define QCOLOR_H" >
        <header>
@@ -28891,7 +28891,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="75" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="75" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QColor&amp;#010;" />
          </header>
@@ -29070,7 +29070,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader80" tqparent_class="80" fileExt=".h" fileName="kisprofilesp" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader80" parent_class="80" fileExt=".h" fileName="kisprofilesp" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISPROFILESP_H&amp;#010;#define KISPROFILESP_H" >
        <header>
@@ -29097,7 +29097,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="80" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="80" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisProfileSP&amp;#010;" />
          </header>
@@ -29276,7 +29276,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader84" tqparent_class="84" fileExt=".h" fileName="quantum" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader84" parent_class="84" fileExt=".h" fileName="quantum" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QUANTUM_H&amp;#010;#define QUANTUM_H" >
        <header>
@@ -29303,7 +29303,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="84" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="84" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QUANTUM&amp;#010;" />
          </header>
@@ -29482,7 +29482,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader121" tqparent_class="121" fileExt=".h" fileName="qimage" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader121" parent_class="121" fileExt=".h" fileName="qimage" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QIMAGE_H&amp;#010;#define QIMAGE_H" >
        <header>
@@ -29509,7 +29509,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="121" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="121" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QImage&amp;#010;" />
          </header>
@@ -29688,7 +29688,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader150" tqparent_class="150" fileExt=".h" fileName="q_uint16" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader150" parent_class="150" fileExt=".h" fileName="q_uint16" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef Q_UINT16_H&amp;#010;#define Q_UINT16_H" >
        <header>
@@ -29715,7 +29715,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="150" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="150" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class Q_UINT16&amp;#010;" />
          </header>
@@ -29894,7 +29894,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader153" tqparent_class="153" fileExt=".h" fileName="kiscoloradjustment" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader153" parent_class="153" fileExt=".h" fileName="kiscoloradjustment" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCOLORADJUSTMENT_H&amp;#010;#define KISCOLORADJUSTMENT_H" >
        <header>
@@ -29921,7 +29921,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="153" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="153" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisColorAdjustment&amp;#010;" />
          </header>
@@ -30100,7 +30100,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader163" tqparent_class="163" fileExt=".h" fileName="q_int8" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader163" parent_class="163" fileExt=".h" fileName="q_int8" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef Q_INT8_H&amp;#010;#define Q_INT8_H" >
        <header>
@@ -30127,7 +30127,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="163" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="163" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class Q_INT8&amp;#010;" />
          </header>
@@ -30306,7 +30306,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader175" tqparent_class="175" fileExt=".h" fileName="enumchannelflags" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader175" parent_class="175" fileExt=".h" fileName="enumchannelflags" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef ENUMCHANNELFLAGS_H&amp;#010;#define ENUMCHANNELFLAGS_H" >
        <header>
@@ -30333,7 +30333,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="175" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="175" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class enumChannelFlags&amp;#010;" />
          </header>
@@ -30512,7 +30512,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader201" tqparent_class="201" fileExt=".h" fileName="kiscompositeop" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader201" parent_class="201" fileExt=".h" fileName="kiscompositeop" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCOMPOSITEOP_H&amp;#010;#define KISCOMPOSITEOP_H" >
        <header>
@@ -30539,7 +30539,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="201" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="201" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisCompositeOp&amp;#010;" />
          </header>
@@ -30718,7 +30718,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader222" tqparent_class="222" fileExt=".h" fileName="cmshtransform" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader222" parent_class="222" fileExt=".h" fileName="cmshtransform" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef CMSHTRANSFORM_H&amp;#010;#define CMSHTRANSFORM_H" >
        <header>
@@ -30745,7 +30745,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="222" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="222" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class cmsHTRANSFORM&amp;#010;" />
          </header>
@@ -30924,7 +30924,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader226" tqparent_class="226" fileExt=".h" fileName="qstringlist" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader226" parent_class="226" fileExt=".h" fileName="qstringlist" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QSTRINGLIST_H&amp;#010;#define QSTRINGLIST_H" >
        <header>
@@ -30951,7 +30951,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="226" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="226" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QStringList&amp;#010;" />
          </header>
@@ -31130,7 +31130,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="kisabstractcolorspace" id="cppheader237" tqparent_class="237" fileExt=".h" fileName="transformmap" >
+    <classifiercodedocument writeOutCode="true" package="kisabstractcolorspace" id="cppheader237" parent_class="237" fileExt=".h" fileName="transformmap" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef TRANSFORMMAP_H&amp;#010;#define TRANSFORMMAP_H" >
        <header>
@@ -31157,7 +31157,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="237" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="237" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class TransformMap&amp;#010;" />
          </header>
@@ -31336,7 +31336,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader247" tqparent_class="247" fileExt=".h" fileName="kisu8basecolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader247" parent_class="247" fileExt=".h" fileName="kisu8basecolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISU8BASECOLORSPACE_H&amp;#010;#define KISU8BASECOLORSPACE_H" >
        <header>
@@ -31363,7 +31363,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="247" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="247" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisU8BaseColorSpace&amp;#010; Copyright (c) 2005 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;This class is the base for all 8-bit/channel colorspaces" />
          </header>
@@ -31420,7 +31420,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="251" tag="operation_251" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="251" tag="operation_251" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param cmType &amp;#010;@param colorSpaceSignature " />
                  </header>
@@ -31548,7 +31548,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader255" tqparent_class="255" fileExt=".h" fileName="kisalphacolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader255" parent_class="255" fileExt=".h" fileName="kisalphacolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISALPHACOLORSPACE_H&amp;#010;#define KISALPHACOLORSPACE_H" >
        <header>
@@ -31575,7 +31575,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="255" tag="classDeclarationBlock" canDelete="false" >
+        <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." />
          </header>
@@ -31632,107 +31632,107 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="259" tag="operation_259" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="259" tag="operation_259" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="260" tag="operation_260" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="260" tag="operation_260" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="261" tag="operation_261" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="261" tag="operation_261" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="265" tag="operation_265" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="265" tag="operation_265" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="270" tag="operation_270" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="270" tag="operation_270" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="273" tag="operation_273" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="273" tag="operation_273" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="277" tag="operation_277" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="277" tag="operation_277" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="282" tag="operation_282" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="282" tag="operation_282" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="285" tag="operation_285" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="285" tag="operation_285" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="288" tag="operation_288" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="288" tag="operation_288" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="291" tag="operation_291" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="291" tag="operation_291" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="296" tag="operation_296" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="296" tag="operation_296" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="297" tag="operation_297" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="297" tag="operation_297" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="298" tag="operation_298" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="298" tag="operation_298" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="299" tag="operation_299" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="299" tag="operation_299" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="300" tag="operation_300" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="300" tag="operation_300" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="301" tag="operation_301" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="301" tag="operation_301" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="304" tag="operation_304" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="304" tag="operation_304" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="307" tag="operation_307" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="307" tag="operation_307" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="315" tag="operation_315" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="315" tag="operation_315" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="321" tag="operation_321" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="321" tag="operation_321" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param kernelValues &amp;#010;@param channelFlags &amp;#010;@param dst &amp;#010;@param factor &amp;#010;@param offset &amp;#010;@param nColors " />
                  </header>
@@ -31789,17 +31789,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="329" tag="operation_329" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="329" tag="operation_329" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Convert a byte array of srcLen pixels *src to the specified color space&amp;#010;and put the converted bytes into the prepared byte array *dst.&amp;#010;&amp;#010;Returns false if the conversion failed, true if it succeeded" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="337" tag="operation_337" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="337" tag="operation_337" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="348" tag="operation_348" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="348" tag="operation_348" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -31820,7 +31820,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="349" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="349" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -31854,12 +31854,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="349" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="349" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="349" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="349" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -31892,21 +31892,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="349" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="349" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="349" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="349" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="349" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="349" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="349" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="349" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="349" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="349" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -31914,7 +31914,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader350" tqparent_class="350" fileExt=".h" fileName="kisf32basecolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader350" parent_class="350" fileExt=".h" fileName="kisf32basecolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISF32BASECOLORSPACE_H&amp;#010;#define KISF32BASECOLORSPACE_H" >
        <header>
@@ -31941,7 +31941,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="350" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="350" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisF32BaseColorSpace&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;This class is the base for all 32-bit float colorspaces." />
          </header>
@@ -31998,7 +31998,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="354" tag="operation_354" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="354" tag="operation_354" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param cmType &amp;#010;@param colorSpaceSignature " />
                  </header>
@@ -32126,7 +32126,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader358" tqparent_class="358" fileExt=".h" fileName="kisu16basecolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader358" parent_class="358" fileExt=".h" fileName="kisu16basecolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISU16BASECOLORSPACE_H&amp;#010;#define KISU16BASECOLORSPACE_H" >
        <header>
@@ -32153,7 +32153,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="358" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="358" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisU16BaseColorSpace&amp;#010; Copyright (c) 2005 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;This is the base class for 16-bit/channel colorspaces. It defines&amp;#010;a number of common methods, like handling 16-bit alpha and up-&amp;#010;and down-scaling of channels." />
          </header>
@@ -32168,12 +32168,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
+              <ccfdeclarationcodeblock parent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="364" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+              <ccfdeclarationcodeblock parent_id="364" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -32207,22 +32207,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
+                  <codeaccessormethod accessType="0" parent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="363" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
+                  <codeaccessormethod accessType="1" parent_id="363" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
+                  <codeaccessormethod accessType="0" parent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
+                  <codeaccessormethod accessType="1" parent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -32242,7 +32242,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="365" tag="operation_365" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="365" tag="operation_365" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param cmType &amp;#010;@param colorSpaceSignature " />
                  </header>
@@ -32369,41 +32369,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="363" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="363" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
+       <ccfdeclarationcodeblock parent_id="363" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
+       <codeaccessormethod accessType="0" parent_id="363" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="363" text="return U16_OPACITY_OPAQUE;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="363" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="363" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="363" text="U16_OPACITY_OPAQUE = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="364" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="364" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="364" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+       <ccfdeclarationcodeblock parent_id="364" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
+       <codeaccessormethod accessType="0" parent_id="364" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="364" text="return U16_OPACITY_TRANSPARENT;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
+       <codeaccessormethod accessType="1" parent_id="364" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="364" text="U16_OPACITY_TRANSPARENT = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -32411,7 +32411,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader369" tqparent_class="369" fileExt=".h" fileName="kisxyzcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader369" parent_class="369" fileExt=".h" fileName="kisxyzcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISXYZCOLORSPACE_H&amp;#010;#define KISXYZCOLORSPACE_H" >
        <header>
@@ -32438,7 +32438,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="369" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="369" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisXyzColorSpace&amp;#010; Copyright (c) 2005 Boudewijn Rempt (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." />
          </header>
@@ -32495,117 +32495,117 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="378" tag="operation_378" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="378" tag="operation_378" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="379" tag="operation_379" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="379" tag="operation_379" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="380" tag="operation_380" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="380" tag="operation_380" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="384" tag="operation_384" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="384" tag="operation_384" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="389" tag="operation_389" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="389" tag="operation_389" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="392" tag="operation_392" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="392" tag="operation_392" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="396" tag="operation_396" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="396" tag="operation_396" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="400" tag="operation_400" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="400" tag="operation_400" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="405" tag="operation_405" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="405" tag="operation_405" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="408" tag="operation_408" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="408" tag="operation_408" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="411" tag="operation_411" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="411" tag="operation_411" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="414" tag="operation_414" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="414" tag="operation_414" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="419" tag="operation_419" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="419" tag="operation_419" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="420" tag="operation_420" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="420" tag="operation_420" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="421" tag="operation_421" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="421" tag="operation_421" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="422" tag="operation_422" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="422" tag="operation_422" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="423" tag="operation_423" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="423" tag="operation_423" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="424" tag="operation_424" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="424" tag="operation_424" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="427" tag="operation_427" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="427" tag="operation_427" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="430" tag="operation_430" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="430" tag="operation_430" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="438" tag="operation_438" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="438" tag="operation_438" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="444" tag="operation_444" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="444" tag="operation_444" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="455" tag="operation_455" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="455" tag="operation_455" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -32662,59 +32662,59 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="456" tag="operation_456" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="466" tag="operation_466" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="476" tag="operation_476" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="486" tag="operation_486" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="496" tag="operation_496" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="506" tag="operation_506" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="516" tag="operation_516" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="526" tag="operation_526" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="536" tag="operation_536" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="546" tag="operation_546" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="556" tag="operation_556" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -32733,42 +32733,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="570" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_X;" >
+              <ccfdeclarationcodeblock parent_id="570" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_X;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="571" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Y;" >
+              <ccfdeclarationcodeblock parent_id="571" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Y;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="572" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Z;" >
+              <ccfdeclarationcodeblock parent_id="572" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Z;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="573" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
+              <ccfdeclarationcodeblock parent_id="573" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="566" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="566" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="567" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
+              <ccfdeclarationcodeblock parent_id="567" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="568" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
+              <ccfdeclarationcodeblock parent_id="568" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="574" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
+              <ccfdeclarationcodeblock parent_id="574" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
                </header>
@@ -32796,42 +32796,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="570" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
+                  <codeaccessormethod accessType="0" parent_id="570" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="570" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
+                  <codeaccessormethod accessType="1" parent_id="570" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="571" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
+                  <codeaccessormethod accessType="0" parent_id="571" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="571" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
+                  <codeaccessormethod accessType="1" parent_id="571" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="572" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
+                  <codeaccessormethod accessType="0" parent_id="572" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="572" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
+                  <codeaccessormethod accessType="1" parent_id="572" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="573" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
+                  <codeaccessormethod accessType="0" parent_id="573" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="573" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
+                  <codeaccessormethod accessType="1" parent_id="573" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -32843,42 +32843,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="566" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="566" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="566" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="566" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="567" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
+                  <codeaccessormethod accessType="0" parent_id="567" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="567" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
+                  <codeaccessormethod accessType="1" parent_id="567" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
+                  <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
+                  <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
+                  <codeaccessormethod accessType="0" parent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
+                  <codeaccessormethod accessType="1" parent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
                    </header>
@@ -32911,161 +32911,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="566" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="566" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="566" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="566" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="566" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="566" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="566" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="566" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="566" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="566" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="567" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="567" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="567" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
+       <ccfdeclarationcodeblock parent_id="567" tag="tblock_5" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="567" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="567" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="567" text="return m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="567" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="567" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="567" text="m_defaultToRGB = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="568" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
+       <ccfdeclarationcodeblock parent_id="568" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="568" text="return m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="568" text="m_defaultFromRGB = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="570" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="570" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="570" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_X;" >
+       <ccfdeclarationcodeblock parent_id="570" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_X;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="570" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
+       <codeaccessormethod accessType="0" parent_id="570" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="570" text="return PIXEL_X;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="570" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
+       <codeaccessormethod accessType="1" parent_id="570" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="570" text="PIXEL_X = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="571" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="571" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="571" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Y;" >
+       <ccfdeclarationcodeblock parent_id="571" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Y;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="571" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
+       <codeaccessormethod accessType="0" parent_id="571" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="571" text="return PIXEL_Y;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="571" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
+       <codeaccessormethod accessType="1" parent_id="571" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="571" text="PIXEL_Y = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="572" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="572" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="572" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Z;" >
+       <ccfdeclarationcodeblock parent_id="572" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_Z;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="572" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
+       <codeaccessormethod accessType="0" parent_id="572" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="572" text="return PIXEL_Z;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="572" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
+       <codeaccessormethod accessType="1" parent_id="572" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="572" text="PIXEL_Z = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="573" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="573" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="573" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="573" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="573" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="573" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="573" text="return PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="573" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="573" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="573" text="PIXEL_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="574" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="574" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="// A small buffer for conversion from and to qcolor." />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="574" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
+       <ccfdeclarationcodeblock parent_id="574" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="// A small buffer for conversion from and to qcolor." />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="574" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="574" text="return m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@return the value of m_qcolordata" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="574" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="574" text="m_qcolordata = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of m_qcolordata&amp;#010;// A small buffer for conversion from and to qcolor.&amp;#010;@param value the value of m_qcolordata" />
         </header>
@@ -33073,7 +33073,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="kisrgbu16colorspace" id="cppheader373" tqparent_class="373" fileExt=".h" fileName="pixel" >
+    <classifiercodedocument writeOutCode="true" package="kisrgbu16colorspace" id="cppheader373" parent_class="373" fileExt=".h" fileName="pixel" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef PIXEL_H&amp;#010;#define PIXEL_H" >
        <header>
@@ -33100,7 +33100,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="373" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="373" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class Pixel&amp;#010;" />
          </header>
@@ -33115,37 +33115,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 X;" >
+              <ccfdeclarationcodeblock parent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 X;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="375" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 Y;" >
+              <ccfdeclarationcodeblock parent_id="375" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 Y;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="376" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 Z;" >
+              <ccfdeclarationcodeblock parent_id="376" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 Z;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="377" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 alpha;" >
+              <ccfdeclarationcodeblock parent_id="377" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 alpha;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1130" tag="tblock_4" canDelete="false" indentLevel="1" text=" float blue;" >
+              <ccfdeclarationcodeblock parent_id="1130" tag="tblock_4" canDelete="false" indentLevel="1" text=" float blue;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1131" tag="tblock_5" canDelete="false" indentLevel="1" text=" float green;" >
+              <ccfdeclarationcodeblock parent_id="1131" tag="tblock_5" canDelete="false" indentLevel="1" text=" float green;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1132" tag="tblock_6" canDelete="false" indentLevel="1" text=" float red;" >
+              <ccfdeclarationcodeblock parent_id="1132" tag="tblock_6" canDelete="false" indentLevel="1" text=" float red;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -33185,72 +33185,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
+                  <codeaccessormethod accessType="0" parent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="374" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
+                  <codeaccessormethod accessType="1" parent_id="374" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="375" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
+                  <codeaccessormethod accessType="0" parent_id="375" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="375" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
+                  <codeaccessormethod accessType="1" parent_id="375" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="376" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
+                  <codeaccessormethod accessType="0" parent_id="376" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="376" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
+                  <codeaccessormethod accessType="1" parent_id="376" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="377" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
+                  <codeaccessormethod accessType="0" parent_id="377" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="377" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
+                  <codeaccessormethod accessType="1" parent_id="377" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1130" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
+                  <codeaccessormethod accessType="0" parent_id="1130" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1130" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1130" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
+                  <codeaccessormethod accessType="0" parent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1131" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1131" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
+                  <codeaccessormethod accessType="0" parent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -33385,141 +33385,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="374" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 X;" >
+       <ccfdeclarationcodeblock parent_id="374" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 X;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
+       <codeaccessormethod accessType="0" parent_id="374" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="374" text="return X;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="374" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
+       <codeaccessormethod accessType="1" parent_id="374" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="374" text="X = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="375" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="375" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 Y;" >
+       <ccfdeclarationcodeblock parent_id="375" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 Y;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="375" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
+       <codeaccessormethod accessType="0" parent_id="375" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="375" text="return Y;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="375" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
+       <codeaccessormethod accessType="1" parent_id="375" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="375" text="Y = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="376" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="376" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 Z;" >
+       <ccfdeclarationcodeblock parent_id="376" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 Z;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="376" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
+       <codeaccessormethod accessType="0" parent_id="376" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="376" text="return Z;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="376" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
+       <codeaccessormethod accessType="1" parent_id="376" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="376" text="Z = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="377" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="377" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 alpha;" >
+       <ccfdeclarationcodeblock parent_id="377" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 alpha;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="377" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
+       <codeaccessormethod accessType="0" parent_id="377" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="377" text="return alpha;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="377" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
+       <codeaccessormethod accessType="1" parent_id="377" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="377" text="alpha = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1130" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1130" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1130" tag="tblock_4" canDelete="false" indentLevel="1" text=" float blue;" >
+       <ccfdeclarationcodeblock parent_id="1130" tag="tblock_4" canDelete="false" indentLevel="1" text=" float blue;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1130" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
+       <codeaccessormethod accessType="0" parent_id="1130" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1130" text="return blue;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1130" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
+       <codeaccessormethod accessType="1" parent_id="1130" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1130" text="blue = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1131" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1131" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1131" tag="tblock_5" canDelete="false" indentLevel="1" text=" float green;" >
+       <ccfdeclarationcodeblock parent_id="1131" tag="tblock_5" canDelete="false" indentLevel="1" text=" float green;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
+       <codeaccessormethod accessType="0" parent_id="1131" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1131" text="return green;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1131" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
+       <codeaccessormethod accessType="1" parent_id="1131" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1131" text="green = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1132" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1132" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1132" tag="tblock_6" canDelete="false" indentLevel="1" text=" float red;" >
+       <ccfdeclarationcodeblock parent_id="1132" tag="tblock_6" canDelete="false" indentLevel="1" text=" float red;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
+       <codeaccessormethod accessType="0" parent_id="1132" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1132" text="return red;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
+       <codeaccessormethod accessType="1" parent_id="1132" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1132" text="red = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -33527,7 +33527,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader575" tqparent_class="575" fileExt=".h" fileName="kiscmykcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader575" parent_class="575" fileExt=".h" fileName="kiscmykcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCMYKCOLORSPACE_H&amp;#010;#define KISCMYKCOLORSPACE_H" >
        <header>
@@ -33554,7 +33554,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="575" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="575" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisCmykColorSpace&amp;#010; Copyright (c) 2003 Boudewijn Rempt (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." />
          </header>
@@ -33611,117 +33611,117 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="579" tag="operation_579" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="579" tag="operation_579" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="580" tag="operation_580" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="580" tag="operation_580" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="581" tag="operation_581" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="581" tag="operation_581" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="585" tag="operation_585" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="585" tag="operation_585" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="590" tag="operation_590" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="590" tag="operation_590" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="593" tag="operation_593" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="593" tag="operation_593" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="597" tag="operation_597" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="597" tag="operation_597" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param color &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="601" tag="operation_601" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="601" tag="operation_601" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param color &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="606" tag="operation_606" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="606" tag="operation_606" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="609" tag="operation_609" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="609" tag="operation_609" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="612" tag="operation_612" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="612" tag="operation_612" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="617" tag="operation_617" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="617" tag="operation_617" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="618" tag="operation_618" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="618" tag="operation_618" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="619" tag="operation_619" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="619" tag="operation_619" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="620" tag="operation_620" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="620" tag="operation_620" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="621" tag="operation_621" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="621" tag="operation_621" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="622" tag="operation_622" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="622" tag="operation_622" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="625" tag="operation_625" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="625" tag="operation_625" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="628" tag="operation_628" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="628" tag="operation_628" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="636" tag="operation_636" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="636" tag="operation_636" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param adjust " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="639" tag="operation_639" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="639" tag="operation_639" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="650" tag="operation_650" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="650" tag="operation_650" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="651" tag="operation_651" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="651" tag="operation_651" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -33778,7 +33778,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="652" tag="operation_652" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="652" tag="operation_652" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dstRowStart &amp;#010;@param dstRowStride &amp;#010;@param srcRowStart &amp;#010;@param srcRowStride &amp;#010;@param rows &amp;#010;@param numColumns &amp;#010;@param opacity " />
                  </header>
@@ -33799,47 +33799,47 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="664" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CYAN;" >
+              <ccfdeclarationcodeblock parent_id="664" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CYAN;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="665" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_MAGENTA;" >
+              <ccfdeclarationcodeblock parent_id="665" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_MAGENTA;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="666" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_YELLOW;" >
+              <ccfdeclarationcodeblock parent_id="666" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_YELLOW;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="667" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLACK;" >
+              <ccfdeclarationcodeblock parent_id="667" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLACK;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="668" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CMYK_ALPHA;" >
+              <ccfdeclarationcodeblock parent_id="668" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CMYK_ALPHA;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="660" tag="tblock_5" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="660" tag="tblock_5" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="661" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
+              <ccfdeclarationcodeblock parent_id="661" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="662" tag="tblock_7" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
+              <ccfdeclarationcodeblock parent_id="662" tag="tblock_7" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
+              <ccfdeclarationcodeblock parent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -33867,52 +33867,52 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="664" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
+                  <codeaccessormethod accessType="0" parent_id="664" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="664" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
+                  <codeaccessormethod accessType="1" parent_id="664" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="665" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
+                  <codeaccessormethod accessType="0" parent_id="665" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="665" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
+                  <codeaccessormethod accessType="1" parent_id="665" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="666" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
+                  <codeaccessormethod accessType="0" parent_id="666" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="666" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
+                  <codeaccessormethod accessType="1" parent_id="666" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="667" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
+                  <codeaccessormethod accessType="0" parent_id="667" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="667" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
+                  <codeaccessormethod accessType="1" parent_id="667" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="668" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
+                  <codeaccessormethod accessType="0" parent_id="668" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="668" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
+                  <codeaccessormethod accessType="1" parent_id="668" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -33924,42 +33924,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="660" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="660" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
+                  <codeaccessormethod accessType="0" parent_id="661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="661" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
+                  <codeaccessormethod accessType="1" parent_id="661" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
+                  <codeaccessormethod accessType="0" parent_id="662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="662" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
+                  <codeaccessormethod accessType="1" parent_id="662" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="663" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
+                  <codeaccessormethod accessType="0" parent_id="663" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="663" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
+                  <codeaccessormethod accessType="1" parent_id="663" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -33992,181 +33992,181 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="660" tag="tblock_5" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="660" tag="tblock_5" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="660" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="660" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="660" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="660" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="661" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
+       <ccfdeclarationcodeblock parent_id="661" tag="tblock_6" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
+       <codeaccessormethod accessType="0" parent_id="661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="661" text="return m_defaultToRGB;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="661" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="661" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="661" text="m_defaultToRGB = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="662" tag="tblock_7" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
+       <ccfdeclarationcodeblock parent_id="662" tag="tblock_7" canDelete="false" indentLevel="1" text=" cmsHTRANSFORM m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
+       <codeaccessormethod accessType="0" parent_id="662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="662" text="return m_defaultFromRGB;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="662" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
+       <codeaccessormethod accessType="1" parent_id="662" tag="hblock_tag_23" canDelete="false" indentLevel="1" classfield_id="662" text="m_defaultFromRGB = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="663" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="663" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
+       <ccfdeclarationcodeblock parent_id="663" tag="tblock_8" canDelete="false" indentLevel="1" text=" Q_UINT8* m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="663" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
+       <codeaccessormethod accessType="0" parent_id="663" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="663" text="return m_qcolordata;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="663" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
+       <codeaccessormethod accessType="1" parent_id="663" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="663" text="m_qcolordata = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="664" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="664" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="664" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CYAN;" >
+       <ccfdeclarationcodeblock parent_id="664" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CYAN;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="664" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
+       <codeaccessormethod accessType="0" parent_id="664" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="664" text="return PIXEL_CYAN;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="664" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
+       <codeaccessormethod accessType="1" parent_id="664" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="664" text="PIXEL_CYAN = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="665" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="665" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="665" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_MAGENTA;" >
+       <ccfdeclarationcodeblock parent_id="665" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_MAGENTA;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="665" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
+       <codeaccessormethod accessType="0" parent_id="665" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="665" text="return PIXEL_MAGENTA;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="665" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
+       <codeaccessormethod accessType="1" parent_id="665" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="665" text="PIXEL_MAGENTA = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="666" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="666" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="666" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_YELLOW;" >
+       <ccfdeclarationcodeblock parent_id="666" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_YELLOW;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="666" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
+       <codeaccessormethod accessType="0" parent_id="666" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="666" text="return PIXEL_YELLOW;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="666" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
+       <codeaccessormethod accessType="1" parent_id="666" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="666" text="PIXEL_YELLOW = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="667" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="667" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="667" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLACK;" >
+       <ccfdeclarationcodeblock parent_id="667" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLACK;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="667" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
+       <codeaccessormethod accessType="0" parent_id="667" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="667" text="return PIXEL_BLACK;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="667" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
+       <codeaccessormethod accessType="1" parent_id="667" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="667" text="PIXEL_BLACK = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="668" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="668" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CMYK_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="668" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_CMYK_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="668" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="668" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="668" text="return PIXEL_CMYK_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="668" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="668" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="668" text="PIXEL_CMYK_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -34174,7 +34174,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader669" tqparent_class="669" fileExt=".h" fileName="kisgraycolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader669" parent_class="669" fileExt=".h" fileName="kisgraycolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISGRAYCOLORSPACE_H&amp;#010;#define KISGRAYCOLORSPACE_H" >
        <header>
@@ -34201,7 +34201,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="669" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="669" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisGrayColorSpace&amp;#010; Copyright (c) 2004 Cyrille Berger &lt;cberger@cberger.net>&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." />
          </header>
@@ -34258,127 +34258,127 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="673" tag="operation_673" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="673" tag="operation_673" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="674" tag="operation_674" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="674" tag="operation_674" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="675" tag="operation_675" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="675" tag="operation_675" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param gray &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="679" tag="operation_679" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="679" tag="operation_679" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param gray &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="683" tag="operation_683" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="683" tag="operation_683" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="687" tag="operation_687" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="687" tag="operation_687" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="692" tag="operation_692" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="692" tag="operation_692" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="695" tag="operation_695" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="695" tag="operation_695" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="699" tag="operation_699" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="699" tag="operation_699" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="703" tag="operation_703" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="703" tag="operation_703" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="708" tag="operation_708" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="708" tag="operation_708" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="711" tag="operation_711" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="711" tag="operation_711" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="714" tag="operation_714" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="714" tag="operation_714" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="717" tag="operation_717" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="717" tag="operation_717" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="722" tag="operation_722" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="722" tag="operation_722" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="723" tag="operation_723" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="723" tag="operation_723" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="724" tag="operation_724" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="724" tag="operation_724" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="725" tag="operation_725" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="725" tag="operation_725" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="726" tag="operation_726" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="726" tag="operation_726" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="727" tag="operation_727" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="727" tag="operation_727" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="730" tag="operation_730" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="730" tag="operation_730" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="733" tag="operation_733" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="733" tag="operation_733" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="741" tag="operation_741" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="741" tag="operation_741" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="747" tag="operation_747" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="747" tag="operation_747" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dststride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="758" tag="operation_758" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="758" tag="operation_758" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -34435,54 +34435,54 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="759" tag="operation_759" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="769" tag="operation_769" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="779" tag="operation_779" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="789" tag="operation_789" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="799" tag="operation_799" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="809" tag="operation_809" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="819" tag="operation_819" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="829" tag="operation_829" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="839" tag="operation_839" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="849" tag="operation_849" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -34501,17 +34501,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="861" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY;" >
+              <ccfdeclarationcodeblock parent_id="861" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="862" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY_ALPHA;" >
+              <ccfdeclarationcodeblock parent_id="862" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY_ALPHA;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="860" tag="tblock_2" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="860" tag="tblock_2" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -34539,22 +34539,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="861" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
+                  <codeaccessormethod accessType="0" parent_id="861" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
+                  <codeaccessormethod accessType="1" parent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="862" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
+                  <codeaccessormethod accessType="0" parent_id="862" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="862" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
+                  <codeaccessormethod accessType="1" parent_id="862" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -34566,12 +34566,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -34604,61 +34604,61 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="860" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="860" tag="tblock_2" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="860" tag="tblock_2" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="860" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="860" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="860" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="860" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="860" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="860" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="861" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="861" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="861" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY;" >
+       <ccfdeclarationcodeblock parent_id="861" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="861" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
+       <codeaccessormethod accessType="0" parent_id="861" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="861" text="return PIXEL_GRAY;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
+       <codeaccessormethod accessType="1" parent_id="861" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="861" text="PIXEL_GRAY = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="862" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="862" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="862" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="862" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GRAY_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="862" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="862" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="862" text="return PIXEL_GRAY_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="862" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="862" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="862" text="PIXEL_GRAY_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -34666,7 +34666,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader859" tqparent_class="859" fileExt=".h" fileName="kisgraycolorspacetester" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader859" parent_class="859" fileExt=".h" fileName="kisgraycolorspacetester" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISGRAYCOLORSPACETESTER_H&amp;#010;#define KISGRAYCOLORSPACETESTER_H" >
        <header>
@@ -34693,7 +34693,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="859" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="859" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisGrayColorSpaceTester&amp;#010;" />
          </header>
@@ -34872,7 +34872,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader863" tqparent_class="863" fileExt=".h" fileName="rgbf32plugin" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader863" parent_class="863" fileExt=".h" fileName="rgbf32plugin" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef RGBF32PLUGIN_H&amp;#010;#define RGBF32PLUGIN_H" >
        <header>
@@ -34899,7 +34899,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="863" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="863" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class RGBF32Plugin&amp;#010; Copyright (c) 2003 Boudewijn Rempt (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;A plugin wrapper around the RGB F32 colour space strategy." />
          </header>
@@ -34956,12 +34956,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="869" tag="operation_869" canDelete="false" indentLevel="1" >
+                <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  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -35033,7 +35033,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
+              <ccfdeclarationcodeblock parent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -35067,12 +35067,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
+                  <codeaccessormethod accessType="0" parent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
+                  <codeaccessormethod accessType="1" parent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -35105,21 +35105,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="878" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="878" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
+       <ccfdeclarationcodeblock parent_id="878" tag="tblock_0" canDelete="false" indentLevel="1" text=" KisAbstractColorSpace* m_ColorSpaceRGBF32;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
+       <codeaccessormethod accessType="0" parent_id="878" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="878" text="return m_ColorSpaceRGBF32;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
+       <codeaccessormethod accessType="1" parent_id="878" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="878" text="m_ColorSpaceRGBF32 = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -35127,7 +35127,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader864" tqparent_class="864" fileExt=".h" fileName="kparts" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader864" parent_class="864" fileExt=".h" fileName="kparts" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KPARTS_H&amp;#010;#define KPARTS_H" >
        <header>
@@ -35154,7 +35154,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="864" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="864" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KParts&amp;#010;" />
          </header>
@@ -35333,7 +35333,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="kparts" id="cppheader865" tqparent_class="865" fileExt=".h" fileName="plugin" >
+    <classifiercodedocument writeOutCode="true" package="kparts" id="cppheader865" parent_class="865" fileExt=".h" fileName="plugin" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef PLUGIN_H&amp;#010;#define PLUGIN_H" >
        <header>
@@ -35360,7 +35360,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="865" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="865" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class Plugin&amp;#010;" />
          </header>
@@ -35539,7 +35539,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader870" tqparent_class="870" fileExt=".h" fileName="qobject" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader870" parent_class="870" fileExt=".h" fileName="qobject" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QOBJECT_H&amp;#010;#define QOBJECT_H" >
        <header>
@@ -35566,7 +35566,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="870" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="870" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QObject&amp;#010;" />
          </header>
@@ -35745,7 +35745,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader879" tqparent_class="879" fileExt=".h" fileName="kisf32rgbcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader879" parent_class="879" fileExt=".h" fileName="kisf32rgbcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISF32RGBCOLORSPACE_H&amp;#010;#define KISF32RGBCOLORSPACE_H" >
        <header>
@@ -35772,7 +35772,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="879" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="879" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisF32RgbColorSpace&amp;#010; Copyright (c) 2002 Patrick Julien  &lt;freak@codepimps.org>&amp;#010; Copyright (c) 2005 Adrian Page &lt;adrian@pagenet.plus.com>&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." />
          </header>
@@ -35829,122 +35829,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="883" tag="operation_883" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="883" tag="operation_883" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="884" tag="operation_884" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="884" tag="operation_884" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="885" tag="operation_885" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="885" tag="operation_885" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="891" tag="operation_891" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="891" tag="operation_891" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="898" tag="operation_898" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="898" tag="operation_898" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="902" tag="operation_902" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="902" tag="operation_902" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="907" tag="operation_907" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="907" tag="operation_907" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="910" tag="operation_910" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="910" tag="operation_910" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="914" tag="operation_914" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="914" tag="operation_914" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="918" tag="operation_918" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="918" tag="operation_918" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="923" tag="operation_923" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="923" tag="operation_923" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="926" tag="operation_926" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="926" tag="operation_926" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="929" tag="operation_929" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="929" tag="operation_929" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="932" tag="operation_932" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="932" tag="operation_932" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="937" tag="operation_937" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="937" tag="operation_937" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="938" tag="operation_938" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="938" tag="operation_938" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="939" tag="operation_939" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="939" tag="operation_939" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="940" tag="operation_940" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="940" tag="operation_940" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="941" tag="operation_941" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="941" tag="operation_941" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="942" tag="operation_942" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="942" tag="operation_942" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="945" tag="operation_945" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="945" tag="operation_945" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="948" tag="operation_948" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="948" tag="operation_948" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="956" tag="operation_956" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="956" tag="operation_956" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="957" tag="operation_957" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="957" tag="operation_957" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels " />
                  </header>
@@ -36001,84 +36001,84 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="963" tag="operation_963" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="963" tag="operation_963" 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 srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="974" tag="operation_974" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="984" tag="operation_984" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="994" tag="operation_994" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1014" tag="operation_1014" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1034" tag="operation_1034" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1074" tag="operation_1074" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1104" tag="operation_1104" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1114" tag="operation_1114" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -36097,27 +36097,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1126" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
+              <ccfdeclarationcodeblock parent_id="1126" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1127" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
+              <ccfdeclarationcodeblock parent_id="1127" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1128" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
+              <ccfdeclarationcodeblock parent_id="1128" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1129" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
+              <ccfdeclarationcodeblock parent_id="1129" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1125" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="1125" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -36145,42 +36145,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1126" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
+                  <codeaccessormethod accessType="0" parent_id="1126" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1126" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1126" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
+                  <codeaccessormethod accessType="0" parent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1128" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
+                  <codeaccessormethod accessType="0" parent_id="1128" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1129" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
+                  <codeaccessormethod accessType="0" parent_id="1129" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1129" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1129" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -36192,12 +36192,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1125" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="1125" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1125" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1125" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -36230,101 +36230,101 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1125" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1125" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1125" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1125" tag="tblock_4" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1125" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1125" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1125" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1125" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1125" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1125" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1126" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1126" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1126" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
+       <ccfdeclarationcodeblock parent_id="1126" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1126" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
+       <codeaccessormethod accessType="0" parent_id="1126" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1126" text="return PIXEL_BLUE;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1126" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1126" tag="hblock_tag_5" canDelete="false" indentLevel="1" classfield_id="1126" text="PIXEL_BLUE = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1127" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1127" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1127" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
+       <ccfdeclarationcodeblock parent_id="1127" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
+       <codeaccessormethod accessType="0" parent_id="1127" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1127" text="return PIXEL_GREEN;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
+       <codeaccessormethod accessType="1" parent_id="1127" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1127" text="PIXEL_GREEN = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1128" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1128" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1128" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
+       <ccfdeclarationcodeblock parent_id="1128" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1128" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
+       <codeaccessormethod accessType="0" parent_id="1128" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1128" text="return PIXEL_RED;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
+       <codeaccessormethod accessType="1" parent_id="1128" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1128" text="PIXEL_RED = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1129" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1129" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1129" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="1129" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1129" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="1129" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1129" text="return PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1129" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="1129" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1129" text="PIXEL_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -36332,7 +36332,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1124" tqparent_class="1124" fileExt=".h" fileName="kisf32rgbcolorspacetester" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1124" parent_class="1124" fileExt=".h" fileName="kisf32rgbcolorspacetester" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISF32RGBCOLORSPACETESTER_H&amp;#010;#define KISF32RGBCOLORSPACETESTER_H" >
        <header>
@@ -36359,7 +36359,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1124" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1124" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisF32RgbColorSpaceTester&amp;#010;" />
          </header>
@@ -36538,7 +36538,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1133" tqparent_class="1133" fileExt=".h" fileName="kisf32rgbcolorspacesp" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1133" parent_class="1133" fileExt=".h" fileName="kisf32rgbcolorspacesp" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISF32RGBCOLORSPACESP_H&amp;#010;#define KISF32RGBCOLORSPACESP_H" >
        <header>
@@ -36565,7 +36565,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1133" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1133" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisF32RgbColorSpaceSP&amp;#010;" />
          </header>
@@ -36744,7 +36744,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1134" tqparent_class="1134" fileExt=".h" fileName="kisrgbu16colorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1134" parent_class="1134" fileExt=".h" fileName="kisrgbu16colorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISRGBU16COLORSPACE_H&amp;#010;#define KISRGBU16COLORSPACE_H" >
        <header>
@@ -36771,7 +36771,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1134" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1134" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisRgbU16ColorSpace&amp;#010; Copyright (c) 2002 Patrick Julien  &lt;freak@codepimps.org>&amp;#010; Copyright (c) 2005 Adrian Page &lt;adrian@pagenet.plus.com>&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." />
          </header>
@@ -36786,12 +36786,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
+              <ccfdeclarationcodeblock parent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1139" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+              <ccfdeclarationcodeblock parent_id="1139" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -36825,22 +36825,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
+                  <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
+                  <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -36860,122 +36860,122 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1140" tag="operation_1140" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1140" tag="operation_1140" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1141" tag="operation_1141" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1141" tag="operation_1141" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1142" tag="operation_1142" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1142" tag="operation_1142" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1148" tag="operation_1148" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1148" tag="operation_1148" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1154" tag="operation_1154" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1154" tag="operation_1154" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1158" tag="operation_1158" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1158" tag="operation_1158" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1163" tag="operation_1163" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1163" tag="operation_1163" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1166" tag="operation_1166" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1166" tag="operation_1166" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1170" tag="operation_1170" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1170" tag="operation_1170" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1174" tag="operation_1174" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1174" tag="operation_1174" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1179" tag="operation_1179" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1179" tag="operation_1179" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1185" tag="operation_1185" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1185" tag="operation_1185" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1188" tag="operation_1188" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1188" tag="operation_1188" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1193" tag="operation_1193" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1193" tag="operation_1193" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1195" tag="operation_1195" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1195" tag="operation_1195" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1197" tag="operation_1197" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1197" tag="operation_1197" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1198" tag="operation_1198" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1198" tag="operation_1198" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1201" tag="operation_1201" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1201" tag="operation_1201" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1204" tag="operation_1204" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1204" tag="operation_1204" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1212" tag="operation_1212" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1212" tag="operation_1212" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1213" tag="operation_1213" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1213" tag="operation_1213" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels " />
                  </header>
@@ -37032,84 +37032,84 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1219" tag="operation_1219" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1219" tag="operation_1219" 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 srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1230" tag="operation_1230" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1250" tag="operation_1250" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1260" tag="operation_1260" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1270" tag="operation_1270" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1300" tag="operation_1300" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1310" tag="operation_1310" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1320" tag="operation_1320" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1330" tag="operation_1330" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1340" tag="operation_1340" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1350" tag="operation_1350" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -37128,27 +37128,27 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1382" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
+              <ccfdeclarationcodeblock parent_id="1382" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1383" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
+              <ccfdeclarationcodeblock parent_id="1383" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1384" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
+              <ccfdeclarationcodeblock parent_id="1384" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1385" tag="tblock_5" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
+              <ccfdeclarationcodeblock parent_id="1385" tag="tblock_5" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1381" tag="tblock_6" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="1381" tag="tblock_6" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -37176,42 +37176,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
+                  <codeaccessormethod accessType="0" parent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1382" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1382" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
+                  <codeaccessormethod accessType="0" parent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1384" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
+                  <codeaccessormethod accessType="0" parent_id="1384" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1385" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
+                  <codeaccessormethod accessType="0" parent_id="1385" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1385" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1385" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -37223,12 +37223,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1381" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="1381" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1381" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1381" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -37261,141 +37261,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
+       <ccfdeclarationcodeblock parent_id="1138" tag="tblock_0" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_OPAQUE;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
+       <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1138" text="return U16_OPACITY_OPAQUE;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1138" text="U16_OPACITY_OPAQUE = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1139" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
+       <ccfdeclarationcodeblock parent_id="1139" tag="tblock_1" canDelete="false" indentLevel="1" text="static  const Q_UINT16 U16_OPACITY_TRANSPARENT;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
+       <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1139" text="return U16_OPACITY_TRANSPARENT;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
+       <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1139" text="U16_OPACITY_TRANSPARENT = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1381" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1381" tag="tblock_6" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1381" tag="tblock_6" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1381" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1381" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1381" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1381" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1381" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1381" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1382" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1382" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1382" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
+       <ccfdeclarationcodeblock parent_id="1382" tag="tblock_2" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_BLUE;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
+       <codeaccessormethod accessType="0" parent_id="1382" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1382" text="return PIXEL_BLUE;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1382" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
+       <codeaccessormethod accessType="1" parent_id="1382" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1382" text="PIXEL_BLUE = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1383" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1383" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
+       <ccfdeclarationcodeblock parent_id="1383" tag="tblock_3" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_GREEN;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
+       <codeaccessormethod accessType="0" parent_id="1383" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1383" text="return PIXEL_GREEN;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
+       <codeaccessormethod accessType="1" parent_id="1383" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1383" text="PIXEL_GREEN = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1384" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1384" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
+       <ccfdeclarationcodeblock parent_id="1384" tag="tblock_4" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_RED;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1384" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
+       <codeaccessormethod accessType="0" parent_id="1384" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1384" text="return PIXEL_RED;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
+       <codeaccessormethod accessType="1" parent_id="1384" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1384" text="PIXEL_RED = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1385" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1385" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1385" tag="tblock_5" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
+       <ccfdeclarationcodeblock parent_id="1385" tag="tblock_5" canDelete="false" indentLevel="1" text="static  const Q_UINT8 PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1385" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
+       <codeaccessormethod accessType="0" parent_id="1385" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1385" text="return PIXEL_ALPHA;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1385" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
+       <codeaccessormethod accessType="1" parent_id="1385" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1385" text="PIXEL_ALPHA = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -37403,7 +37403,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1380" tqparent_class="1380" fileExt=".h" fileName="kisrgbu16colorspacetester" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1380" parent_class="1380" fileExt=".h" fileName="kisrgbu16colorspacetester" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISRGBU16COLORSPACETESTER_H&amp;#010;#define KISRGBU16COLORSPACETESTER_H" >
        <header>
@@ -37430,7 +37430,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1380" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1380" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisRgbU16ColorSpaceTester&amp;#010;" />
          </header>
@@ -37609,7 +37609,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1386" tqparent_class="1386" fileExt=".h" fileName="kisrgbcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1386" parent_class="1386" fileExt=".h" fileName="kisrgbcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISRGBCOLORSPACE_H&amp;#010;#define KISRGBCOLORSPACE_H" >
        <header>
@@ -37636,7 +37636,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1386" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1386" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisRgbColorSpace&amp;#010;" />
          </header>
@@ -37693,142 +37693,142 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1390" tag="operation_1390" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1390" tag="operation_1390" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1391" tag="operation_1391" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1391" tag="operation_1391" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1392" tag="operation_1392" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1392" tag="operation_1392" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1398" tag="operation_1398" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1398" tag="operation_1398" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param red &amp;#010;@param green &amp;#010;@param blue &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1404" tag="operation_1404" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1404" tag="operation_1404" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1408" tag="operation_1408" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1408" tag="operation_1408" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1413" tag="operation_1413" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1413" tag="operation_1413" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1416" tag="operation_1416" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1416" tag="operation_1416" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1420" tag="operation_1420" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1420" tag="operation_1420" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1424" tag="operation_1424" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1424" tag="operation_1424" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1429" tag="operation_1429" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1429" tag="operation_1429" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1432" tag="operation_1432" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1432" tag="operation_1432" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1435" tag="operation_1435" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1435" tag="operation_1435" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param src2 " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1438" tag="operation_1438" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1438" tag="operation_1438" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1443" tag="operation_1443" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1443" tag="operation_1443" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param kernelValues &amp;#010;@param channelFlags &amp;#010;@param dst &amp;#010;@param factor &amp;#010;@param offset &amp;#010;@param nColors " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1452" tag="operation_1452" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1452" tag="operation_1452" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1453" tag="operation_1453" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1453" tag="operation_1453" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1454" tag="operation_1454" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1454" tag="operation_1454" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1455" tag="operation_1455" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1455" tag="operation_1455" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1456" tag="operation_1456" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1456" tag="operation_1456" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1459" tag="operation_1459" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1459" tag="operation_1459" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1462" tag="operation_1462" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1462" tag="operation_1462" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1470" tag="operation_1470" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1470" tag="operation_1470" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1471" tag="operation_1471" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1471" tag="operation_1471" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param transferValues " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1473" tag="operation_1473" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1473" tag="operation_1473" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param  &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1478" tag="operation_1478" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1478" tag="operation_1478" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="Darken all color channels with the given amount. If compensate is true,&amp;#010;the compensation factor will be used to limit the darkening.&amp;#010;&amp;#010;(See the bumpmap filter)" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1485" tag="operation_1485" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1485" tag="operation_1485" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src " />
                  </header>
@@ -37885,79 +37885,79 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1487" tag="operation_1487" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1487" tag="operation_1487" 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 srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowStride &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1498" tag="operation_1498" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1508" tag="operation_1508" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1528" tag="operation_1528" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1538" tag="operation_1538" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1578" tag="operation_1578" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1598" tag="operation_1598" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1608" tag="operation_1608" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1618" tag="operation_1618" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1628" tag="operation_1628" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -37976,7 +37976,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -38010,12 +38010,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -38048,21 +38048,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1638" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1638" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1638" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1638" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1638" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1638" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1638" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -38070,7 +38070,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1639" tqparent_class="1639" fileExt=".h" fileName="wetpix" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1639" parent_class="1639" fileExt=".h" fileName="wetpix" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef WETPIX_H&amp;#010;#define WETPIX_H" >
        <header>
@@ -38097,7 +38097,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1639" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1639" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class WetPix&amp;#010;" />
          </header>
@@ -38276,7 +38276,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1640" tqparent_class="1640" fileExt=".h" fileName="wetpixdbl" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1640" parent_class="1640" fileExt=".h" fileName="wetpixdbl" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef WETPIXDBL_H&amp;#010;#define WETPIXDBL_H" >
        <header>
@@ -38303,7 +38303,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1640" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1640" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class WetPixDbl&amp;#010;" />
          </header>
@@ -38482,7 +38482,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1641" tqparent_class="1641" fileExt=".h" fileName="wetpack" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1641" parent_class="1641" fileExt=".h" fileName="wetpack" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef WETPACK_H&amp;#010;#define WETPACK_H" >
        <header>
@@ -38509,7 +38509,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1641" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1641" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class WetPack&amp;#010;" />
          </header>
@@ -38688,7 +38688,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1642" tqparent_class="1642" fileExt=".h" fileName="_wetpix" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1642" parent_class="1642" fileExt=".h" fileName="_wetpix" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef _WETPIX_H&amp;#010;#define _WETPIX_H" >
        <header>
@@ -38715,7 +38715,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1642" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1642" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class _WetPix&amp;#010;White is made up of myth-red, myth-green, and myth-blue. Myth-red&amp;#010;looks red when viewed reflectively, but cyan when viewed&amp;#010;transmissively (thus, it vaguely resembles a dichroic&amp;#010;filter). Myth-red over black is red, and myth-red over white is&amp;#010;white.&amp;#010;&amp;#010;Total red channel concentration is myth-red concentration plus&amp;#010;cyan concentration." />
          </header>
@@ -38730,42 +38730,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 rd;" >
+              <ccfdeclarationcodeblock parent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 rd;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1644" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 rw;" >
+              <ccfdeclarationcodeblock parent_id="1644" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 rw;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1645" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 gd;" >
+              <ccfdeclarationcodeblock parent_id="1645" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 gd;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1646" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 gw;" >
+              <ccfdeclarationcodeblock parent_id="1646" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 gw;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1647" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT16 bd;" >
+              <ccfdeclarationcodeblock parent_id="1647" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT16 bd;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1648" tag="tblock_5" canDelete="false" indentLevel="1" text=" Q_UINT16 bw;" >
+              <ccfdeclarationcodeblock parent_id="1648" tag="tblock_5" canDelete="false" indentLevel="1" text=" Q_UINT16 bw;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1649" tag="tblock_6" canDelete="false" indentLevel="1" text=" Q_UINT16 w;" >
+              <ccfdeclarationcodeblock parent_id="1649" tag="tblock_6" canDelete="false" indentLevel="1" text=" Q_UINT16 w;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Water volume" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1650" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT16 h;" >
+              <ccfdeclarationcodeblock parent_id="1650" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT16 h;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
                </header>
@@ -38805,82 +38805,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
+                  <codeaccessormethod accessType="0" parent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1643" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1643" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1644" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
+                  <codeaccessormethod accessType="0" parent_id="1644" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1644" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1644" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1645" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
+                  <codeaccessormethod accessType="0" parent_id="1645" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1645" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1645" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1646" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
+                  <codeaccessormethod accessType="0" parent_id="1646" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1646" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1646" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
+                  <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
+                  <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
+                  <codeaccessormethod accessType="0" parent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1649" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1649" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
+                  <codeaccessormethod accessType="0" parent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@return the value of h" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@param value the value of h" />
                    </header>
@@ -39015,161 +39015,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1643" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1643" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total red channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 rd;" >
+       <ccfdeclarationcodeblock parent_id="1643" tag="tblock_0" canDelete="false" indentLevel="1" text=" Q_UINT16 rd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
+       <codeaccessormethod accessType="0" parent_id="1643" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1643" text="return rd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1643" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1643" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1643" text="rd = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1644" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1644" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-red concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1644" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 rw;" >
+       <ccfdeclarationcodeblock parent_id="1644" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT16 rw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1644" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
+       <codeaccessormethod accessType="0" parent_id="1644" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1644" text="return rw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1644" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1644" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1644" text="rw = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1645" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1645" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total green channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1645" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 gd;" >
+       <ccfdeclarationcodeblock parent_id="1645" tag="tblock_2" canDelete="false" indentLevel="1" text=" Q_UINT16 gd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1645" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
+       <codeaccessormethod accessType="0" parent_id="1645" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1645" text="return gd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1645" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1645" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1645" text="gd = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1646" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-green concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1646" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 gw;" >
+       <ccfdeclarationcodeblock parent_id="1646" tag="tblock_3" canDelete="false" indentLevel="1" text=" Q_UINT16 gw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1646" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
+       <codeaccessormethod accessType="0" parent_id="1646" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1646" text="return gw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1646" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1646" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1646" text="gw = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total blue channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1647" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT16 bd;" >
+       <ccfdeclarationcodeblock parent_id="1647" tag="tblock_4" canDelete="false" indentLevel="1" text=" Q_UINT16 bd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
+       <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1647" text="return bd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1647" text="bd = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-blue concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1648" tag="tblock_5" canDelete="false" indentLevel="1" text=" Q_UINT16 bw;" >
+       <ccfdeclarationcodeblock parent_id="1648" tag="tblock_5" canDelete="false" indentLevel="1" text=" Q_UINT16 bw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
+       <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1648" text="return bw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1648" text="bw = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1649" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1649" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Water volume" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1649" tag="tblock_6" canDelete="false" indentLevel="1" text=" Q_UINT16 w;" >
+       <ccfdeclarationcodeblock parent_id="1649" tag="tblock_6" canDelete="false" indentLevel="1" text=" Q_UINT16 w;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Water volume" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
+       <codeaccessormethod accessType="0" parent_id="1649" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1649" text="return w;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1649" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
+       <codeaccessormethod accessType="1" parent_id="1649" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1649" text="w = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1650" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1650" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1650" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT16 h;" >
+       <ccfdeclarationcodeblock parent_id="1650" tag="tblock_7" canDelete="false" indentLevel="1" text=" Q_UINT16 h;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
+       <codeaccessormethod accessType="0" parent_id="1650" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1650" text="return h;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@return the value of h" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
+       <codeaccessormethod accessType="1" parent_id="1650" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1650" text="h = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of h&amp;#010;Height of paper surface XXX: This might just as well be a single&amp;#010;channel in our colour model that has two of&amp;#010;these wetpix structs for every paint device pixel&amp;#010;@param value the value of h" />
         </header>
@@ -39177,7 +39177,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1651" tqparent_class="1651" fileExt=".h" fileName="_wetpack" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1651" parent_class="1651" fileExt=".h" fileName="_wetpack" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef _WETPACK_H&amp;#010;#define _WETPACK_H" >
        <header>
@@ -39204,7 +39204,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1651" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1651" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class _WetPack&amp;#010;" />
          </header>
@@ -39219,12 +39219,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text=" WetPix paint;" >
+              <ccfdeclarationcodeblock parent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text=" WetPix paint;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Paint layer" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1653" tag="tblock_1" canDelete="false" indentLevel="1" text=" WetPix adsorb;" >
+              <ccfdeclarationcodeblock parent_id="1653" tag="tblock_1" canDelete="false" indentLevel="1" text=" WetPix adsorb;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Adsorbtion layer" />
                </header>
@@ -39264,22 +39264,22 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
+                  <codeaccessormethod accessType="0" parent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of paint&amp;#010;Paint layer&amp;#010;@return the value of paint" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1652" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1652" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of paint&amp;#010;Paint layer&amp;#010;@param value the value of paint" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
+                  <codeaccessormethod accessType="0" parent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@return the value of adsorb" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@param value the value of adsorb" />
                    </header>
@@ -39414,41 +39414,41 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1652" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1652" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Paint layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text=" WetPix paint;" >
+       <ccfdeclarationcodeblock parent_id="1652" tag="tblock_0" canDelete="false" indentLevel="1" text=" WetPix paint;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Paint layer" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
+       <codeaccessormethod accessType="0" parent_id="1652" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1652" text="return paint;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of paint&amp;#010;Paint layer&amp;#010;@return the value of paint" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1652" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
+       <codeaccessormethod accessType="1" parent_id="1652" tag="hblock_tag_2" canDelete="false" indentLevel="1" classfield_id="1652" text="paint = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of paint&amp;#010;Paint layer&amp;#010;@param value the value of paint" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1653" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1653" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Adsorbtion layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1653" tag="tblock_1" canDelete="false" indentLevel="1" text=" WetPix adsorb;" >
+       <ccfdeclarationcodeblock parent_id="1653" tag="tblock_1" canDelete="false" indentLevel="1" text=" WetPix adsorb;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Adsorbtion layer" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
+       <codeaccessormethod accessType="0" parent_id="1653" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1653" text="return adsorb;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@return the value of adsorb" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
+       <codeaccessormethod accessType="1" parent_id="1653" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1653" text="adsorb = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of adsorb&amp;#010;Adsorbtion layer&amp;#010;@param value the value of adsorb" />
         </header>
@@ -39456,7 +39456,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1654" tqparent_class="1654" fileExt=".h" fileName="_wetpixdbl" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1654" parent_class="1654" fileExt=".h" fileName="_wetpixdbl" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef _WETPIXDBL_H&amp;#010;#define _WETPIXDBL_H" >
        <header>
@@ -39483,7 +39483,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1654" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1654" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class _WetPixDbl&amp;#010;" />
          </header>
@@ -39498,42 +39498,42 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text=" double rd;" >
+              <ccfdeclarationcodeblock parent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text=" double rd;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1656" tag="tblock_1" canDelete="false" indentLevel="1" text=" double rw;" >
+              <ccfdeclarationcodeblock parent_id="1656" tag="tblock_1" canDelete="false" indentLevel="1" text=" double rw;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1657" tag="tblock_2" canDelete="false" indentLevel="1" text=" double gd;" >
+              <ccfdeclarationcodeblock parent_id="1657" tag="tblock_2" canDelete="false" indentLevel="1" text=" double gd;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1658" tag="tblock_3" canDelete="false" indentLevel="1" text=" double gw;" >
+              <ccfdeclarationcodeblock parent_id="1658" tag="tblock_3" canDelete="false" indentLevel="1" text=" double gw;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1659" tag="tblock_4" canDelete="false" indentLevel="1" text=" double bd;" >
+              <ccfdeclarationcodeblock parent_id="1659" tag="tblock_4" canDelete="false" indentLevel="1" text=" double bd;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1660" tag="tblock_5" canDelete="false" indentLevel="1" text=" double bw;" >
+              <ccfdeclarationcodeblock parent_id="1660" tag="tblock_5" canDelete="false" indentLevel="1" text=" double bw;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1661" tag="tblock_6" canDelete="false" indentLevel="1" text=" double w;" >
+              <ccfdeclarationcodeblock parent_id="1661" tag="tblock_6" canDelete="false" indentLevel="1" text=" double w;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Water volume" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1662" tag="tblock_7" canDelete="false" indentLevel="1" text=" double h;" >
+              <ccfdeclarationcodeblock parent_id="1662" tag="tblock_7" canDelete="false" indentLevel="1" text=" double h;" >
                <header>
                 <cppcodedocumentation tag="" indentLevel="1" text="Height of paper surface" />
                </header>
@@ -39573,82 +39573,82 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
+                  <codeaccessormethod accessType="0" parent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1655" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1655" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1656" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
+                  <codeaccessormethod accessType="0" parent_id="1656" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1656" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1656" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1657" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
+                  <codeaccessormethod accessType="0" parent_id="1657" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1657" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1657" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1658" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
+                  <codeaccessormethod accessType="0" parent_id="1658" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1658" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1658" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1659" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
+                  <codeaccessormethod accessType="0" parent_id="1659" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1659" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1659" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1660" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
+                  <codeaccessormethod accessType="0" parent_id="1660" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
+                  <codeaccessormethod accessType="0" parent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
+                  <codeaccessormethod accessType="0" parent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Get the value of h&amp;#010;Height of paper surface&amp;#010;@return the value of h" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" text="Set the value of h&amp;#010;Height of paper surface&amp;#010;@param value the value of h" />
                    </header>
@@ -39783,161 +39783,161 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total red channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text=" double rd;" >
+       <ccfdeclarationcodeblock parent_id="1655" tag="tblock_0" canDelete="false" indentLevel="1" text=" double rd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Total red channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
+       <codeaccessormethod accessType="0" parent_id="1655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1655" text="return rd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rd&amp;#010;Total red channel concentration&amp;#010;@return the value of rd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1655" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1655" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1655" text="rd = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rd&amp;#010;Total red channel concentration&amp;#010;@param value the value of rd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1656" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1656" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-red concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1656" tag="tblock_1" canDelete="false" indentLevel="1" text=" double rw;" >
+       <ccfdeclarationcodeblock parent_id="1656" tag="tblock_1" canDelete="false" indentLevel="1" text=" double rw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Myth-red concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1656" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
+       <codeaccessormethod accessType="0" parent_id="1656" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1656" text="return rw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of rw&amp;#010;Myth-red concentration&amp;#010;@return the value of rw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1656" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1656" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1656" text="rw = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of rw&amp;#010;Myth-red concentration&amp;#010;@param value the value of rw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1657" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1657" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total green channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1657" tag="tblock_2" canDelete="false" indentLevel="1" text=" double gd;" >
+       <ccfdeclarationcodeblock parent_id="1657" tag="tblock_2" canDelete="false" indentLevel="1" text=" double gd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Total green channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1657" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
+       <codeaccessormethod accessType="0" parent_id="1657" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1657" text="return gd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gd&amp;#010;Total green channel concentration&amp;#010;@return the value of gd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1657" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1657" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1657" text="gd = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gd&amp;#010;Total green channel concentration&amp;#010;@param value the value of gd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1658" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1658" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-green concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1658" tag="tblock_3" canDelete="false" indentLevel="1" text=" double gw;" >
+       <ccfdeclarationcodeblock parent_id="1658" tag="tblock_3" canDelete="false" indentLevel="1" text=" double gw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Myth-green concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1658" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
+       <codeaccessormethod accessType="0" parent_id="1658" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1658" text="return gw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of gw&amp;#010;Myth-green concentration&amp;#010;@return the value of gw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1658" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1658" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1658" text="gw = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of gw&amp;#010;Myth-green concentration&amp;#010;@param value the value of gw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1659" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1659" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Total blue channel concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1659" tag="tblock_4" canDelete="false" indentLevel="1" text=" double bd;" >
+       <ccfdeclarationcodeblock parent_id="1659" tag="tblock_4" canDelete="false" indentLevel="1" text=" double bd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Total blue channel concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1659" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
+       <codeaccessormethod accessType="0" parent_id="1659" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1659" text="return bd;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bd&amp;#010;Total blue channel concentration&amp;#010;@return the value of bd" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1659" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
+       <codeaccessormethod accessType="1" parent_id="1659" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1659" text="bd = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bd&amp;#010;Total blue channel concentration&amp;#010;@param value the value of bd" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1660" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Myth-blue concentration" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1660" tag="tblock_5" canDelete="false" indentLevel="1" text=" double bw;" >
+       <ccfdeclarationcodeblock parent_id="1660" tag="tblock_5" canDelete="false" indentLevel="1" text=" double bw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Myth-blue concentration" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1660" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
+       <codeaccessormethod accessType="0" parent_id="1660" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1660" text="return bw;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of bw&amp;#010;Myth-blue concentration&amp;#010;@return the value of bw" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
+       <codeaccessormethod accessType="1" parent_id="1660" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1660" text="bw = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of bw&amp;#010;Myth-blue concentration&amp;#010;@param value the value of bw" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1661" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Water volume" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1661" tag="tblock_6" canDelete="false" indentLevel="1" text=" double w;" >
+       <ccfdeclarationcodeblock parent_id="1661" tag="tblock_6" canDelete="false" indentLevel="1" text=" double w;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Water volume" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
+       <codeaccessormethod accessType="0" parent_id="1661" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1661" text="return w;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of w&amp;#010;Water volume&amp;#010;@return the value of w" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
+       <codeaccessormethod accessType="1" parent_id="1661" tag="hblock_tag_20" canDelete="false" indentLevel="1" classfield_id="1661" text="w = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of w&amp;#010;Water volume&amp;#010;@param value the value of w" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1662" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" text="Height of paper surface" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1662" tag="tblock_7" canDelete="false" indentLevel="1" text=" double h;" >
+       <ccfdeclarationcodeblock parent_id="1662" tag="tblock_7" canDelete="false" indentLevel="1" text=" double h;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Height of paper surface" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
+       <codeaccessormethod accessType="0" parent_id="1662" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1662" text="return h;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Get the value of h&amp;#010;Height of paper surface&amp;#010;@return the value of h" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
+       <codeaccessormethod accessType="1" parent_id="1662" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1662" text="h = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" text="Set the value of h&amp;#010;Height of paper surface&amp;#010;@param value the value of h" />
         </header>
@@ -39945,7 +39945,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1663" tqparent_class="1663" fileExt=".h" fileName="kiswetcolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1663" parent_class="1663" fileExt=".h" fileName="kiswetcolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISWETCOLORSPACE_H&amp;#010;#define KISWETCOLORSPACE_H" >
        <header>
@@ -39972,7 +39972,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1663" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1663" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisWetColorSpace&amp;#010;" />
          </header>
@@ -40029,127 +40029,127 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1667" tag="operation_1667" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1667" tag="operation_1667" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1668" tag="operation_1668" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1668" tag="operation_1668" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1669" tag="operation_1669" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1669" tag="operation_1669" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="// Semi-clever: we have only fifteen wet paint colors that are mapped to the// qcolors that are put in the painter by the special wet paint palette. Other// QColors are mapped to plain water..." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1673" tag="operation_1673" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1673" tag="operation_1673" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1678" tag="operation_1678" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1678" tag="operation_1678" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1681" tag="operation_1681" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1681" tag="operation_1681" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1685" tag="operation_1685" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1685" tag="operation_1685" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1690" tag="operation_1690" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1690" tag="operation_1690" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1693" tag="operation_1693" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1693" tag="operation_1693" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1696" tag="operation_1696" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1696" tag="operation_1696" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1701" tag="operation_1701" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1701" tag="operation_1701" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1702" tag="operation_1702" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1702" tag="operation_1702" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1703" tag="operation_1703" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1703" tag="operation_1703" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1704" tag="operation_1704" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1704" tag="operation_1704" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1705" tag="operation_1705" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1705" tag="operation_1705" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1706" tag="operation_1706" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1706" tag="operation_1706" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1707" tag="operation_1707" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1707" tag="operation_1707" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1710" tag="operation_1710" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1710" tag="operation_1710" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1713" tag="operation_1713" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1713" tag="operation_1713" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1721" tag="operation_1721" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1721" tag="operation_1721" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param adjust " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1724" tag="operation_1724" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1724" tag="operation_1724" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  &amp;#010;@param  &amp;#010;@param  &amp;#010;@param  " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1730" tag="operation_1730" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1730" tag="operation_1730" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1731" tag="operation_1731" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1731" tag="operation_1731" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param b " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1733" tag="operation_1733" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1733" tag="operation_1733" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -40206,9 +40206,9 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1735" tag="operation_1735" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1735" tag="operation_1735" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -40227,37 +40227,37 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1757" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32* wet_render_tab;" >
+              <ccfdeclarationcodeblock parent_id="1757" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32* wet_render_tab;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1758" tag="tblock_2" canDelete="false" indentLevel="1" text=" QStringList m_paintNames;" >
+              <ccfdeclarationcodeblock parent_id="1758" tag="tblock_2" canDelete="false" indentLevel="1" text=" QStringList m_paintNames;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1760" tag="tblock_3" canDelete="false" indentLevel="1" text=" QMap m_conversionMap;" >
+              <ccfdeclarationcodeblock parent_id="1760" tag="tblock_3" canDelete="false" indentLevel="1" text=" QMap m_conversionMap;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1761" tag="tblock_4" canDelete="false" indentLevel="1" text=" bool m_paintwetness;" >
+              <ccfdeclarationcodeblock parent_id="1761" tag="tblock_4" canDelete="false" indentLevel="1" text=" bool m_paintwetness;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1762" tag="tblock_5" canDelete="false" indentLevel="1" text=" int phase;" >
+              <ccfdeclarationcodeblock parent_id="1762" tag="tblock_5" canDelete="false" indentLevel="1" text=" int phase;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
               </ccfdeclarationcodeblock>
-              <ccfdeclarationcodeblock tqparent_id="1763" tag="tblock_6" canDelete="false" indentLevel="1" text=" int phasebig;" >
+              <ccfdeclarationcodeblock parent_id="1763" tag="tblock_6" canDelete="false" indentLevel="1" text=" int phasebig;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -40291,72 +40291,72 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
+                  <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1758" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
+                  <codeaccessormethod accessType="0" parent_id="1758" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1758" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1758" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
+                  <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
+                  <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
+                  <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
+                  <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -40370,17 +40370,17 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1746" tag="operation_1746" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1746" tag="operation_1746" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="// This was static, but since we have only one instance of the color strategy,// it can be just as well a private member variable." />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1747" tag="operation_1747" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1747" tag="operation_1747" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="// Convert a single pixel from its wet representation to rgb" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1751" tag="operation_1751" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1751" tag="operation_1751" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rgb &amp;#010;@param pack " />
                  </header>
@@ -40405,141 +40405,141 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1755" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1755" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1757" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32* wet_render_tab;" >
+       <ccfdeclarationcodeblock parent_id="1757" tag="tblock_1" canDelete="false" indentLevel="1" text=" Q_UINT32* wet_render_tab;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
+       <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_8" canDelete="false" indentLevel="1" classfield_id="1757" text="return wet_render_tab;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
+       <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1757" text="wet_render_tab = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1758" tag="tblock_2" canDelete="false" indentLevel="1" text=" QStringList m_paintNames;" >
+       <ccfdeclarationcodeblock parent_id="1758" tag="tblock_2" canDelete="false" indentLevel="1" text=" QStringList m_paintNames;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1758" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
+       <codeaccessormethod accessType="0" parent_id="1758" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1758" text="return m_paintNames;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1758" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
+       <codeaccessormethod accessType="1" parent_id="1758" tag="hblock_tag_11" canDelete="false" indentLevel="1" classfield_id="1758" text="m_paintNames = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1760" tag="tblock_3" canDelete="false" indentLevel="1" text=" QMap m_conversionMap;" >
+       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_3" canDelete="false" indentLevel="1" text=" QMap m_conversionMap;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
+       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_conversionMap;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
+       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1760" text="m_conversionMap = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1761" tag="tblock_4" canDelete="false" indentLevel="1" text=" bool m_paintwetness;" >
+       <ccfdeclarationcodeblock parent_id="1761" tag="tblock_4" canDelete="false" indentLevel="1" text=" bool m_paintwetness;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
+       <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_14" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_paintwetness;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
+       <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1761" text="m_paintwetness = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1762" tag="tblock_5" canDelete="false" indentLevel="1" text=" int phase;" >
+       <ccfdeclarationcodeblock parent_id="1762" tag="tblock_5" canDelete="false" indentLevel="1" text=" int phase;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
+       <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1762" text="return phase;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
+       <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_17" canDelete="false" indentLevel="1" classfield_id="1762" text="phase = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1763" tag="tblock_6" canDelete="false" indentLevel="1" text=" int phasebig;" >
+       <ccfdeclarationcodeblock parent_id="1763" tag="tblock_6" canDelete="false" indentLevel="1" text=" int phasebig;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
+       <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1763" text="return phasebig;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
+       <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1763" text="phasebig = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -40547,7 +40547,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1759" tqparent_class="1759" fileExt=".h" fileName="qmap" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1759" parent_class="1759" fileExt=".h" fileName="qmap" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef QMAP_H&amp;#010;#define QMAP_H" >
        <header>
@@ -40574,7 +40574,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1759" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1759" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class QMap&amp;#010;" />
          </header>
@@ -40753,7 +40753,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="cppheader1771" tqparent_class="1771" fileExt=".h" fileName="cell" >
+    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="cppheader1771" parent_class="1771" fileExt=".h" fileName="cell" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef CELL_H&amp;#010;#define CELL_H" >
        <header>
@@ -40780,7 +40780,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1771" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1771" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class CELL&amp;#010;" />
          </header>
@@ -40959,7 +40959,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="cppheader1772" tqparent_class="1772" fileExt=".h" fileName="cell" >
+    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="cppheader1772" parent_class="1772" fileExt=".h" fileName="cell" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef CELL_H&amp;#010;#define CELL_H" >
        <header>
@@ -40986,7 +40986,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1772" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1772" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class cell&amp;#010;" />
          </header>
@@ -41165,7 +41165,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="cppheader1765" tqparent_class="1765" fileExt=".h" fileName="enumdirection" >
+    <classifiercodedocument writeOutCode="true" package="wetandsticky" id="cppheader1765" parent_class="1765" fileExt=".h" fileName="enumdirection" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef ENUMDIRECTION_H&amp;#010;#define ENUMDIRECTION_H" >
        <header>
@@ -41192,7 +41192,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1765" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1765" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class enumDirection&amp;#010;A color is specified as a vector in HLS space.  Hue is a value&amp;#010;in the range 0..360 degrees with 0 degrees being red.  Saturation&amp;#010;and Lightness are both in the range [0,1].  A lightness of 0 means&amp;#010;black, with 1 being white.  A totally saturated color has saturation&amp;#010;of 1." />
          </header>
@@ -41371,7 +41371,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader1774" tqparent_class="1774" fileExt=".h" fileName="kiswetstickycolorspace" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader1774" parent_class="1774" fileExt=".h" fileName="kiswetstickycolorspace" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISWETSTICKYCOLORSPACE_H&amp;#010;#define KISWETSTICKYCOLORSPACE_H" >
        <header>
@@ -41398,7 +41398,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
           <cppcodedocumentation tag="" writeOutText="false" />
          </header>
         </codeblockwithcomments>
-        <cppheaderclassdeclarationblock tqparent_id="1774" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="1774" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Class KisWetStickyColorSpace&amp;#010;" />
          </header>
@@ -41455,117 +41455,117 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1778" tag="operation_1778" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1778" tag="operation_1778" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1779" tag="operation_1779" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1779" tag="operation_1779" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1780" tag="operation_1780" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1780" tag="operation_1780" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1784" tag="operation_1784" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1784" tag="operation_1784" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param dst &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1789" tag="operation_1789" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1789" tag="operation_1789" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param alpha " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1792" tag="operation_1792" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1792" tag="operation_1792" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1796" tag="operation_1796" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1796" tag="operation_1796" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param c &amp;#010;@param opacity &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1801" tag="operation_1801" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1801" tag="operation_1801" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1804" tag="operation_1804" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1804" tag="operation_1804" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param profile " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1807" tag="operation_1807" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1807" tag="operation_1807" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1808" tag="operation_1808" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1808" tag="operation_1808" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1809" tag="operation_1809" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1809" tag="operation_1809" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1810" tag="operation_1810" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1810" tag="operation_1810" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1811" tag="operation_1811" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1811" tag="operation_1811" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1812" tag="operation_1812" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1812" tag="operation_1812" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1813" tag="operation_1813" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1813" tag="operation_1813" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixel &amp;#010;@param channelIndex " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param width &amp;#010;@param height &amp;#010;@param srcProfile &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@param exposure " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1827" tag="operation_1827" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1827" tag="operation_1827" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src1 &amp;#010;@param adjust " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1830" tag="operation_1830" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1830" tag="operation_1830" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param dst &amp;#010;@param brightness &amp;#010;@param contrast &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1836" tag="operation_1836" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1836" tag="operation_1836" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colors &amp;#010;@param weights &amp;#010;@param nColors &amp;#010;@param dst " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1841" tag="operation_1841" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1841" tag="operation_1841" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixels &amp;#010;@param alpha &amp;#010;@param nPixels " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1845" tag="operation_1845" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1845" tag="operation_1845" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" />
                  </header>
@@ -41622,12 +41622,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1846" tag="operation_1846" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1846" tag="operation_1846" canDelete="false" indentLevel="1" >
                  <header>
-                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param tqmaskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
+                  <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dst &amp;#010;@param dstRowSize &amp;#010;@param src &amp;#010;@param srcRowStride &amp;#010;@param srcAlphaMask &amp;#010;@param maskRowStride &amp;#010;@param opacity &amp;#010;@param rows &amp;#010;@param cols &amp;#010;@param op " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1857" tag="operation_1857" canDelete="false" indentLevel="1" >
+                <codeoperation parent_id="1857" tag="operation_1857" canDelete="false" indentLevel="1" >
                  <header>
                   <cppcodedocumentation tag="" indentLevel="1" text="&amp;#010;@param src &amp;#010;@param srcProfile &amp;#010;@param dst &amp;#010;@param dstColorStrategy &amp;#010;@param dstProfile &amp;#010;@param numPixels &amp;#010;@param renderingIntent " />
                  </header>
@@ -41648,7 +41648,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
               <cppcodedocumentation tag="" indentLevel="1" text="Fields" />
              </header>
              <textblocks>
-              <ccfdeclarationcodeblock tqparent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+              <ccfdeclarationcodeblock parent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
                <header>
                 <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                </header>
@@ -41682,12 +41682,12 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                   <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
                  </header>
                  <textblocks>
-                  <codeaccessormethod accessType="0" tqparent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
+                  <codeaccessormethod accessType="0" parent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
                   </codeaccessormethod>
-                  <codeaccessormethod accessType="1" tqparent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
+                  <codeaccessormethod accessType="1" parent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
                    <header>
                     <cppcodedocumentation tag="" indentLevel="1" />
                    </header>
@@ -41701,19 +41701,19 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
                 <cppcodedocumentation tag="" indentLevel="1" text="Operations" />
                </header>
                <textblocks>
-                <codeoperation tqparent_id="1865" tag="operation_1865" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1875" tag="operation_1875" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
-                <codeoperation tqparent_id="1885" tag="operation_1885" canDelete="false" indentLevel="1" >
+                <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 tqmaskRowStride &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 tqmask &amp;#010;@param maskRowStride &amp;#010;@param rows &amp;#010;@param columns &amp;#010;@param opacity " />
                  </header>
                 </codeoperation>
                </textblocks>
@@ -41736,21 +41736,21 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1895" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1895" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <cppcodedocumentation tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1895" tag="tblock_0" canDelete="false" indentLevel="1" text=" vKisChannelInfoSP m_channels;" >
         <header>
          <cppcodedocumentation tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1895" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1895" text="return m_channels;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1895" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1895" text="m_channels = value;" >
         <header>
          <cppcodedocumentation tag="" indentLevel="1" />
         </header>
@@ -41758,7 +41758,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="cppheader12050" tqparent_class="12050" fileExt=".h" fileName="kiscolorspacedescriptor" >
+    <classifiercodedocument writeOutCode="true" package="" id="cppheader12050" parent_class="12050" fileExt=".h" fileName="kiscolorspacedescriptor" >
      <textblocks>
       <codeblockwithcomments tag="hashDefBlock" text="#ifndef KISCOLORSPACEDESCRIPTOR_H&amp;#010;#define KISCOLORSPACEDESCRIPTOR_H" >
        <header>
@@ -41780,7 +41780,7 @@ of 1." isSpecification="false" isLeaf="false" visibility="public" xmi.id="1765"
         <cppcodedocumentation tag="" writeOutText="false" text="Namespace" />
        </header>
        <textblocks>
-        <cppheaderclassdeclarationblock tqparent_id="12050" tag="classDeclarationBlock" canDelete="false" >
+        <cppheaderclassdeclarationblock parent_id="12050" tag="classDeclarationBlock" canDelete="false" >
          <header>
           <cppcodedocumentation tag="" text="Interface KisColorSpaceDescriptor&amp;#010;" />
          </header>
diff --git a/chalk/doc/colorstrategyAPI b/chalk/doc/colorstrategyAPI
index 07c95ae9..faa5724e 100644
--- a/chalk/doc/colorstrategyAPI
+++ b/chalk/doc/colorstrategyAPI
@@ -41,17 +41,17 @@ void KisPaintDevice::applySelectionMask(KisSelectionSP tqmask)
 	for (Q_INT32 y = r.top(); y <= r.bottom(); ++y) {
 
 		KisHLineIterator pixelIt = createHLineIterator(r.x(), y, r.width(), true);
-		KisHLineIterator tqmaskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false);
+		KisHLineIterator maskIt = tqmask -> createHLineIterator(r.x(), y, r.width(), false);
 
 		while (!pixelIt.isDone()) {
 
 			KisPixel pixel = toPixel(pixelIt.rawData());
-			KisPixel tqmaskValue = tqmask -> toPixel(tqmaskIt.rawData());
+			KisPixel maskValue = tqmask -> toPixel(maskIt.rawData());
 
-			pixel.alpha() = (pixel.alpha() * tqmaskValue.alpha()) / MAX_SELECTED;
+			pixel.alpha() = (pixel.alpha() * maskValue.alpha()) / MAX_SELECTED;
 
 			++pixelIt;
-			++tqmaskIt;
+			++maskIt;
 		}
 	}
 }
diff --git a/chalk/doc/controller.xmi b/chalk/doc/controller.xmi
index 3281c344..baf5589f 100644
--- a/chalk/doc/controller.xmi
+++ b/chalk/doc/controller.xmi
@@ -1341,7 +1341,7 @@ the value of a byte signifies whether a corresponding pixel is selected, or not.
      <UML:Classifier.feature>
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1671" isRoot="false" initialValue="" type="389" isAbstract="false" name="m_parentLayer" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1672" isRoot="false" initialValue="" type="434" isAbstract="false" name="m_alpha" />
-      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1673" isRoot="false" initialValue="" type="591" isAbstract="false" name="m_tqmaskColor" />
+      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1673" isRoot="false" initialValue="" type="591" isAbstract="false" name="m_maskColor" />
       <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1652" isRoot="false" isAbstract="false" name="KisSelection" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter isSpecification="false" isLeaf="false" visibility="private" xmi.id="1653" isRoot="false" value="" type="389" isAbstract="false" name="layer" />
@@ -1356,7 +1356,7 @@ the value of a byte signifies whether a corresponding pixel is selected, or not.
        </UML:BehavioralFeature.parameter>
       </UML:Operation>
       <UML:Operation isSpecification="false" isLeaf="false" visibility="public" xmi.id="1659" isRoot="false" isAbstract="false" name="~ KisSelection" />
-      <UML:Operation comment="// 	// Returns selectedness, or 0 if invalid coordinates// 	QUANTUM selected(Q_INT32 x, Q_INT32 y);// // 	void setSelected(Q_INT32 x, Q_INT32 y, QUANTUM s);" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1660" isRoot="false" isAbstract="false" name="tqmaskImage" >
+      <UML:Operation comment="// 	// Returns selectedness, or 0 if invalid coordinates// 	QUANTUM selected(Q_INT32 x, Q_INT32 y);// // 	void setSelected(Q_INT32 x, Q_INT32 y, QUANTUM s);" isSpecification="false" isLeaf="false" visibility="public" xmi.id="1660" isRoot="false" isAbstract="false" name="maskImage" >
        <UML:BehavioralFeature.parameter>
         <UML:Parameter kind="return" xmi.id="5400" type="879" />
        </UML:BehavioralFeature.parameter>
@@ -4426,7 +4426,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
     </codedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="2" tqparent_class="2" fileExt=".java" fileName="int" >
+    <classifiercodedocument writeOutCode="true" package="" id="2" parent_class="2" fileExt=".java" fileName="int" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4438,7 +4438,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="2" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="2" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Int&amp;#010;" />
        </header>
@@ -4501,7 +4501,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="4" tqparent_class="4" fileExt=".java" fileName="char" >
+    <classifiercodedocument writeOutCode="true" package="" id="4" parent_class="4" fileExt=".java" fileName="char" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4513,7 +4513,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="4" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="4" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Char&amp;#010;" />
        </header>
@@ -4576,7 +4576,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="5" tqparent_class="5" fileExt=".java" fileName="boolean" >
+    <classifiercodedocument writeOutCode="true" package="" id="5" parent_class="5" fileExt=".java" fileName="boolean" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4588,7 +4588,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="5" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="5" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Boolean&amp;#010;" />
        </header>
@@ -4651,7 +4651,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="6" tqparent_class="6" fileExt=".java" fileName="float" >
+    <classifiercodedocument writeOutCode="true" package="" id="6" parent_class="6" fileExt=".java" fileName="float" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4663,7 +4663,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="6" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="6" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Float&amp;#010;" />
        </header>
@@ -4726,7 +4726,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="7" tqparent_class="7" fileExt=".java" fileName="double" >
+    <classifiercodedocument writeOutCode="true" package="" id="7" parent_class="7" fileExt=".java" fileName="double" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4738,7 +4738,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="7" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="7" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Double&amp;#010;" />
        </header>
@@ -4801,7 +4801,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="8" tqparent_class="8" fileExt=".java" fileName="byte" >
+    <classifiercodedocument writeOutCode="true" package="" id="8" parent_class="8" fileExt=".java" fileName="byte" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4813,7 +4813,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="8" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="8" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Byte&amp;#010;" />
        </header>
@@ -4876,7 +4876,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="9" tqparent_class="9" fileExt=".java" fileName="short" >
+    <classifiercodedocument writeOutCode="true" package="" id="9" parent_class="9" fileExt=".java" fileName="short" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4888,7 +4888,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="9" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="9" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Short&amp;#010;" />
        </header>
@@ -4951,7 +4951,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="10" tqparent_class="10" fileExt=".java" fileName="string" >
+    <classifiercodedocument writeOutCode="true" package="" id="10" parent_class="10" fileExt=".java" fileName="string" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -4963,7 +4963,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="10" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="10" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class String&amp;#010;" />
        </header>
@@ -5026,7 +5026,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="11" tqparent_class="11" fileExt=".java" fileName="KisCanvasControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="11" parent_class="11" fileExt=".java" fileName="KisCanvasControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5038,7 +5038,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="11" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="11" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisCanvasControllerInterface&amp;#010;" />
        </header>
@@ -5090,142 +5090,142 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="458" tag="operation_458" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="458" tag="operation_458" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="459" tag="operation_459" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="459" tag="operation_459" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="460" tag="operation_460" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="460" tag="operation_460" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QWidget*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="462" tag="operation_462" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="462" tag="operation_462" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="464" tag="operation_464" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="464" tag="operation_464" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="465" tag="operation_465" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="465" tag="operation_465" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="468" tag="operation_468" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="468" tag="operation_468" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="469" tag="operation_469" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="469" tag="operation_469" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="474" tag="operation_474" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="474" tag="operation_474" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="478" tag="operation_478" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="478" tag="operation_478" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="479" tag="operation_479" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="479" tag="operation_479" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="482" tag="operation_482" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="482" tag="operation_482" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="483" tag="operation_483" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="483" tag="operation_483" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="486" tag="operation_486" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="486" tag="operation_486" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="491" tag="operation_491" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="491" tag="operation_491" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="493" tag="operation_493" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="493" tag="operation_493" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="496" tag="operation_496" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="496" tag="operation_496" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt &amp;#010;@return QPoint  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="500" tag="operation_500" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="500" tag="operation_500" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt &amp;#010;@return KisPoint  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="503" tag="operation_503" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="503" tag="operation_503" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@return QRect  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="505" tag="operation_505" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="505" tag="operation_505" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@return KisRect  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="507" tag="operation_507" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="507" tag="operation_507" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="511" tag="operation_511" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="511" tag="operation_511" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt &amp;#010;@return QPoint  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="513" tag="operation_513" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="513" tag="operation_513" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt &amp;#010;@return KisPoint  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="515" tag="operation_515" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="515" tag="operation_515" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@return QRect  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="517" tag="operation_517" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="517" tag="operation_517" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@return KisRect  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="519" tag="operation_519" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="519" tag="operation_519" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="522" tag="operation_522" canDelete="false" writeOutText="false" indentLevel="1" >
+            <codeoperation parent_id="522" tag="operation_522" canDelete="false" writeOutText="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="525" tag="operation_525" canDelete="false" writeOutText="false" indentLevel="1" >
+            <codeoperation parent_id="525" tag="operation_525" canDelete="false" writeOutText="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return KisCanvasControllerInterface&amp;  " />
              </header>
@@ -5242,7 +5242,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="13" tqparent_class="13" fileExt=".java" fileName="KisMetaControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="13" parent_class="13" fileExt=".java" fileName="KisMetaControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5254,7 +5254,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="13" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="13" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisMetaControllerInterface&amp;#010;Combines access to the various controllers that allow plugins to function within Chalk. Every controller offers a select subset of functionality centered around a particular activity. &amp;#010;&amp;#010;All this functionality is centered around a view with a certain document and an active image with an active layer. &amp;#010;&amp;#010;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?" />
        </header>
@@ -5306,47 +5306,47 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="20" tag="operation_20" canDelete="false" indentLevel="1" >
+            <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." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="25" tag="operation_25" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="25" tag="operation_25" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Get the KActionCollection of the current view. This can be used to associate actions directly with the main view instead of relying on the KXMLGui based configuration mechanism." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="28" tag="operation_28" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="28" tag="operation_28" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Get the canvas controller. The canvas controller enables zooming of the canvas and converting image coordinates to canvas and view coordinates." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="43" tag="operation_43" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="43" tag="operation_43" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Get the selection controller. The selection controller can be used to create and modify selections for a paint device." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="50" tag="operation_50" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="50" tag="operation_50" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Get the layer controller interface. The layer controller offers access to functions to add, delete transform or restack layers, " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="55" tag="operation_55" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="55" tag="operation_55" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Returns the image controller interface. The image controller offers functionality to create, delete, transform, convert, import or export images." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="106" tag="operation_106" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="106" tag="operation_106" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="The docker controller allows the creating, removing, showing and hiding of docker tabs and dockers." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="125" tag="operation_125" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="125" tag="operation_125" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="The painter controller allows setting of properties like foreground and background colour and other properties that the various painters (line, fill, gradient, convolution) will use when created on a given paint device." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="140" tag="operation_140" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="140" tag="operation_140" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Returns the tool controller. The tool controller makes it possible to set a tool current and to retrieve the current tool. This is useful when tools are activated but also if a tool needs to be temporarily activated, like the move tool which should be activated if a selection tool is active and the user presses a modifier key while dragging." />
              </header>
@@ -5363,7 +5363,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="14" tqparent_class="14" fileExt=".java" fileName="KisSelectionControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="14" parent_class="14" fileExt=".java" fileName="KisSelectionControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5375,7 +5375,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="14" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="14" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisSelectionControllerInterface&amp;#010;" />
        </header>
@@ -5438,7 +5438,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="15" tqparent_class="15" fileExt=".java" fileName="KisLayerControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="15" parent_class="15" fileExt=".java" fileName="KisLayerControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5450,7 +5450,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="15" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="15" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisLayerControllerInterface&amp;#010;" />
        </header>
@@ -5513,7 +5513,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="16" tqparent_class="16" fileExt=".java" fileName="KisImageControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="16" parent_class="16" fileExt=".java" fileName="KisImageControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5525,7 +5525,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="16" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="16" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisImageControllerInterface&amp;#010;" />
        </header>
@@ -5588,7 +5588,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="17" tqparent_class="17" fileExt=".java" fileName="KisDockerControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="17" parent_class="17" fileExt=".java" fileName="KisDockerControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5600,7 +5600,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="17" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="17" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisDockerControllerInterface&amp;#010;" />
        </header>
@@ -5663,7 +5663,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="18" tqparent_class="18" fileExt=".java" fileName="KisToolControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="18" parent_class="18" fileExt=".java" fileName="KisToolControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5675,7 +5675,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="18" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="18" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Interface KisToolControllerInterface&amp;#010;" />
        </header>
@@ -5738,7 +5738,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="21" tqparent_class="21" fileExt=".java" fileName="void" >
+    <classifiercodedocument writeOutCode="true" package="" id="21" parent_class="21" fileExt=".java" fileName="void" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5750,7 +5750,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="21" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="21" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Void&amp;#010;" />
        </header>
@@ -5813,7 +5813,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="22" tqparent_class="22" fileExt=".java" fileName="QWidget * " >
+    <classifiercodedocument writeOutCode="true" package="" id="22" parent_class="22" fileExt=".java" fileName="QWidget * " >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5825,7 +5825,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="22" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="22" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QWidget * &amp;#010;" />
        </header>
@@ -5888,7 +5888,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="301" tqparent_class="301" fileExt=".java" fileName="enumCursorStyle" >
+    <classifiercodedocument writeOutCode="true" package="" id="301" parent_class="301" fileExt=".java" fileName="enumCursorStyle" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5900,7 +5900,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="301" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="301" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumCursorStyle&amp;#010;" />
        </header>
@@ -5963,7 +5963,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="307" tqparent_class="307" fileExt=".java" fileName="enumDockerStyle" >
+    <classifiercodedocument writeOutCode="true" package="" id="307" parent_class="307" fileExt=".java" fileName="enumDockerStyle" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -5975,7 +5975,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="307" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="307" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumDockerStyle&amp;#010;" />
        </header>
@@ -6038,7 +6038,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="311" tqparent_class="311" fileExt=".java" fileName="enumRotationDirection" >
+    <classifiercodedocument writeOutCode="true" package="" id="311" parent_class="311" fileExt=".java" fileName="enumRotationDirection" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6050,7 +6050,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="311" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="311" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumRotationDirection&amp;#010;" />
        </header>
@@ -6113,7 +6113,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="314" tqparent_class="314" fileExt=".java" fileName="CompositeOp" >
+    <classifiercodedocument writeOutCode="true" package="" id="314" parent_class="314" fileExt=".java" fileName="CompositeOp" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6125,7 +6125,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="314" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="314" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CompositeOp&amp;#010;" />
        </header>
@@ -6188,7 +6188,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="342" tqparent_class="342" fileExt=".java" fileName="enumImgTypeDeprecated" >
+    <classifiercodedocument writeOutCode="true" package="" id="342" parent_class="342" fileExt=".java" fileName="enumImgTypeDeprecated" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6200,7 +6200,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="342" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="342" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumImgTypeDeprecated&amp;#010;// The following enum is kept to allow the loading of old documents in KisDoc::loadImage// XXX: Before Koffice 1.4 release, remove. We do not need backwards compatibility since// we have no installed base." />
        </header>
@@ -6263,7 +6263,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="358" tqparent_class="358" fileExt=".java" fileName="enumPaintStyles" >
+    <classifiercodedocument writeOutCode="true" package="" id="358" parent_class="358" fileExt=".java" fileName="enumPaintStyles" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6275,7 +6275,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="358" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="358" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumPaintStyles&amp;#010;" />
        </header>
@@ -6338,7 +6338,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="361" tqparent_class="361" fileExt=".java" fileName="PIXELTYPE" >
+    <classifiercodedocument writeOutCode="true" package="" id="361" parent_class="361" fileExt=".java" fileName="PIXELTYPE" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6350,7 +6350,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="361" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="361" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class PIXELTYPE&amp;#010;" />
        </header>
@@ -6413,7 +6413,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="363" tqparent_class="363" fileExt=".java" fileName="KisSharedPtrVector" >
+    <classifiercodedocument writeOutCode="true" package="" id="363" parent_class="363" fileExt=".java" fileName="KisSharedPtrVector" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6425,7 +6425,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="363" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="363" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisSharedPtrVector&amp;#010;" />
        </header>
@@ -6477,22 +6477,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="370" tag="operation_370" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="370" tag="operation_370" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="371" tag="operation_371" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="371" tag="operation_371" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="372" tag="operation_372" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="372" tag="operation_372" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param it &amp;#010;@return typename super.test  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="377" tag="operation_377" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="377" tag="operation_377" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param first &amp;#010;@param last &amp;#010;@return typename super.test4  " />
              </header>
@@ -6508,36 +6508,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="366" field_type="2097266" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="366" field_type="2097266" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QValueVector  = new QValueVector ( );" >
+       <ccfdeclarationcodeblock parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QValueVector  = new QValueVector ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type QValueVector to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type QValueVector from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -6545,7 +6545,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="365" tqparent_class="365" fileExt=".java" fileName="QValueVector" >
+    <classifiercodedocument writeOutCode="true" package="" id="365" parent_class="365" fileExt=".java" fileName="QValueVector" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -6557,7 +6557,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="365" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="365" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QValueVector&amp;#010;" />
        </header>
@@ -6619,36 +6619,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="366" field_type="2147483647" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="366" field_type="2147483647" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSharedPtrVector  = new KisSharedPtrVector ( );" >
+       <ccfdeclarationcodeblock parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSharedPtrVector  = new KisSharedPtrVector ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisSharedPtrVector to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisSharedPtrVector from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="366" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="366" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -6656,7 +6656,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisSelection" id="369" tqparent_class="369" fileExt=".java" fileName="super" >
+    <classifiercodedocument writeOutCode="true" package="KisSelection" id="369" parent_class="369" fileExt=".java" fileName="super" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisSelection;&amp;#010;" >
        <header>
@@ -6668,7 +6668,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="369" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="369" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Super&amp;#010;" />
        </header>
@@ -6731,7 +6731,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="typename super" id="374" tqparent_class="374" fileExt=".java" fileName="iterator" >
+    <classifiercodedocument writeOutCode="true" package="typename super" id="374" parent_class="374" fileExt=".java" fileName="iterator" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package typename super;&amp;#010;" >
        <header>
@@ -6743,7 +6743,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="374" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="374" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Iterator&amp;#010;" />
        </header>
@@ -6806,7 +6806,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="typename super" id="376" tqparent_class="376" fileExt=".java" fileName="test" >
+    <classifiercodedocument writeOutCode="true" package="typename super" id="376" parent_class="376" fileExt=".java" fileName="test" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package typename super;&amp;#010;" >
        <header>
@@ -6818,7 +6818,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="376" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="376" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Test&amp;#010;" />
        </header>
@@ -6881,7 +6881,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="typename super" id="378" tqparent_class="378" fileExt=".java" fileName="test2" >
+    <classifiercodedocument writeOutCode="true" package="typename super" id="378" parent_class="378" fileExt=".java" fileName="test2" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package typename super;&amp;#010;" >
        <header>
@@ -6893,7 +6893,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="378" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="378" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Test2&amp;#010;" />
        </header>
@@ -6956,7 +6956,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="typename super" id="380" tqparent_class="380" fileExt=".java" fileName="test3" >
+    <classifiercodedocument writeOutCode="true" package="typename super" id="380" parent_class="380" fileExt=".java" fileName="test3" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package typename super;&amp;#010;" >
        <header>
@@ -6968,7 +6968,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="380" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="380" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Test3&amp;#010;" />
        </header>
@@ -7031,7 +7031,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="typename super" id="382" tqparent_class="382" fileExt=".java" fileName="test4" >
+    <classifiercodedocument writeOutCode="true" package="typename super" id="382" parent_class="382" fileExt=".java" fileName="test4" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package typename super;&amp;#010;" >
        <header>
@@ -7043,7 +7043,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="382" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="382" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Test4&amp;#010;" />
        </header>
@@ -7106,7 +7106,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="383" tqparent_class="383" fileExt=".java" fileName="KisImage" >
+    <classifiercodedocument writeOutCode="true" package="" id="383" parent_class="383" fileExt=".java" fileName="KisImage" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -7118,7 +7118,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="383" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="383" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisImage&amp;#010;" />
        </header>
@@ -7128,122 +7128,122 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1135" tag="tblock_0" canDelete="false" indentLevel="1" text="private KoCommandHistory* m_undoHistory;" >
+          <ccfdeclarationcodeblock parent_id="1135" tag="tblock_0" canDelete="false" indentLevel="1" text="private KoCommandHistory* m_undoHistory;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1136" tag="tblock_2" canDelete="false" indentLevel="1" text="private KURL m_uri;" >
+          <ccfdeclarationcodeblock parent_id="1136" tag="tblock_2" canDelete="false" indentLevel="1" text="private KURL m_uri;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1137" tag="tblock_5" canDelete="false" indentLevel="1" text="private QString m_name;" >
+          <ccfdeclarationcodeblock parent_id="1137" tag="tblock_5" canDelete="false" indentLevel="1" text="private QString m_name;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1138" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_description;" >
+          <ccfdeclarationcodeblock parent_id="1138" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_description;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1139" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+          <ccfdeclarationcodeblock parent_id="1139" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1140" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
+          <ccfdeclarationcodeblock parent_id="1140" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1141" tag="tblock_17" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
+          <ccfdeclarationcodeblock parent_id="1141" tag="tblock_17" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1142" tag="tblock_20" canDelete="false" indentLevel="1" text="private double m_xres;" >
+          <ccfdeclarationcodeblock parent_id="1142" tag="tblock_20" canDelete="false" indentLevel="1" text="private double m_xres;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1143" tag="tblock_23" canDelete="false" indentLevel="1" text="private double m_yres;" >
+          <ccfdeclarationcodeblock parent_id="1143" tag="tblock_23" canDelete="false" indentLevel="1" text="private double m_yres;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1144" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoUnit.Unit m_unit;" >
+          <ccfdeclarationcodeblock parent_id="1144" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoUnit.Unit m_unit;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1145" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+          <ccfdeclarationcodeblock parent_id="1145" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1146" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
+          <ccfdeclarationcodeblock parent_id="1146" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1147" tag="tblock_35" canDelete="false" indentLevel="1" text="private QRect m_dirtyRect;" >
+          <ccfdeclarationcodeblock parent_id="1147" tag="tblock_35" canDelete="false" indentLevel="1" text="private QRect m_dirtyRect;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1148" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisBackgroundSP m_bkg;" >
+          <ccfdeclarationcodeblock parent_id="1148" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisBackgroundSP m_bkg;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1149" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisLayerSP m_projection;" >
+          <ccfdeclarationcodeblock parent_id="1149" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisLayerSP m_projection;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1150" tag="tblock_44" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layers;" >
+          <ccfdeclarationcodeblock parent_id="1150" tag="tblock_44" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layers;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1151" tag="tblock_47" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layerStack;" >
+          <ccfdeclarationcodeblock parent_id="1151" tag="tblock_47" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layerStack;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1152" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisLayerSP m_activeLayer;" >
+          <ccfdeclarationcodeblock parent_id="1152" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisLayerSP m_activeLayer;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1154" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisNameServer* m_nserver;" >
+          <ccfdeclarationcodeblock parent_id="1154" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisNameServer* m_nserver;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1155" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisUndoAdapter* m_adapter;" >
+          <ccfdeclarationcodeblock parent_id="1155" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisUndoAdapter* m_adapter;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1156" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisGuideMgr m_guides;" >
+          <ccfdeclarationcodeblock parent_id="1156" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisGuideMgr m_guides;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1157" tag="tblock_62" canDelete="false" indentLevel="1" text="private DCOPObject* m_dcop;" >
+          <ccfdeclarationcodeblock parent_id="1157" tag="tblock_62" canDelete="false" indentLevel="1" text="private DCOPObject* m_dcop;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1158" tag="tblock_65" canDelete="false" indentLevel="1" text="private QPixmap m_pixmap;" >
+          <ccfdeclarationcodeblock parent_id="1158" tag="tblock_65" canDelete="false" indentLevel="1" text="private QPixmap m_pixmap;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1159" tag="tblock_68" canDelete="false" indentLevel="1" text="private vKisAnnotationSP m_annotations;" >
+          <ccfdeclarationcodeblock parent_id="1159" tag="tblock_68" canDelete="false" indentLevel="1" text="private vKisAnnotationSP m_annotations;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -7277,242 +7277,242 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1135" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1135" text="return m_undoHistory;" >
+              <codeaccessormethod accessType="0" parent_id="1135" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1135" text="return m_undoHistory;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_undoHistory&amp;#010;&amp;#010;@return the value of m_undoHistory" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1135" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1135" text="m_undoHistory = value;" >
+              <codeaccessormethod accessType="1" parent_id="1135" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1135" text="m_undoHistory = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_undoHistory&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1136" text="return m_uri;" >
+              <codeaccessormethod accessType="0" parent_id="1136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1136" text="return m_uri;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_uri&amp;#010;&amp;#010;@return the value of m_uri" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1136" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1136" text="m_uri = value;" >
+              <codeaccessormethod accessType="1" parent_id="1136" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1136" text="m_uri = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_uri&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1137" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1137" text="return m_name;" >
+              <codeaccessormethod accessType="0" parent_id="1137" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1137" text="return m_name;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1137" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1137" text="m_name = value;" >
+              <codeaccessormethod accessType="1" parent_id="1137" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1137" text="m_name = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1138" text="return m_description;" >
+              <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1138" text="return m_description;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_description&amp;#010;&amp;#010;@return the value of m_description" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1138" text="m_description = value;" >
+              <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1138" text="m_description = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_description&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1139" text="return m_profile;" >
+              <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1139" text="return m_profile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1139" text="m_profile = value;" >
+              <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1139" text="m_profile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1140" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1140" text="return m_width;" >
+              <codeaccessormethod accessType="0" parent_id="1140" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1140" text="return m_width;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_width&amp;#010;&amp;#010;@return the value of m_width" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1140" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1140" text="m_width = value;" >
+              <codeaccessormethod accessType="1" parent_id="1140" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1140" text="m_width = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_width&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1141" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1141" text="return m_height;" >
+              <codeaccessormethod accessType="0" parent_id="1141" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1141" text="return m_height;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_height&amp;#010;&amp;#010;@return the value of m_height" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1141" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1141" text="m_height = value;" >
+              <codeaccessormethod accessType="1" parent_id="1141" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1141" text="m_height = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_height&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1142" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1142" text="return m_xres;" >
+              <codeaccessormethod accessType="0" parent_id="1142" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1142" text="return m_xres;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_xres&amp;#010;&amp;#010;@return the value of m_xres" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1142" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1142" text="m_xres = value;" >
+              <codeaccessormethod accessType="1" parent_id="1142" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1142" text="m_xres = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_xres&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1143" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1143" text="return m_yres;" >
+              <codeaccessormethod accessType="0" parent_id="1143" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1143" text="return m_yres;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_yres&amp;#010;&amp;#010;@return the value of m_yres" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1143" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1143" text="m_yres = value;" >
+              <codeaccessormethod accessType="1" parent_id="1143" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1143" text="m_yres = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_yres&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1144" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1144" text="return m_unit;" >
+              <codeaccessormethod accessType="0" parent_id="1144" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1144" text="return m_unit;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_unit&amp;#010;&amp;#010;@return the value of m_unit" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1144" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1144" text="m_unit = value;" >
+              <codeaccessormethod accessType="1" parent_id="1144" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1144" text="m_unit = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_unit&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1145" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1145" text="return m_colorStrategy;" >
+              <codeaccessormethod accessType="0" parent_id="1145" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1145" text="return m_colorStrategy;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1145" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1145" text="m_colorStrategy = value;" >
+              <codeaccessormethod accessType="1" parent_id="1145" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1145" text="m_colorStrategy = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1146" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1146" text="return m_dirty;" >
+              <codeaccessormethod accessType="0" parent_id="1146" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1146" text="return m_dirty;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dirty&amp;#010;&amp;#010;@return the value of m_dirty" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1146" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1146" text="m_dirty = value;" >
+              <codeaccessormethod accessType="1" parent_id="1146" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1146" text="m_dirty = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dirty&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1147" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1147" text="return m_dirtyRect;" >
+              <codeaccessormethod accessType="0" parent_id="1147" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1147" text="return m_dirtyRect;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dirtyRect&amp;#010;&amp;#010;@return the value of m_dirtyRect" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1147" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1147" text="m_dirtyRect = value;" >
+              <codeaccessormethod accessType="1" parent_id="1147" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1147" text="m_dirtyRect = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dirtyRect&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1148" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1148" text="return m_bkg;" >
+              <codeaccessormethod accessType="0" parent_id="1148" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1148" text="return m_bkg;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_bkg&amp;#010;&amp;#010;@return the value of m_bkg" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1148" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1148" text="m_bkg = value;" >
+              <codeaccessormethod accessType="1" parent_id="1148" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1148" text="m_bkg = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_bkg&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1149" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1149" text="return m_projection;" >
+              <codeaccessormethod accessType="0" parent_id="1149" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1149" text="return m_projection;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_projection&amp;#010;&amp;#010;@return the value of m_projection" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1149" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1149" text="m_projection = value;" >
+              <codeaccessormethod accessType="1" parent_id="1149" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1149" text="m_projection = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_projection&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1150" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1150" text="return m_layers;" >
+              <codeaccessormethod accessType="0" parent_id="1150" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1150" text="return m_layers;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_layers&amp;#010;&amp;#010;@return the value of m_layers" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1150" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1150" text="m_layers = value;" >
+              <codeaccessormethod accessType="1" parent_id="1150" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1150" text="m_layers = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_layers&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1151" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1151" text="return m_layerStack;" >
+              <codeaccessormethod accessType="0" parent_id="1151" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1151" text="return m_layerStack;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_layerStack&amp;#010;&amp;#010;@return the value of m_layerStack" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1151" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1151" text="m_layerStack = value;" >
+              <codeaccessormethod accessType="1" parent_id="1151" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1151" text="m_layerStack = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_layerStack&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1152" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1152" text="return m_activeLayer;" >
+              <codeaccessormethod accessType="0" parent_id="1152" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1152" text="return m_activeLayer;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_activeLayer&amp;#010;&amp;#010;@return the value of m_activeLayer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1152" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1152" text="m_activeLayer = value;" >
+              <codeaccessormethod accessType="1" parent_id="1152" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1152" text="m_activeLayer = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_activeLayer&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1154" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1154" text="return m_nserver;" >
+              <codeaccessormethod accessType="0" parent_id="1154" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1154" text="return m_nserver;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_nserver&amp;#010;&amp;#010;@return the value of m_nserver" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1154" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1154" text="m_nserver = value;" >
+              <codeaccessormethod accessType="1" parent_id="1154" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1154" text="m_nserver = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_nserver&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1155" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1155" text="return m_adapter;" >
+              <codeaccessormethod accessType="0" parent_id="1155" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1155" text="return m_adapter;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_adapter&amp;#010;&amp;#010;@return the value of m_adapter" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1155" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1155" text="m_adapter = value;" >
+              <codeaccessormethod accessType="1" parent_id="1155" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1155" text="m_adapter = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_adapter&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1156" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1156" text="return m_guides;" >
+              <codeaccessormethod accessType="0" parent_id="1156" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1156" text="return m_guides;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_guides&amp;#010;&amp;#010;@return the value of m_guides" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1156" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1156" text="m_guides = value;" >
+              <codeaccessormethod accessType="1" parent_id="1156" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1156" text="m_guides = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_guides&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1157" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1157" text="return m_dcop;" >
+              <codeaccessormethod accessType="0" parent_id="1157" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1157" text="return m_dcop;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dcop&amp;#010;&amp;#010;@return the value of m_dcop" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1157" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1157" text="m_dcop = value;" >
+              <codeaccessormethod accessType="1" parent_id="1157" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1157" text="m_dcop = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dcop&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1158" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1158" text="return m_pixmap;" >
+              <codeaccessormethod accessType="0" parent_id="1158" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1158" text="return m_pixmap;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pixmap&amp;#010;&amp;#010;@return the value of m_pixmap" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1158" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1158" text="m_pixmap = value;" >
+              <codeaccessormethod accessType="1" parent_id="1158" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1158" text="m_pixmap = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pixmap&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1159" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1159" text="return m_annotations;" >
+              <codeaccessormethod accessType="0" parent_id="1159" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1159" text="return m_annotations;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_annotations&amp;#010;&amp;#010;@return the value of m_annotations" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1159" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1159" text="m_annotations = value;" >
+              <codeaccessormethod accessType="1" parent_id="1159" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1159" text="m_annotations = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_annotations&amp;#010;&amp;#010;" />
                </header>
@@ -7532,362 +7532,362 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="967" tag="operation_967" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="967" tag="operation_967" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param undoAdapter &amp;#010;@param width &amp;#010;@param height &amp;#010;@param colorStrategy &amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="973" tag="operation_973" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="973" tag="operation_973" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="976" tag="operation_976" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="976" tag="operation_976" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="977" tag="operation_977" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="977" tag="operation_977" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return DCOPObject*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="979" tag="operation_979" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="979" tag="operation_979" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Composite the specified tile onto the projection layer." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="984" tag="operation_984" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="984" tag="operation_984" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="/// Paint the specified rect onto the painter, adjusting the colors using the/// given profile." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="993" tag="operation_993" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="993" tag="operation_993" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="994" tag="operation_994" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="994" tag="operation_994" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="996" tag="operation_996" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="996" tag="operation_996" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="997" tag="operation_997" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="997" tag="operation_997" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param description &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="999" tag="operation_999" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="999" tag="operation_999" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1000" tag="operation_1000" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1000" tag="operation_1000" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w &amp;#010;@param h &amp;#010;@param cropLayers &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1004" tag="operation_1004" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@param cropLayers &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1007" tag="operation_1007" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1007" tag="operation_1007" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param sx &amp;#010;@param sy &amp;#010;@param m_progress &amp;#010;@param ftype &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1012" tag="operation_1012" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1012" tag="operation_1012" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param angle &amp;#010;@param m_progress &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1015" tag="operation_1015" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1015" tag="operation_1015" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param angleX &amp;#010;@param angleY &amp;#010;@param m_progress &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1019" tag="operation_1019" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1019" tag="operation_1019" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dstColorStrategy &amp;#010;@param dstProfile &amp;#010;@param renderingIntent &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1023" tag="operation_1023" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1023" tag="operation_1023" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Get the profile associated with this image" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1024" tag="operation_1024" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Set the profile associated with this image" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1027" tag="operation_1027" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1027" tag="operation_1027" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param history &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1030" tag="operation_1030" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1030" tag="operation_1030" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisStrategyColorSpaceSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1031" tag="operation_1031" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1031" tag="operation_1031" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KURL  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1033" tag="operation_1033" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1033" tag="operation_1033" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param uri &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1036" tag="operation_1036" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1036" tag="operation_1036" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KoUnit.Unit  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1039" tag="operation_1039" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1039" tag="operation_1039" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param u &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1042" tag="operation_1042" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1042" tag="operation_1042" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Resolution of the image == XXX: per inch?" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1043" tag="operation_1043" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1043" tag="operation_1043" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return double  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1044" tag="operation_1044" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xres &amp;#010;@param yres &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1047" tag="operation_1047" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1047" tag="operation_1047" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1048" tag="operation_1048" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1048" tag="operation_1048" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1049" tag="operation_1049" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1049" tag="operation_1049" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1050" tag="operation_1050" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1050" tag="operation_1050" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return vKisLayerSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1053" tag="operation_1053" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1053" tag="operation_1053" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Get the active painting device" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1054" tag="operation_1054" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisLayerSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1057" tag="operation_1057" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1057" tag="operation_1057" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@return KisLayerSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1059" tag="operation_1059" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1059" tag="operation_1059" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param n &amp;#010;@return KisLayerSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1061" tag="operation_1061" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1061" tag="operation_1061" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1064" tag="operation_1064" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@return KisLayerSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1066" tag="operation_1066" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1066" tag="operation_1066" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param npos &amp;#010;@return KisLayerSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1068" tag="operation_1068" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1068" tag="operation_1068" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@param position &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1071" tag="operation_1071" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1071" tag="operation_1071" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1073" tag="operation_1073" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1073" tag="operation_1073" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1075" tag="operation_1075" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1075" tag="operation_1075" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1077" tag="operation_1077" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1077" tag="operation_1077" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1079" tag="operation_1079" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1079" tag="operation_1079" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1081" tag="operation_1081" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1081" tag="operation_1081" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@param position &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1084" tag="operation_1084" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1085" tag="operation_1085" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1085" tag="operation_1085" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1086" tag="operation_1086" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1086" tag="operation_1086" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1087" tag="operation_1087" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1087" tag="operation_1087" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Merge all visible layers and discard hidden ones." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1088" tag="operation_1088" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1088" tag="operation_1088" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1089" tag="operation_1089" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1089" tag="operation_1089" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1090" tag="operation_1090" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1090" tag="operation_1090" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Merge the specified layer with the layer&amp;#010;below this layer, remove the specified layer." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1092" tag="operation_1092" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1092" tag="operation_1092" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QRect  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1093" tag="operation_1093" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1093" tag="operation_1093" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1094" tag="operation_1094" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param width &amp;#010;@param height &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1099" tag="operation_1099" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1099" tag="operation_1099" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rc &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1101" tag="operation_1101" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1101" tag="operation_1101" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1102" tag="operation_1102" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1102" tag="operation_1102" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisUndoAdapter*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1103" tag="operation_1103" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1103" tag="operation_1103" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisGuideMgr*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1105" tag="operation_1105" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1105" tag="operation_1105" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1107" tag="operation_1107" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1107" tag="operation_1107" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1109" tag="operation_1109" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1109" tag="operation_1109" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1111" tag="operation_1111" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1111" tag="operation_1111" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1113" tag="operation_1113" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1113" tag="operation_1113" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@param rc &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1116" tag="operation_1116" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1116" tag="operation_1116" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1118" tag="operation_1118" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1118" tag="operation_1118" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1122" tag="operation_1122" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1122" tag="operation_1122" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1124" tag="operation_1124" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1124" tag="operation_1124" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1125" tag="operation_1125" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1125" tag="operation_1125" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1126" tag="operation_1126" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1126" tag="operation_1126" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs &amp;#010;@return KisImage&amp;  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1129" tag="operation_1129" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1129" tag="operation_1129" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param adapter &amp;#010;@param width &amp;#010;@param height &amp;#010;@param colorStrategy &amp;#010;@param name &amp;#010;@return void  " />
              </header>
@@ -7903,551 +7903,551 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="961" field_type="5177425" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="961" field_type="5177425" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
+       <ccfdeclarationcodeblock parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type QObject to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type QObject from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="964" field_type="2097192" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="964" field_type="2097192" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
+       <ccfdeclarationcodeblock parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1135" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1135" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1135" tag="tblock_0" canDelete="false" indentLevel="1" text="private KoCommandHistory* m_undoHistory;" >
+       <ccfdeclarationcodeblock parent_id="1135" tag="tblock_0" canDelete="false" indentLevel="1" text="private KoCommandHistory* m_undoHistory;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1135" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1135" text="return m_undoHistory;" >
+       <codeaccessormethod accessType="0" parent_id="1135" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1135" text="return m_undoHistory;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_undoHistory&amp;#010;&amp;#010;@return the value of m_undoHistory" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1135" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1135" text="m_undoHistory = value;" >
+       <codeaccessormethod accessType="1" parent_id="1135" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1135" text="m_undoHistory = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_undoHistory&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1136" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1136" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1136" tag="tblock_2" canDelete="false" indentLevel="1" text="private KURL m_uri;" >
+       <ccfdeclarationcodeblock parent_id="1136" tag="tblock_2" canDelete="false" indentLevel="1" text="private KURL m_uri;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1136" text="return m_uri;" >
+       <codeaccessormethod accessType="0" parent_id="1136" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1136" text="return m_uri;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_uri&amp;#010;&amp;#010;@return the value of m_uri" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1136" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1136" text="m_uri = value;" >
+       <codeaccessormethod accessType="1" parent_id="1136" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1136" text="m_uri = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_uri&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1137" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1137" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1137" tag="tblock_5" canDelete="false" indentLevel="1" text="private QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="1137" tag="tblock_5" canDelete="false" indentLevel="1" text="private QString m_name;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1137" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1137" text="return m_name;" >
+       <codeaccessormethod accessType="0" parent_id="1137" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1137" text="return m_name;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1137" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1137" text="m_name = value;" >
+       <codeaccessormethod accessType="1" parent_id="1137" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1137" text="m_name = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1138" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1138" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_description;" >
+       <ccfdeclarationcodeblock parent_id="1138" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_description;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1138" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1138" text="return m_description;" >
+       <codeaccessormethod accessType="0" parent_id="1138" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1138" text="return m_description;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_description&amp;#010;&amp;#010;@return the value of m_description" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1138" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1138" text="m_description = value;" >
+       <codeaccessormethod accessType="1" parent_id="1138" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1138" text="m_description = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_description&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1139" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1139" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+       <ccfdeclarationcodeblock parent_id="1139" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1139" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1139" text="return m_profile;" >
+       <codeaccessormethod accessType="0" parent_id="1139" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1139" text="return m_profile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1139" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1139" text="m_profile = value;" >
+       <codeaccessormethod accessType="1" parent_id="1139" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1139" text="m_profile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1140" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1140" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1140" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="1140" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1140" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1140" text="return m_width;" >
+       <codeaccessormethod accessType="0" parent_id="1140" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1140" text="return m_width;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_width&amp;#010;&amp;#010;@return the value of m_width" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1140" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1140" text="m_width = value;" >
+       <codeaccessormethod accessType="1" parent_id="1140" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1140" text="m_width = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_width&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1141" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1141" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1141" tag="tblock_17" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="1141" tag="tblock_17" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1141" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1141" text="return m_height;" >
+       <codeaccessormethod accessType="0" parent_id="1141" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1141" text="return m_height;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_height&amp;#010;&amp;#010;@return the value of m_height" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1141" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1141" text="m_height = value;" >
+       <codeaccessormethod accessType="1" parent_id="1141" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1141" text="m_height = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_height&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1142" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1142" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1142" tag="tblock_20" canDelete="false" indentLevel="1" text="private double m_xres;" >
+       <ccfdeclarationcodeblock parent_id="1142" tag="tblock_20" canDelete="false" indentLevel="1" text="private double m_xres;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1142" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1142" text="return m_xres;" >
+       <codeaccessormethod accessType="0" parent_id="1142" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1142" text="return m_xres;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_xres&amp;#010;&amp;#010;@return the value of m_xres" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1142" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1142" text="m_xres = value;" >
+       <codeaccessormethod accessType="1" parent_id="1142" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1142" text="m_xres = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_xres&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1143" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1143" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1143" tag="tblock_23" canDelete="false" indentLevel="1" text="private double m_yres;" >
+       <ccfdeclarationcodeblock parent_id="1143" tag="tblock_23" canDelete="false" indentLevel="1" text="private double m_yres;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1143" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1143" text="return m_yres;" >
+       <codeaccessormethod accessType="0" parent_id="1143" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1143" text="return m_yres;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_yres&amp;#010;&amp;#010;@return the value of m_yres" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1143" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1143" text="m_yres = value;" >
+       <codeaccessormethod accessType="1" parent_id="1143" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1143" text="m_yres = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_yres&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1144" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1144" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1144" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoUnit.Unit m_unit;" >
+       <ccfdeclarationcodeblock parent_id="1144" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoUnit.Unit m_unit;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1144" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1144" text="return m_unit;" >
+       <codeaccessormethod accessType="0" parent_id="1144" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1144" text="return m_unit;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_unit&amp;#010;&amp;#010;@return the value of m_unit" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1144" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1144" text="m_unit = value;" >
+       <codeaccessormethod accessType="1" parent_id="1144" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1144" text="m_unit = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_unit&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1145" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1145" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1145" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+       <ccfdeclarationcodeblock parent_id="1145" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1145" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1145" text="return m_colorStrategy;" >
+       <codeaccessormethod accessType="0" parent_id="1145" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1145" text="return m_colorStrategy;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1145" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1145" text="m_colorStrategy = value;" >
+       <codeaccessormethod accessType="1" parent_id="1145" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1145" text="m_colorStrategy = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1146" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1146" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1146" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
+       <ccfdeclarationcodeblock parent_id="1146" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1146" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1146" text="return m_dirty;" >
+       <codeaccessormethod accessType="0" parent_id="1146" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1146" text="return m_dirty;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dirty&amp;#010;&amp;#010;@return the value of m_dirty" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1146" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1146" text="m_dirty = value;" >
+       <codeaccessormethod accessType="1" parent_id="1146" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1146" text="m_dirty = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dirty&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1147" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1147" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1147" tag="tblock_35" canDelete="false" indentLevel="1" text="private QRect m_dirtyRect;" >
+       <ccfdeclarationcodeblock parent_id="1147" tag="tblock_35" canDelete="false" indentLevel="1" text="private QRect m_dirtyRect;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1147" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1147" text="return m_dirtyRect;" >
+       <codeaccessormethod accessType="0" parent_id="1147" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1147" text="return m_dirtyRect;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dirtyRect&amp;#010;&amp;#010;@return the value of m_dirtyRect" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1147" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1147" text="m_dirtyRect = value;" >
+       <codeaccessormethod accessType="1" parent_id="1147" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1147" text="m_dirtyRect = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dirtyRect&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1148" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1148" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1148" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisBackgroundSP m_bkg;" >
+       <ccfdeclarationcodeblock parent_id="1148" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisBackgroundSP m_bkg;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1148" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1148" text="return m_bkg;" >
+       <codeaccessormethod accessType="0" parent_id="1148" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1148" text="return m_bkg;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_bkg&amp;#010;&amp;#010;@return the value of m_bkg" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1148" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1148" text="m_bkg = value;" >
+       <codeaccessormethod accessType="1" parent_id="1148" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1148" text="m_bkg = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_bkg&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1149" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1149" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1149" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisLayerSP m_projection;" >
+       <ccfdeclarationcodeblock parent_id="1149" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisLayerSP m_projection;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1149" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1149" text="return m_projection;" >
+       <codeaccessormethod accessType="0" parent_id="1149" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1149" text="return m_projection;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_projection&amp;#010;&amp;#010;@return the value of m_projection" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1149" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1149" text="m_projection = value;" >
+       <codeaccessormethod accessType="1" parent_id="1149" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1149" text="m_projection = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_projection&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1150" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1150" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1150" tag="tblock_44" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layers;" >
+       <ccfdeclarationcodeblock parent_id="1150" tag="tblock_44" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layers;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1150" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1150" text="return m_layers;" >
+       <codeaccessormethod accessType="0" parent_id="1150" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1150" text="return m_layers;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_layers&amp;#010;&amp;#010;@return the value of m_layers" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1150" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1150" text="m_layers = value;" >
+       <codeaccessormethod accessType="1" parent_id="1150" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1150" text="m_layers = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_layers&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1151" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1151" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1151" tag="tblock_47" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layerStack;" >
+       <ccfdeclarationcodeblock parent_id="1151" tag="tblock_47" canDelete="false" indentLevel="1" text="private vKisLayerSP m_layerStack;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1151" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1151" text="return m_layerStack;" >
+       <codeaccessormethod accessType="0" parent_id="1151" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1151" text="return m_layerStack;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_layerStack&amp;#010;&amp;#010;@return the value of m_layerStack" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1151" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1151" text="m_layerStack = value;" >
+       <codeaccessormethod accessType="1" parent_id="1151" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1151" text="m_layerStack = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_layerStack&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1152" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1152" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1152" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisLayerSP m_activeLayer;" >
+       <ccfdeclarationcodeblock parent_id="1152" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisLayerSP m_activeLayer;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1152" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1152" text="return m_activeLayer;" >
+       <codeaccessormethod accessType="0" parent_id="1152" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1152" text="return m_activeLayer;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_activeLayer&amp;#010;&amp;#010;@return the value of m_activeLayer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1152" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1152" text="m_activeLayer = value;" >
+       <codeaccessormethod accessType="1" parent_id="1152" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1152" text="m_activeLayer = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_activeLayer&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1154" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1154" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1154" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisNameServer* m_nserver;" >
+       <ccfdeclarationcodeblock parent_id="1154" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisNameServer* m_nserver;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1154" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1154" text="return m_nserver;" >
+       <codeaccessormethod accessType="0" parent_id="1154" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1154" text="return m_nserver;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_nserver&amp;#010;&amp;#010;@return the value of m_nserver" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1154" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1154" text="m_nserver = value;" >
+       <codeaccessormethod accessType="1" parent_id="1154" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1154" text="m_nserver = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_nserver&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1155" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1155" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1155" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisUndoAdapter* m_adapter;" >
+       <ccfdeclarationcodeblock parent_id="1155" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisUndoAdapter* m_adapter;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1155" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1155" text="return m_adapter;" >
+       <codeaccessormethod accessType="0" parent_id="1155" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1155" text="return m_adapter;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_adapter&amp;#010;&amp;#010;@return the value of m_adapter" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1155" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1155" text="m_adapter = value;" >
+       <codeaccessormethod accessType="1" parent_id="1155" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1155" text="m_adapter = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_adapter&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1156" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1156" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1156" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisGuideMgr m_guides;" >
+       <ccfdeclarationcodeblock parent_id="1156" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisGuideMgr m_guides;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1156" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1156" text="return m_guides;" >
+       <codeaccessormethod accessType="0" parent_id="1156" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1156" text="return m_guides;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_guides&amp;#010;&amp;#010;@return the value of m_guides" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1156" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1156" text="m_guides = value;" >
+       <codeaccessormethod accessType="1" parent_id="1156" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1156" text="m_guides = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_guides&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1157" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1157" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1157" tag="tblock_62" canDelete="false" indentLevel="1" text="private DCOPObject* m_dcop;" >
+       <ccfdeclarationcodeblock parent_id="1157" tag="tblock_62" canDelete="false" indentLevel="1" text="private DCOPObject* m_dcop;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1157" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1157" text="return m_dcop;" >
+       <codeaccessormethod accessType="0" parent_id="1157" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1157" text="return m_dcop;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dcop&amp;#010;&amp;#010;@return the value of m_dcop" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1157" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1157" text="m_dcop = value;" >
+       <codeaccessormethod accessType="1" parent_id="1157" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1157" text="m_dcop = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dcop&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1158" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1158" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1158" tag="tblock_65" canDelete="false" indentLevel="1" text="private QPixmap m_pixmap;" >
+       <ccfdeclarationcodeblock parent_id="1158" tag="tblock_65" canDelete="false" indentLevel="1" text="private QPixmap m_pixmap;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1158" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1158" text="return m_pixmap;" >
+       <codeaccessormethod accessType="0" parent_id="1158" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1158" text="return m_pixmap;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pixmap&amp;#010;&amp;#010;@return the value of m_pixmap" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1158" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1158" text="m_pixmap = value;" >
+       <codeaccessormethod accessType="1" parent_id="1158" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1158" text="m_pixmap = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pixmap&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1159" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1159" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1159" tag="tblock_68" canDelete="false" indentLevel="1" text="private vKisAnnotationSP m_annotations;" >
+       <ccfdeclarationcodeblock parent_id="1159" tag="tblock_68" canDelete="false" indentLevel="1" text="private vKisAnnotationSP m_annotations;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1159" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1159" text="return m_annotations;" >
+       <codeaccessormethod accessType="0" parent_id="1159" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1159" text="return m_annotations;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_annotations&amp;#010;&amp;#010;@return the value of m_annotations" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1159" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1159" text="m_annotations = value;" >
+       <codeaccessormethod accessType="1" parent_id="1159" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1159" text="m_annotations = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_annotations&amp;#010;&amp;#010;" />
         </header>
@@ -8455,7 +8455,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="384" tqparent_class="384" fileExt=".java" fileName="KisImageSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="384" parent_class="384" fileExt=".java" fileName="KisImageSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8467,7 +8467,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="384" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="384" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisImageSP&amp;#010;" />
        </header>
@@ -8530,7 +8530,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="385" tqparent_class="385" fileExt=".java" fileName="vKisImageSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="385" parent_class="385" fileExt=".java" fileName="vKisImageSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8542,7 +8542,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="385" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="385" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisImageSP&amp;#010;" />
        </header>
@@ -8605,7 +8605,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="386" tqparent_class="386" fileExt=".java" fileName="vKisImageSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="386" parent_class="386" fileExt=".java" fileName="vKisImageSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8617,7 +8617,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="386" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="386" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisImageSP_it&amp;#010;" />
        </header>
@@ -8680,7 +8680,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="387" tqparent_class="387" fileExt=".java" fileName="vKisImageSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="387" parent_class="387" fileExt=".java" fileName="vKisImageSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8692,7 +8692,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="387" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="387" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisImageSP_cit&amp;#010;" />
        </header>
@@ -8755,7 +8755,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="388" tqparent_class="388" fileExt=".java" fileName="KisPaintDevice" >
+    <classifiercodedocument writeOutCode="true" package="" id="388" parent_class="388" fileExt=".java" fileName="KisPaintDevice" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -8767,7 +8767,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="388" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="388" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintDevice&amp;#010;Class modelled on QPaintDevice." />
        </header>
@@ -8777,67 +8777,67 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1627" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisImage* m_owner;" >
+          <ccfdeclarationcodeblock parent_id="1627" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisImage* m_owner;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1628" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDataManager* m_datamanager;" >
+          <ccfdeclarationcodeblock parent_id="1628" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDataManager* m_datamanager;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1629" tag="tblock_5" canDelete="false" indentLevel="1" text="private Q_INT32 m_x;" >
+          <ccfdeclarationcodeblock parent_id="1629" tag="tblock_5" canDelete="false" indentLevel="1" text="private Q_INT32 m_x;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1630" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_INT32 m_y;" >
+          <ccfdeclarationcodeblock parent_id="1630" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_INT32 m_y;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1631" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_visible;" >
+          <ccfdeclarationcodeblock parent_id="1631" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_visible;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1632" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_name;" >
+          <ccfdeclarationcodeblock parent_id="1632" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_name;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1633" tag="tblock_17" canDelete="false" indentLevel="1" text="private CompositeOp m_compositeOp;" >
+          <ccfdeclarationcodeblock parent_id="1633" tag="tblock_17" canDelete="false" indentLevel="1" text="private CompositeOp m_compositeOp;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Operation used to composite this layer with the layers _under_ this layer" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1634" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+          <ccfdeclarationcodeblock parent_id="1634" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1635" tag="tblock_23" canDelete="false" indentLevel="1" text="private Q_INT32 m_pixelSize;" >
+          <ccfdeclarationcodeblock parent_id="1635" tag="tblock_23" canDelete="false" indentLevel="1" text="private Q_INT32 m_pixelSize;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Cached for quick access" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1636" tag="tblock_26" canDelete="false" indentLevel="1" text="private Q_INT32 m_nChannels;" >
+          <ccfdeclarationcodeblock parent_id="1636" tag="tblock_26" canDelete="false" indentLevel="1" text="private Q_INT32 m_nChannels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1637" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+          <ccfdeclarationcodeblock parent_id="1637" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1647" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_hasSelection;" >
+          <ccfdeclarationcodeblock parent_id="1647" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_hasSelection;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Whether there is a selection valid for this layer" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1648" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisSelectionSP m_selection;" >
+          <ccfdeclarationcodeblock parent_id="1648" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisSelectionSP m_selection;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Contains the actual selection. For now, there can be only// one selection per layer. XXX: is this a limitation?" />
            </header>
@@ -8871,132 +8871,132 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1627" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1627" text="return m_owner;" >
+              <codeaccessormethod accessType="0" parent_id="1627" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1627" text="return m_owner;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_owner&amp;#010;&amp;#010;@return the value of m_owner" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1627" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1627" text="m_owner = value;" >
+              <codeaccessormethod accessType="1" parent_id="1627" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1627" text="m_owner = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_owner&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1628" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1628" text="return m_datamanager;" >
+              <codeaccessormethod accessType="0" parent_id="1628" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1628" text="return m_datamanager;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_datamanager&amp;#010;&amp;#010;@return the value of m_datamanager" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1628" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1628" text="m_datamanager = value;" >
+              <codeaccessormethod accessType="1" parent_id="1628" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1628" text="m_datamanager = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_datamanager&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1629" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1629" text="return m_x;" >
+              <codeaccessormethod accessType="0" parent_id="1629" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1629" text="return m_x;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_x&amp;#010;&amp;#010;@return the value of m_x" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1629" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1629" text="m_x = value;" >
+              <codeaccessormethod accessType="1" parent_id="1629" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1629" text="m_x = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_x&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1630" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1630" text="return m_y;" >
+              <codeaccessormethod accessType="0" parent_id="1630" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1630" text="return m_y;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_y&amp;#010;&amp;#010;@return the value of m_y" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1630" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1630" text="m_y = value;" >
+              <codeaccessormethod accessType="1" parent_id="1630" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1630" text="m_y = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_y&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1631" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1631" text="return m_visible;" >
+              <codeaccessormethod accessType="0" parent_id="1631" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1631" text="return m_visible;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_visible&amp;#010;&amp;#010;@return the value of m_visible" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1631" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1631" text="m_visible = value;" >
+              <codeaccessormethod accessType="1" parent_id="1631" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1631" text="m_visible = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_visible&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1632" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1632" text="return m_name;" >
+              <codeaccessormethod accessType="0" parent_id="1632" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1632" text="return m_name;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1632" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1632" text="m_name = value;" >
+              <codeaccessormethod accessType="1" parent_id="1632" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1632" text="m_name = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1633" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1633" text="return m_compositeOp;" >
+              <codeaccessormethod accessType="0" parent_id="1633" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1633" text="return m_compositeOp;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Operation used to composite this layer with the layers _under_ this layer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1633" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1633" text="m_compositeOp = value;" >
+              <codeaccessormethod accessType="1" parent_id="1633" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1633" text="m_compositeOp = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Operation used to composite this layer with the layers _under_ this layer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1634" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1634" text="return m_colorStrategy;" >
+              <codeaccessormethod accessType="0" parent_id="1634" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1634" text="return m_colorStrategy;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1634" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1634" text="m_colorStrategy = value;" >
+              <codeaccessormethod accessType="1" parent_id="1634" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1634" text="m_colorStrategy = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1635" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1635" text="return m_pixelSize;" >
+              <codeaccessormethod accessType="0" parent_id="1635" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1635" text="return m_pixelSize;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Cached for quick access" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1635" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1635" text="m_pixelSize = value;" >
+              <codeaccessormethod accessType="1" parent_id="1635" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1635" text="m_pixelSize = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Cached for quick access" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1636" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1636" text="return m_nChannels;" >
+              <codeaccessormethod accessType="0" parent_id="1636" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1636" text="return m_nChannels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_nChannels&amp;#010;&amp;#010;@return the value of m_nChannels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1636" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1636" text="m_nChannels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1636" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1636" text="m_nChannels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_nChannels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1637" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1637" text="return m_profile;" >
+              <codeaccessormethod accessType="0" parent_id="1637" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1637" text="return m_profile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1637" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1637" text="m_profile = value;" >
+              <codeaccessormethod accessType="1" parent_id="1637" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1637" text="m_profile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1647" text="return m_hasSelection;" >
+              <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1647" text="return m_hasSelection;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Whether there is a selection valid for this layer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1647" text="m_hasSelection = value;" >
+              <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1647" text="m_hasSelection = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Whether there is a selection valid for this layer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1648" text="return m_selection;" >
+              <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1648" text="return m_selection;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Contains the actual selection. For now, there can be only// one selection per layer. XXX: is this a limitation?" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1648" text="m_selection = value;" >
+              <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1648" text="m_selection = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Contains the actual selection. For now, there can be only// one selection per layer. XXX: is this a limitation?" />
                </header>
@@ -9016,372 +9016,372 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1439" tag="operation_1439" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1439" tag="operation_1439" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colorStrategy &amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1442" tag="operation_1442" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1442" tag="operation_1442" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param colorStrategy &amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1447" tag="operation_1447" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1447" tag="operation_1447" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rhs &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1450" tag="operation_1450" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1450" tag="operation_1450" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1451" tag="operation_1451" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// Implement KisRenderInterface" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1453" tag="operation_1453" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1453" tag="operation_1453" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param store &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1455" tag="operation_1455" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1455" tag="operation_1455" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1456" tag="operation_1456" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1456" tag="operation_1456" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1459" tag="operation_1459" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1459" tag="operation_1459" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1461" tag="operation_1461" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1461" tag="operation_1461" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@param x &amp;#010;@param y &amp;#010;@return KNamedCommand*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1466" tag="operation_1466" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1466" tag="operation_1466" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return const bool  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1468" tag="operation_1468" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1468" tag="operation_1468" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1470" tag="operation_1470" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1470" tag="operation_1470" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1473" tag="operation_1473" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1473" tag="operation_1473" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pt &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1475" tag="operation_1475" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1475" tag="operation_1475" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Retrieve the bounds of the paint device. The size is not exact,&amp;#010;but may be larger if the underlying datamanager works that way.&amp;#010;For instance, the tiled datamanager keeps the extent to the nearest&amp;#010;multiple of 64." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1480" tag="operation_1480" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1480" tag="operation_1480" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QRect  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1481" tag="operation_1481" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1481" tag="operation_1481" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Get the exact bounds of this paint device. This may be very slow,&amp;#010;especially on larger paint devices because it does a linear scanline search." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1486" tag="operation_1486" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1486" tag="operation_1486" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QRect  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1487" tag="operation_1487" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1487" tag="operation_1487" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1492" tag="operation_1492" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1492" tag="operation_1492" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1494" tag="operation_1494" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1494" tag="operation_1494" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return Q_UINT8*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1499" tag="operation_1499" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1499" tag="operation_1499" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1505" tag="operation_1505" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1505" tag="operation_1505" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="  Converts the paint device to a different colorspace" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1509" tag="operation_1509" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1509" tag="operation_1509" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Fill this paint device with the data from img;" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1512" tag="operation_1512" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1512" tag="operation_1512" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Create an RGBA QImage from a rectangle in the paint device.&amp;#010;&amp;#010;x, y left-top point of the rect of pixels&amp;#010;w, h width and height in pixels&amp;#010;profile RGB profile to use in conversion. May be 0, in which&amp;#010;case it's up to the colour strategy to choose a profile (most&amp;#010;like sRGB)." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1518" tag="operation_1518" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Create an RGBA QImage from a rectangle in the paint device.&amp;#010;&amp;#010;The dimensions is so that it takes what is currently on screen. relies on the image() to return an image.&amp;#010;profile RGB profile to use in conversion. May be 0, in which&amp;#010;case it's up to the colour strategy to choose a profile (most&amp;#010;like sRGB)." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1520" tag="operation_1520" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1520" tag="operation_1520" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1521" tag="operation_1521" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1521" tag="operation_1521" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1523" tag="operation_1523" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1523" tag="operation_1523" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Fill c and opacity with the values found at x and y.&amp;#010;The color values will be transformed from the profile of&amp;#010; this paint device to the display profile.&amp;#010;&amp;#010;@return true if the operation was succesful." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1529" tag="operation_1529" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1529" tag="operation_1529" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Set the specified pixel to the specified color. Note that this&amp;#010;bypasses KisPainter. the PaintDevice is here used as an equivalent&amp;#010;to QImage, not QPixmap. This means that this is not undoable; also,&amp;#010;there is no compositing with an existing value at this location.&amp;#010;&amp;#010; The color values will be transformed from the display profile to&amp;#010; the paint device profile.&amp;#010;&amp;#010;@return true if the operation was succesful" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1534" tag="operation_1534" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1534" tag="operation_1534" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Return a KisPixel wrapper around these bytes. If there are not enough&amp;#010;bytes, bad things will happen. XXX: use vectors?" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1536" tag="operation_1536" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1536" tag="operation_1536" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param bytes &amp;#010;@return KisPixelRO  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1539" tag="operation_1539" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1539" tag="operation_1539" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1540" tag="operation_1540" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1540" tag="operation_1540" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisStrategyColorSpaceSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1541" tag="operation_1541" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1541" tag="operation_1541" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Return the icm profile associated with this layer, or&amp;#010;the profile associated with the image if the color space of&amp;#010;this layer is the same as the color space of the image,&amp;#010;or 0." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1542" tag="operation_1542" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1542" tag="operation_1542" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Set the profile associated with this layer to the specified profile&amp;#010;or reset to 0 if the profile does not have the same colorspace signature&amp;#010;as the color model associated with this paint device." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1544" tag="operation_1544" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1544" tag="operation_1544" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return CompositeOp  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1545" tag="operation_1545" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1545" tag="operation_1545" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param compositeOp &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1547" tag="operation_1547" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1547" tag="operation_1547" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1548" tag="operation_1548" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1549" tag="operation_1549" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1549" tag="operation_1549" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1551" tag="operation_1551" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1551" tag="operation_1551" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param y &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1553" tag="operation_1553" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1553" tag="operation_1553" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Return the number of bytes a pixel takes" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1554" tag="operation_1554" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1554" tag="operation_1554" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Return the number of channels a pixel takes" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1555" tag="operation_1555" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1555" tag="operation_1555" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisImage*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1558" tag="operation_1558" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param image &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1560" tag="operation_1560" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1560" tag="operation_1560" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param sx &amp;#010;@param sy &amp;#010;@param m_progress &amp;#010;@param ftype &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1565" tag="operation_1565" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1565" tag="operation_1565" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param angle &amp;#010;@param m_progress &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1568" tag="operation_1568" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param angleX &amp;#010;@param angleY &amp;#010;@param m_progress &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1572" tag="operation_1572" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1572" tag="operation_1572" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xscale &amp;#010;@param yscale &amp;#010;@param xshear &amp;#010;@param yshear &amp;#010;@param denominator &amp;#010;@param xtranslate &amp;#010;@param ytranslate &amp;#010;@param m_progress &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1581" tag="operation_1581" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1581" tag="operation_1581" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Mirror the device along the X axis" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1582" tag="operation_1582" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1582" tag="operation_1582" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Mirror the device along the Y axis" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1583" tag="operation_1583" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1583" tag="operation_1583" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisMemento*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1584" tag="operation_1584" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1584" tag="operation_1584" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param memento &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1586" tag="operation_1586" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1586" tag="operation_1586" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param memento &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1588" tag="operation_1588" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="This function return an iterator which points to the first pixel of an rectangle" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1594" tag="operation_1594" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1594" tag="operation_1594" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="This function return an iterator which points to the first pixel of a horizontal line" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1599" tag="operation_1599" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1599" tag="operation_1599" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="This function return an iterator which points to the first pixel of a vertical line" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1604" tag="operation_1604" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1604" tag="operation_1604" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Get the current selection or create one if this layers hasn't got a selection yet." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1605" tag="operation_1605" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1605" tag="operation_1605" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Set the specified selection object as the active selection for this layer" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1607" tag="operation_1607" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1607" tag="operation_1607" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Adds the specified selection to the currently active selection for this layer" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1609" tag="operation_1609" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1609" tag="operation_1609" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Subtracts the specified selection from the currently active selection for this layer" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1611" tag="operation_1611" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1611" tag="operation_1611" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Whether there is a valid selection for this layer." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1612" tag="operation_1612" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1612" tag="operation_1612" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Removes the current selection for this layer." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1613" tag="operation_1613" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1613" tag="operation_1613" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1615" tag="operation_1615" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1615" tag="operation_1615" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1617" tag="operation_1617" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1617" tag="operation_1617" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param percentage &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1620" tag="operation_1620" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1620" tag="operation_1620" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1621" tag="operation_1621" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1621" tag="operation_1621" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1622" tag="operation_1622" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1622" tag="operation_1622" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1624" tag="operation_1624" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1624" tag="operation_1624" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return KisPaintDevice&amp;  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1638" tag="operation_1638" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1638" tag="operation_1638" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1641" tag="operation_1641" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1641" tag="operation_1641" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1644" tag="operation_1644" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1644" tag="operation_1644" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
@@ -9397,366 +9397,366 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1433" field_type="1096849528" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1433" field_type="1096849528" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
+       <ccfdeclarationcodeblock parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type QObject to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type QObject from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1436" field_type="6619252" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1436" field_type="6619252" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
+       <ccfdeclarationcodeblock parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1627" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1627" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisImage* m_owner;" >
+       <ccfdeclarationcodeblock parent_id="1627" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisImage* m_owner;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1627" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1627" text="return m_owner;" >
+       <codeaccessormethod accessType="0" parent_id="1627" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1627" text="return m_owner;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_owner&amp;#010;&amp;#010;@return the value of m_owner" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1627" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1627" text="m_owner = value;" >
+       <codeaccessormethod accessType="1" parent_id="1627" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1627" text="m_owner = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_owner&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1628" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1628" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1628" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDataManager* m_datamanager;" >
+       <ccfdeclarationcodeblock parent_id="1628" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDataManager* m_datamanager;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1628" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1628" text="return m_datamanager;" >
+       <codeaccessormethod accessType="0" parent_id="1628" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1628" text="return m_datamanager;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_datamanager&amp;#010;&amp;#010;@return the value of m_datamanager" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1628" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1628" text="m_datamanager = value;" >
+       <codeaccessormethod accessType="1" parent_id="1628" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1628" text="m_datamanager = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_datamanager&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1629" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1629" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1629" tag="tblock_5" canDelete="false" indentLevel="1" text="private Q_INT32 m_x;" >
+       <ccfdeclarationcodeblock parent_id="1629" tag="tblock_5" canDelete="false" indentLevel="1" text="private Q_INT32 m_x;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1629" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1629" text="return m_x;" >
+       <codeaccessormethod accessType="0" parent_id="1629" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1629" text="return m_x;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_x&amp;#010;&amp;#010;@return the value of m_x" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1629" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1629" text="m_x = value;" >
+       <codeaccessormethod accessType="1" parent_id="1629" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1629" text="m_x = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_x&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1630" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1630" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1630" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_INT32 m_y;" >
+       <ccfdeclarationcodeblock parent_id="1630" tag="tblock_8" canDelete="false" indentLevel="1" text="private Q_INT32 m_y;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1630" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1630" text="return m_y;" >
+       <codeaccessormethod accessType="0" parent_id="1630" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1630" text="return m_y;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_y&amp;#010;&amp;#010;@return the value of m_y" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1630" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1630" text="m_y = value;" >
+       <codeaccessormethod accessType="1" parent_id="1630" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1630" text="m_y = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_y&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1631" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1631" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1631" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_visible;" >
+       <ccfdeclarationcodeblock parent_id="1631" tag="tblock_11" canDelete="false" indentLevel="1" text="private boolean m_visible;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1631" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1631" text="return m_visible;" >
+       <codeaccessormethod accessType="0" parent_id="1631" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1631" text="return m_visible;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_visible&amp;#010;&amp;#010;@return the value of m_visible" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1631" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1631" text="m_visible = value;" >
+       <codeaccessormethod accessType="1" parent_id="1631" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1631" text="m_visible = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_visible&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1632" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1632" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1632" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="1632" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_name;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1632" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1632" text="return m_name;" >
+       <codeaccessormethod accessType="0" parent_id="1632" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1632" text="return m_name;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1632" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1632" text="m_name = value;" >
+       <codeaccessormethod accessType="1" parent_id="1632" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1632" text="m_name = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1633" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1633" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Operation used to composite this layer with the layers _under_ this layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1633" tag="tblock_17" canDelete="false" indentLevel="1" text="private CompositeOp m_compositeOp;" >
+       <ccfdeclarationcodeblock parent_id="1633" tag="tblock_17" canDelete="false" indentLevel="1" text="private CompositeOp m_compositeOp;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Operation used to composite this layer with the layers _under_ this layer" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1633" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1633" text="return m_compositeOp;" >
+       <codeaccessormethod accessType="0" parent_id="1633" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1633" text="return m_compositeOp;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Operation used to composite this layer with the layers _under_ this layer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1633" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1633" text="m_compositeOp = value;" >
+       <codeaccessormethod accessType="1" parent_id="1633" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1633" text="m_compositeOp = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Operation used to composite this layer with the layers _under_ this layer" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1634" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1634" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1634" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+       <ccfdeclarationcodeblock parent_id="1634" tag="tblock_20" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1634" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1634" text="return m_colorStrategy;" >
+       <codeaccessormethod accessType="0" parent_id="1634" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1634" text="return m_colorStrategy;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1634" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1634" text="m_colorStrategy = value;" >
+       <codeaccessormethod accessType="1" parent_id="1634" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1634" text="m_colorStrategy = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1635" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1635" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Cached for quick access" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1635" tag="tblock_23" canDelete="false" indentLevel="1" text="private Q_INT32 m_pixelSize;" >
+       <ccfdeclarationcodeblock parent_id="1635" tag="tblock_23" canDelete="false" indentLevel="1" text="private Q_INT32 m_pixelSize;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Cached for quick access" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1635" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1635" text="return m_pixelSize;" >
+       <codeaccessormethod accessType="0" parent_id="1635" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1635" text="return m_pixelSize;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Cached for quick access" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1635" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1635" text="m_pixelSize = value;" >
+       <codeaccessormethod accessType="1" parent_id="1635" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1635" text="m_pixelSize = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Cached for quick access" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1636" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1636" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1636" tag="tblock_26" canDelete="false" indentLevel="1" text="private Q_INT32 m_nChannels;" >
+       <ccfdeclarationcodeblock parent_id="1636" tag="tblock_26" canDelete="false" indentLevel="1" text="private Q_INT32 m_nChannels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1636" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1636" text="return m_nChannels;" >
+       <codeaccessormethod accessType="0" parent_id="1636" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1636" text="return m_nChannels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_nChannels&amp;#010;&amp;#010;@return the value of m_nChannels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1636" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1636" text="m_nChannels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1636" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1636" text="m_nChannels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_nChannels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1637" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1637" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1637" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+       <ccfdeclarationcodeblock parent_id="1637" tag="tblock_29" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1637" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1637" text="return m_profile;" >
+       <codeaccessormethod accessType="0" parent_id="1637" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1637" text="return m_profile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1637" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1637" text="m_profile = value;" >
+       <codeaccessormethod accessType="1" parent_id="1637" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1637" text="m_profile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1647" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Whether there is a selection valid for this layer" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1647" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_hasSelection;" >
+       <ccfdeclarationcodeblock parent_id="1647" tag="tblock_32" canDelete="false" indentLevel="1" text="private boolean m_hasSelection;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Whether there is a selection valid for this layer" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1647" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1647" text="return m_hasSelection;" >
+       <codeaccessormethod accessType="0" parent_id="1647" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1647" text="return m_hasSelection;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Whether there is a selection valid for this layer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1647" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1647" text="m_hasSelection = value;" >
+       <codeaccessormethod accessType="1" parent_id="1647" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1647" text="m_hasSelection = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Whether there is a selection valid for this layer" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1648" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Contains the actual selection. For now, there can be only// one selection per layer. XXX: is this a limitation?" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1648" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisSelectionSP m_selection;" >
+       <ccfdeclarationcodeblock parent_id="1648" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisSelectionSP m_selection;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Contains the actual selection. For now, there can be only// one selection per layer. XXX: is this a limitation?" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1648" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1648" text="return m_selection;" >
+       <codeaccessormethod accessType="0" parent_id="1648" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1648" text="return m_selection;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Contains the actual selection. For now, there can be only// one selection per layer. XXX: is this a limitation?" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1648" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1648" text="m_selection = value;" >
+       <codeaccessormethod accessType="1" parent_id="1648" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1648" text="m_selection = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Contains the actual selection. For now, there can be only// one selection per layer. XXX: is this a limitation?" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1649" field_type="6357102" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1649" field_type="6357102" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSelection  = new KisSelection ( );" >
+       <ccfdeclarationcodeblock parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSelection  = new KisSelection ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisSelection to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisSelection from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -9764,7 +9764,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="389" tqparent_class="389" fileExt=".java" fileName="KisPaintDeviceSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="389" parent_class="389" fileExt=".java" fileName="KisPaintDeviceSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9776,7 +9776,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="389" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="389" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintDeviceSP&amp;#010;" />
        </header>
@@ -9839,7 +9839,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="390" tqparent_class="390" fileExt=".java" fileName="vKisPaintDeviceSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="390" parent_class="390" fileExt=".java" fileName="vKisPaintDeviceSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9851,7 +9851,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="390" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="390" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisPaintDeviceSP&amp;#010;" />
        </header>
@@ -9914,7 +9914,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="391" tqparent_class="391" fileExt=".java" fileName="vKisPaintDeviceSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="391" parent_class="391" fileExt=".java" fileName="vKisPaintDeviceSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -9926,7 +9926,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="391" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="391" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisPaintDeviceSP_it&amp;#010;" />
        </header>
@@ -9989,7 +9989,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="392" tqparent_class="392" fileExt=".java" fileName="vKisPaintDeviceSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="392" parent_class="392" fileExt=".java" fileName="vKisPaintDeviceSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10001,7 +10001,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="392" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="392" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisPaintDeviceSP_cit&amp;#010;" />
        </header>
@@ -10064,7 +10064,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="393" tqparent_class="393" fileExt=".java" fileName="KisLayer" >
+    <classifiercodedocument writeOutCode="true" package="" id="393" parent_class="393" fileExt=".java" fileName="KisLayer" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10076,7 +10076,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="393" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="393" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisLayer&amp;#010;" />
        </header>
@@ -10139,7 +10139,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="394" tqparent_class="394" fileExt=".java" fileName="KisLayerSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="394" parent_class="394" fileExt=".java" fileName="KisLayerSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10151,7 +10151,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="394" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="394" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisLayerSP&amp;#010;" />
        </header>
@@ -10214,7 +10214,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="395" tqparent_class="395" fileExt=".java" fileName="vKisLayerSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="395" parent_class="395" fileExt=".java" fileName="vKisLayerSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10226,7 +10226,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="395" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="395" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisLayerSP&amp;#010;" />
        </header>
@@ -10289,7 +10289,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="396" tqparent_class="396" fileExt=".java" fileName="vKisLayerSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="396" parent_class="396" fileExt=".java" fileName="vKisLayerSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10301,7 +10301,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="396" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="396" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisLayerSP_it&amp;#010;" />
        </header>
@@ -10364,7 +10364,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="397" tqparent_class="397" fileExt=".java" fileName="vKisLayerSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="397" parent_class="397" fileExt=".java" fileName="vKisLayerSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10376,7 +10376,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="397" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="397" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisLayerSP_cit&amp;#010;" />
        </header>
@@ -10439,7 +10439,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="398" tqparent_class="398" fileExt=".java" fileName="KisSelection" >
+    <classifiercodedocument writeOutCode="true" package="" id="398" parent_class="398" fileExt=".java" fileName="KisSelection" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10451,7 +10451,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="398" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="398" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisSelection&amp;#010;KisSelection contains a byte-map representation of a layer, where&amp;#010;the value of a byte signifies whether a corresponding pixel is selected, or not.&amp;#010;" />
        </header>
@@ -10461,17 +10461,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1671" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDeviceSP m_parentLayer;" >
+          <ccfdeclarationcodeblock parent_id="1671" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDeviceSP m_parentLayer;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1672" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisColorSpaceAlphaSP m_alpha;" >
+          <ccfdeclarationcodeblock parent_id="1672" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisColorSpaceAlphaSP m_alpha;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1673" tag="tblock_5" canDelete="false" indentLevel="1" text="private QColor m_tqmaskColor;" >
+          <ccfdeclarationcodeblock parent_id="1673" tag="tblock_5" canDelete="false" indentLevel="1" text="private QColor m_maskColor;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -10505,34 +10505,34 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1671" text="return m_parentLayer;" >
+              <codeaccessormethod accessType="0" parent_id="1671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1671" text="return m_parentLayer;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_parentLayer&amp;#010;&amp;#010;@return the value of m_parentLayer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1671" text="m_parentLayer = value;" >
+              <codeaccessormethod accessType="1" parent_id="1671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1671" text="m_parentLayer = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_parentLayer&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1672" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1672" text="return m_alpha;" >
+              <codeaccessormethod accessType="0" parent_id="1672" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1672" text="return m_alpha;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alpha&amp;#010;&amp;#010;@return the value of m_alpha" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1672" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1672" text="m_alpha = value;" >
+              <codeaccessormethod accessType="1" parent_id="1672" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1672" text="m_alpha = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alpha&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1673" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1673" text="return m_tqmaskColor;" >
+              <codeaccessormethod accessType="0" parent_id="1673" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1673" text="return m_maskColor;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqmaskColor&amp;#010;&amp;#010;@return the value of m_tqmaskColor" />
+                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_maskColor&amp;#010;&amp;#010;@return the value of m_maskColor" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1673" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1673" text="m_tqmaskColor = value;" >
+              <codeaccessormethod accessType="1" parent_id="1673" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1673" text="m_maskColor = value;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqmaskColor&amp;#010;&amp;#010;" />
+                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_maskColor&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
              </textblocks>
@@ -10550,47 +10550,47 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1652" tag="operation_1652" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1652" tag="operation_1652" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1655" tag="operation_1655" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1655" tag="operation_1655" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param layer &amp;#010;@param name &amp;#010;@param c &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1659" tag="operation_1659" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1659" tag="operation_1659" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1660" tag="operation_1660" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1660" tag="operation_1660" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="// 	// Returns selectedness, or 0 if invalid coordinates// 	QUANTUM selected(Q_INT32 x, Q_INT32 y);// // 	void setSelected(Q_INT32 x, Q_INT32 y, QUANTUM s);" />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1661" tag="operation_1661" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1661" tag="operation_1661" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1663" tag="operation_1663" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1663" tag="operation_1663" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1665" tag="operation_1665" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1665" tag="operation_1665" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param r &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1667" tag="operation_1667" canDelete="false" indentLevel="1" >
+            <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." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1670" tag="operation_1670" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1670" tag="operation_1670" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QRect  " />
              </header>
@@ -10606,104 +10606,104 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1649" field_type="49" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1649" field_type="49" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisPaintDevice  = new KisPaintDevice ( );" >
+       <ccfdeclarationcodeblock parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisPaintDevice  = new KisPaintDevice ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisPaintDevice to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisPaintDevice from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1649" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1649" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1671" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDeviceSP m_parentLayer;" >
+       <ccfdeclarationcodeblock parent_id="1671" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDeviceSP m_parentLayer;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1671" text="return m_parentLayer;" >
+       <codeaccessormethod accessType="0" parent_id="1671" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1671" text="return m_parentLayer;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_parentLayer&amp;#010;&amp;#010;@return the value of m_parentLayer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1671" text="m_parentLayer = value;" >
+       <codeaccessormethod accessType="1" parent_id="1671" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1671" text="m_parentLayer = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_parentLayer&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1672" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1672" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1672" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisColorSpaceAlphaSP m_alpha;" >
+       <ccfdeclarationcodeblock parent_id="1672" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisColorSpaceAlphaSP m_alpha;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1672" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1672" text="return m_alpha;" >
+       <codeaccessormethod accessType="0" parent_id="1672" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1672" text="return m_alpha;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alpha&amp;#010;&amp;#010;@return the value of m_alpha" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1672" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1672" text="m_alpha = value;" >
+       <codeaccessormethod accessType="1" parent_id="1672" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1672" text="m_alpha = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alpha&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1673" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1673" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1673" tag="tblock_5" canDelete="false" indentLevel="1" text="private QColor m_tqmaskColor;" >
+       <ccfdeclarationcodeblock parent_id="1673" tag="tblock_5" canDelete="false" indentLevel="1" text="private QColor m_maskColor;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1673" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1673" text="return m_tqmaskColor;" >
+       <codeaccessormethod accessType="0" parent_id="1673" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1673" text="return m_maskColor;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqmaskColor&amp;#010;&amp;#010;@return the value of m_tqmaskColor" />
+         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_maskColor&amp;#010;&amp;#010;@return the value of m_maskColor" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1673" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1673" text="m_tqmaskColor = value;" >
+       <codeaccessormethod accessType="1" parent_id="1673" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1673" text="m_maskColor = value;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqmaskColor&amp;#010;&amp;#010;" />
+         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_maskColor&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="399" tqparent_class="399" fileExt=".java" fileName="KisSelectionSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="399" parent_class="399" fileExt=".java" fileName="KisSelectionSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10715,7 +10715,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="399" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="399" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisSelectionSP&amp;#010;" />
        </header>
@@ -10778,7 +10778,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="400" tqparent_class="400" fileExt=".java" fileName="vKisSelectionSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="400" parent_class="400" fileExt=".java" fileName="vKisSelectionSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10790,7 +10790,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="400" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="400" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisSelectionSP&amp;#010;" />
        </header>
@@ -10853,7 +10853,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="401" tqparent_class="401" fileExt=".java" fileName="vKisSelectionSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="401" parent_class="401" fileExt=".java" fileName="vKisSelectionSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10865,7 +10865,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="401" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="401" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisSelectionSP_it&amp;#010;" />
        </header>
@@ -10928,7 +10928,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="402" tqparent_class="402" fileExt=".java" fileName="vKisSelectionSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="402" parent_class="402" fileExt=".java" fileName="vKisSelectionSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -10940,7 +10940,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="402" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="402" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisSelectionSP_cit&amp;#010;" />
        </header>
@@ -11003,7 +11003,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="403" tqparent_class="403" fileExt=".java" fileName="KisBackground" >
+    <classifiercodedocument writeOutCode="true" package="" id="403" parent_class="403" fileExt=".java" fileName="KisBackground" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11015,7 +11015,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="403" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="403" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBackground&amp;#010;" />
        </header>
@@ -11078,7 +11078,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="404" tqparent_class="404" fileExt=".java" fileName="KisBackgroundSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="404" parent_class="404" fileExt=".java" fileName="KisBackgroundSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11090,7 +11090,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="404" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="404" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBackgroundSP&amp;#010;" />
        </header>
@@ -11153,7 +11153,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="405" tqparent_class="405" fileExt=".java" fileName="KisHistogram" >
+    <classifiercodedocument writeOutCode="true" package="" id="405" parent_class="405" fileExt=".java" fileName="KisHistogram" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11165,7 +11165,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="405" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="405" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisHistogram&amp;#010;" />
        </header>
@@ -11228,7 +11228,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="406" tqparent_class="406" fileExt=".java" fileName="KisHistogramSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="406" parent_class="406" fileExt=".java" fileName="KisHistogramSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11240,7 +11240,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="406" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="406" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisHistogramSP&amp;#010;" />
        </header>
@@ -11303,7 +11303,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="407" tqparent_class="407" fileExt=".java" fileName="vKisHistogramSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="407" parent_class="407" fileExt=".java" fileName="vKisHistogramSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11315,7 +11315,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="407" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="407" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisHistogramSP&amp;#010;" />
        </header>
@@ -11378,7 +11378,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="408" tqparent_class="408" fileExt=".java" fileName="vKisHistogramSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="408" parent_class="408" fileExt=".java" fileName="vKisHistogramSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11390,7 +11390,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="408" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="408" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisHistogramSP_it&amp;#010;" />
        </header>
@@ -11453,7 +11453,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="409" tqparent_class="409" fileExt=".java" fileName="vKisHistogramSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="409" parent_class="409" fileExt=".java" fileName="vKisHistogramSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11465,7 +11465,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="409" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="409" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisHistogramSP_cit&amp;#010;" />
        </header>
@@ -11528,7 +11528,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="410" tqparent_class="410" fileExt=".java" fileName="KisPaintOp" >
+    <classifiercodedocument writeOutCode="true" package="" id="410" parent_class="410" fileExt=".java" fileName="KisPaintOp" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11540,7 +11540,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="410" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="410" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintOp&amp;#010;" />
        </header>
@@ -11603,7 +11603,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="411" tqparent_class="411" fileExt=".java" fileName="KisPaintOpSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="411" parent_class="411" fileExt=".java" fileName="KisPaintOpSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11615,7 +11615,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="411" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="411" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintOpSP&amp;#010;" />
        </header>
@@ -11678,7 +11678,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="412" tqparent_class="412" fileExt=".java" fileName="KisPaintOpFactory" >
+    <classifiercodedocument writeOutCode="true" package="" id="412" parent_class="412" fileExt=".java" fileName="KisPaintOpFactory" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11690,7 +11690,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="412" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="412" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintOpFactory&amp;#010;" />
        </header>
@@ -11753,7 +11753,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="413" tqparent_class="413" fileExt=".java" fileName="KisPaintOpFactorySP" >
+    <classifiercodedocument writeOutCode="true" package="" id="413" parent_class="413" fileExt=".java" fileName="KisPaintOpFactorySP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11765,7 +11765,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="413" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="413" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintOpFactorySP&amp;#010;" />
        </header>
@@ -11828,7 +11828,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="414" tqparent_class="414" fileExt=".java" fileName="KisToolFactory" >
+    <classifiercodedocument writeOutCode="true" package="" id="414" parent_class="414" fileExt=".java" fileName="KisToolFactory" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11840,7 +11840,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="414" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="414" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisToolFactory&amp;#010;" />
        </header>
@@ -11903,7 +11903,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="415" tqparent_class="415" fileExt=".java" fileName="KisToolFactorySP" >
+    <classifiercodedocument writeOutCode="true" package="" id="415" parent_class="415" fileExt=".java" fileName="KisToolFactorySP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11915,7 +11915,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="415" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="415" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisToolFactorySP&amp;#010;" />
        </header>
@@ -11978,7 +11978,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="416" tqparent_class="416" fileExt=".java" fileName="KisPluginFactory" >
+    <classifiercodedocument writeOutCode="true" package="" id="416" parent_class="416" fileExt=".java" fileName="KisPluginFactory" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -11990,7 +11990,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="416" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="416" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPluginFactory&amp;#010;" />
        </header>
@@ -12053,7 +12053,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="417" tqparent_class="417" fileExt=".java" fileName="KisPluginFactorySP" >
+    <classifiercodedocument writeOutCode="true" package="" id="417" parent_class="417" fileExt=".java" fileName="KisPluginFactorySP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12065,7 +12065,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="417" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="417" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPluginFactorySP&amp;#010;" />
        </header>
@@ -12128,7 +12128,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="418" tqparent_class="418" fileExt=".java" fileName="KisTool" >
+    <classifiercodedocument writeOutCode="true" package="" id="418" parent_class="418" fileExt=".java" fileName="KisTool" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12140,7 +12140,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="418" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="418" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTool&amp;#010;" />
        </header>
@@ -12203,7 +12203,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="419" tqparent_class="419" fileExt=".java" fileName="KisToolSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="419" parent_class="419" fileExt=".java" fileName="KisToolSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12215,7 +12215,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="419" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="419" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisToolSP&amp;#010;" />
        </header>
@@ -12278,7 +12278,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="420" tqparent_class="420" fileExt=".java" fileName="vKisTool" >
+    <classifiercodedocument writeOutCode="true" package="" id="420" parent_class="420" fileExt=".java" fileName="vKisTool" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12290,7 +12290,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="420" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="420" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisTool&amp;#010;" />
        </header>
@@ -12353,7 +12353,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="421" tqparent_class="421" fileExt=".java" fileName="vKisTool_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="421" parent_class="421" fileExt=".java" fileName="vKisTool_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12365,7 +12365,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="421" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="421" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisTool_it&amp;#010;" />
        </header>
@@ -12428,7 +12428,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="422" tqparent_class="422" fileExt=".java" fileName="vKisTool_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="422" parent_class="422" fileExt=".java" fileName="vKisTool_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12440,7 +12440,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="422" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="422" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisTool_cit&amp;#010;" />
        </header>
@@ -12503,7 +12503,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="423" tqparent_class="423" fileExt=".java" fileName="KisDataManager" >
+    <classifiercodedocument writeOutCode="true" package="" id="423" parent_class="423" fileExt=".java" fileName="KisDataManager" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12515,7 +12515,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="423" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="423" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDataManager&amp;#010;// Change the following two lines to switch (at compiletime) to another datamanager/**&amp;#010;KisDataManager defines the interface that modules responsible for&amp;#010;storing and retrieving data must inmplement. Data modules, like&amp;#010;the tile manager, are responsible for:&amp;#010;&amp;#010;* Storing undo/redo data&amp;#010;* Offering ordererd and unordered iterators over rects of pixels&amp;#010;* (eventually) efficiently loading and saving data in a format&amp;#010;that may allow deferred loading.&amp;#010;&amp;#010;A datamanager knows nothing about the type of pixel data except&amp;#010;how many Q_UINT8's a single pixel takes." />
        </header>
@@ -12567,92 +12567,92 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1352" tag="operation_1352" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1352" tag="operation_1352" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pixelSize &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1354" tag="operation_1354" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1354" tag="operation_1354" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dm &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1357" tag="operation_1357" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1357" tag="operation_1357" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisMemento*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1360" tag="operation_1360" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param memento &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1362" tag="operation_1362" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1362" tag="operation_1362" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param memento &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1364" tag="operation_1364" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1364" tag="operation_1364" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param store &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1367" tag="operation_1367" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1367" tag="operation_1367" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param store &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1369" tag="operation_1369" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1369" tag="operation_1369" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_UINT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1370" tag="operation_1370" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1376" tag="operation_1376" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1376" tag="operation_1376" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1381" tag="operation_1381" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1381" tag="operation_1381" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param rect &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1383" tag="operation_1383" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1383" tag="operation_1383" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@param def &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1390" tag="operation_1390" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1390" tag="operation_1390" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@param def &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1397" tag="operation_1397" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1397" tag="operation_1397" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param sx &amp;#010;@param sy &amp;#010;@param dx &amp;#010;@param dy &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1406" tag="operation_1406" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1406" tag="operation_1406" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@return Q_UINT8*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1409" tag="operation_1409" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1409" tag="operation_1409" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param data &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1413" tag="operation_1413" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1413" tag="operation_1413" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return Q_UINT8*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1418" tag="operation_1418" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1418" tag="operation_1418" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param data &amp;#010;@param x &amp;#010;@param y &amp;#010;@param w &amp;#010;@param h &amp;#010;@return void  " />
              </header>
@@ -12668,36 +12668,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1349" field_type="6619252" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1349" field_type="6619252" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisTiledDataManager  = new KisTiledDataManager ( );" >
+       <ccfdeclarationcodeblock parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisTiledDataManager  = new KisTiledDataManager ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisTiledDataManager to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisTiledDataManager from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -12705,7 +12705,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="424" tqparent_class="424" fileExt=".java" fileName="KisDataManagerSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="424" parent_class="424" fileExt=".java" fileName="KisDataManagerSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12717,7 +12717,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="424" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="424" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDataManagerSP&amp;#010;" />
        </header>
@@ -12780,7 +12780,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="425" tqparent_class="425" fileExt=".java" fileName="vKisSegments" >
+    <classifiercodedocument writeOutCode="true" package="" id="425" parent_class="425" fileExt=".java" fileName="vKisSegments" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12792,7 +12792,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="425" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="425" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisSegments&amp;#010;" />
        </header>
@@ -12855,7 +12855,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="426" tqparent_class="426" fileExt=".java" fileName="KisStrategyColorSpace" >
+    <classifiercodedocument writeOutCode="true" package="" id="426" parent_class="426" fileExt=".java" fileName="KisStrategyColorSpace" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12867,7 +12867,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="426" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="426" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisStrategyColorSpace&amp;#010;" />
        </header>
@@ -12930,7 +12930,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="427" tqparent_class="427" fileExt=".java" fileName="KisStrategyColorSpaceSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="427" parent_class="427" fileExt=".java" fileName="KisStrategyColorSpaceSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -12942,7 +12942,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="427" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="427" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisStrategyColorSpaceSP&amp;#010;" />
        </header>
@@ -13005,7 +13005,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="428" tqparent_class="428" fileExt=".java" fileName="KisStrategyColorSpaceMap" >
+    <classifiercodedocument writeOutCode="true" package="" id="428" parent_class="428" fileExt=".java" fileName="KisStrategyColorSpaceMap" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13017,7 +13017,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="428" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="428" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisStrategyColorSpaceMap&amp;#010;" />
        </header>
@@ -13080,7 +13080,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="429" tqparent_class="429" fileExt=".java" fileName="KisGuide" >
+    <classifiercodedocument writeOutCode="true" package="" id="429" parent_class="429" fileExt=".java" fileName="KisGuide" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13092,7 +13092,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="429" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="429" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGuide&amp;#010;Kivio - Visual Modelling and Flowcharting&amp;#010;Copyright (C) 2000-2001 theKompany.com &amp; Dave Marotti&amp;#010;Copyright (C) 2002 Patrick Julien &lt;freak@codepimps.org>&amp;#010;&amp;#010;This program is free software; you can redistribute it and/or&amp;#010;modify it under the terms of the GNU General Public License&amp;#010;as published by the Free Software Foundation; either version 2&amp;#010;of the License, or (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." />
        </header>
@@ -13102,27 +13102,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="684" tag="tblock_0" canDelete="false" indentLevel="1" text="public double pos;" >
+          <ccfdeclarationcodeblock parent_id="684" tag="tblock_0" canDelete="false" indentLevel="1" text="public double pos;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="686" tag="tblock_2" canDelete="false" indentLevel="1" text="public QPixmap buffer;" >
+          <ccfdeclarationcodeblock parent_id="686" tag="tblock_2" canDelete="false" indentLevel="1" text="public QPixmap buffer;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="687" tag="tblock_5" canDelete="false" indentLevel="1" text="public boolean hasBuffer;" >
+          <ccfdeclarationcodeblock parent_id="687" tag="tblock_5" canDelete="false" indentLevel="1" text="public boolean hasBuffer;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" text="public boolean selected;" >
+          <ccfdeclarationcodeblock parent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" text="public boolean selected;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public Qt.Qt::Orientation orient;" >
+          <ccfdeclarationcodeblock parent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public Qt.Qt::Orientation orient;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -13156,52 +13156,52 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="684" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="684" text="return pos;" >
+              <codeaccessormethod accessType="0" parent_id="684" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="684" text="return pos;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of pos&amp;#010;&amp;#010;@return the value of pos" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="684" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="684" text="pos = value;" >
+              <codeaccessormethod accessType="1" parent_id="684" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="684" text="pos = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of pos&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="686" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="686" text="return buffer;" >
+              <codeaccessormethod accessType="0" parent_id="686" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="686" text="return buffer;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of buffer&amp;#010;&amp;#010;@return the value of buffer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="686" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="686" text="buffer = value;" >
+              <codeaccessormethod accessType="1" parent_id="686" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="686" text="buffer = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of buffer&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="687" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="687" text="return hasBuffer;" >
+              <codeaccessormethod accessType="0" parent_id="687" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="687" text="return hasBuffer;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of hasBuffer&amp;#010;&amp;#010;@return the value of hasBuffer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="687" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="687" text="hasBuffer = value;" >
+              <codeaccessormethod accessType="1" parent_id="687" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="687" text="hasBuffer = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of hasBuffer&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="688" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="688" text="return selected;" >
+              <codeaccessormethod accessType="0" parent_id="688" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="688" text="return selected;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of selected&amp;#010;&amp;#010;@return the value of selected" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="688" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="688" text="selected = value;" >
+              <codeaccessormethod accessType="1" parent_id="688" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="688" text="selected = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of selected&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="689" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="689" text="return orient;" >
+              <codeaccessormethod accessType="0" parent_id="689" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="689" text="return orient;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of orient&amp;#010;&amp;#010;@return the value of orient" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="689" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="689" text="orient = value;" >
+              <codeaccessormethod accessType="1" parent_id="689" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="689" text="orient = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of orient&amp;#010;&amp;#010;" />
                </header>
@@ -13221,27 +13221,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="676" tag="operation_676" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="676" tag="operation_676" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param o &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="680" tag="operation_680" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="680" tag="operation_680" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="681" tag="operation_681" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="681" tag="operation_681" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Qt.Qt::Orientation  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="682" tag="operation_682" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="682" tag="operation_682" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return double  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="683" tag="operation_683" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="683" tag="operation_683" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
@@ -13257,136 +13257,136 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="673" field_type="5439563" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="673" field_type="5439563" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
+       <ccfdeclarationcodeblock parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="684" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="684" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="684" tag="tblock_0" canDelete="false" indentLevel="1" text="public double pos;" >
+       <ccfdeclarationcodeblock parent_id="684" tag="tblock_0" canDelete="false" indentLevel="1" text="public double pos;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="684" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="684" text="return pos;" >
+       <codeaccessormethod accessType="0" parent_id="684" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="684" text="return pos;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of pos&amp;#010;&amp;#010;@return the value of pos" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="684" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="684" text="pos = value;" >
+       <codeaccessormethod accessType="1" parent_id="684" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="684" text="pos = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of pos&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="686" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="686" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="686" tag="tblock_2" canDelete="false" indentLevel="1" text="public QPixmap buffer;" >
+       <ccfdeclarationcodeblock parent_id="686" tag="tblock_2" canDelete="false" indentLevel="1" text="public QPixmap buffer;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="686" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="686" text="return buffer;" >
+       <codeaccessormethod accessType="0" parent_id="686" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="686" text="return buffer;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of buffer&amp;#010;&amp;#010;@return the value of buffer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="686" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="686" text="buffer = value;" >
+       <codeaccessormethod accessType="1" parent_id="686" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="686" text="buffer = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of buffer&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="687" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="687" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="687" tag="tblock_5" canDelete="false" indentLevel="1" text="public boolean hasBuffer;" >
+       <ccfdeclarationcodeblock parent_id="687" tag="tblock_5" canDelete="false" indentLevel="1" text="public boolean hasBuffer;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="687" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="687" text="return hasBuffer;" >
+       <codeaccessormethod accessType="0" parent_id="687" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="687" text="return hasBuffer;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of hasBuffer&amp;#010;&amp;#010;@return the value of hasBuffer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="687" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="687" text="hasBuffer = value;" >
+       <codeaccessormethod accessType="1" parent_id="687" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="687" text="hasBuffer = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of hasBuffer&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="688" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="688" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" text="public boolean selected;" >
+       <ccfdeclarationcodeblock parent_id="688" tag="tblock_8" canDelete="false" indentLevel="1" text="public boolean selected;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="688" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="688" text="return selected;" >
+       <codeaccessormethod accessType="0" parent_id="688" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="688" text="return selected;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of selected&amp;#010;&amp;#010;@return the value of selected" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="688" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="688" text="selected = value;" >
+       <codeaccessormethod accessType="1" parent_id="688" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="688" text="selected = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of selected&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="689" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="689" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public Qt.Qt::Orientation orient;" >
+       <ccfdeclarationcodeblock parent_id="689" tag="tblock_11" canDelete="false" indentLevel="1" text="public Qt.Qt::Orientation orient;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="689" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="689" text="return orient;" >
+       <codeaccessormethod accessType="0" parent_id="689" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="689" text="return orient;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of orient&amp;#010;&amp;#010;@return the value of orient" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="689" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="689" text="orient = value;" >
+       <codeaccessormethod accessType="1" parent_id="689" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="689" text="orient = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of orient&amp;#010;&amp;#010;" />
         </header>
@@ -13394,7 +13394,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="430" tqparent_class="430" fileExt=".java" fileName="KisGuideSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="430" parent_class="430" fileExt=".java" fileName="KisGuideSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13406,7 +13406,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="430" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="430" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGuideSP&amp;#010;" />
        </header>
@@ -13469,7 +13469,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="431" tqparent_class="431" fileExt=".java" fileName="KisAlphaMask" >
+    <classifiercodedocument writeOutCode="true" package="" id="431" parent_class="431" fileExt=".java" fileName="KisAlphaMask" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13481,7 +13481,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="431" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="431" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAlphaMask&amp;#010;" />
        </header>
@@ -13544,7 +13544,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="432" tqparent_class="432" fileExt=".java" fileName="KisAlphaMaskSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="432" parent_class="432" fileExt=".java" fileName="KisAlphaMaskSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13556,7 +13556,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="432" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="432" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAlphaMaskSP&amp;#010;" />
        </header>
@@ -13619,7 +13619,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="433" tqparent_class="433" fileExt=".java" fileName="KisColorSpaceAlpha" >
+    <classifiercodedocument writeOutCode="true" package="" id="433" parent_class="433" fileExt=".java" fileName="KisColorSpaceAlpha" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13631,7 +13631,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="433" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="433" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisColorSpaceAlpha&amp;#010;" />
        </header>
@@ -13694,7 +13694,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="434" tqparent_class="434" fileExt=".java" fileName="KisColorSpaceAlphaSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="434" parent_class="434" fileExt=".java" fileName="KisColorSpaceAlphaSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13706,7 +13706,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="434" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="434" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisColorSpaceAlphaSP&amp;#010;" />
        </header>
@@ -13769,7 +13769,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="435" tqparent_class="435" fileExt=".java" fileName="KisFilter" >
+    <classifiercodedocument writeOutCode="true" package="" id="435" parent_class="435" fileExt=".java" fileName="KisFilter" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13781,7 +13781,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="435" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="435" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilter&amp;#010;" />
        </header>
@@ -13844,7 +13844,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="436" tqparent_class="436" fileExt=".java" fileName="KisFilterSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="436" parent_class="436" fileExt=".java" fileName="KisFilterSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13856,7 +13856,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="436" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="436" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilterSP&amp;#010;" />
        </header>
@@ -13919,7 +13919,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="437" tqparent_class="437" fileExt=".java" fileName="KisProfile" >
+    <classifiercodedocument writeOutCode="true" package="" id="437" parent_class="437" fileExt=".java" fileName="KisProfile" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -13931,7 +13931,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="437" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="437" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProfile&amp;#010; kis_profile.h - part of Krayon&amp;#010;&amp;#010; Copyright (c) 2000 Matthias Elter  &lt;elter@kde.org>&amp;#010;               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;" />
        </header>
@@ -13941,42 +13941,42 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="949" tag="tblock_0" canDelete="false" indentLevel="1" text="private cmsHPROFILE m_profile;" >
+          <ccfdeclarationcodeblock parent_id="949" tag="tblock_0" canDelete="false" indentLevel="1" text="private cmsHPROFILE m_profile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="950" tag="tblock_2" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
+          <ccfdeclarationcodeblock parent_id="950" tag="tblock_2" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="951" tag="tblock_5" canDelete="false" indentLevel="1" text="private icProfileClassSignature m_deviceClass;" >
+          <ccfdeclarationcodeblock parent_id="951" tag="tblock_5" canDelete="false" indentLevel="1" text="private icProfileClassSignature m_deviceClass;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="952" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_productName;" >
+          <ccfdeclarationcodeblock parent_id="952" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_productName;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="953" tag="tblock_11" canDelete="false" indentLevel="1" text="private QString m_productDescription;" >
+          <ccfdeclarationcodeblock parent_id="953" tag="tblock_11" canDelete="false" indentLevel="1" text="private QString m_productDescription;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="954" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_productInfo;" >
+          <ccfdeclarationcodeblock parent_id="954" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_productInfo;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="955" tag="tblock_17" canDelete="false" indentLevel="1" text="private QString m_manufacturer;" >
+          <ccfdeclarationcodeblock parent_id="955" tag="tblock_17" canDelete="false" indentLevel="1" text="private QString m_manufacturer;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="956" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT32 m_lcmsColorType;" >
+          <ccfdeclarationcodeblock parent_id="956" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT32 m_lcmsColorType;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -14010,82 +14010,82 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="949" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="949" text="return m_profile;" >
+              <codeaccessormethod accessType="0" parent_id="949" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="949" text="return m_profile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="949" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="949" text="m_profile = value;" >
+              <codeaccessormethod accessType="1" parent_id="949" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="949" text="m_profile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="950" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="950" text="return m_colorSpaceSignature;" >
+              <codeaccessormethod accessType="0" parent_id="950" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="950" text="return m_colorSpaceSignature;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorSpaceSignature&amp;#010;&amp;#010;@return the value of m_colorSpaceSignature" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="950" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="950" text="m_colorSpaceSignature = value;" >
+              <codeaccessormethod accessType="1" parent_id="950" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="950" text="m_colorSpaceSignature = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorSpaceSignature&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="951" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="951" text="return m_deviceClass;" >
+              <codeaccessormethod accessType="0" parent_id="951" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="951" text="return m_deviceClass;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_deviceClass&amp;#010;&amp;#010;@return the value of m_deviceClass" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="951" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="951" text="m_deviceClass = value;" >
+              <codeaccessormethod accessType="1" parent_id="951" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="951" text="m_deviceClass = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_deviceClass&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="952" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="952" text="return m_productName;" >
+              <codeaccessormethod accessType="0" parent_id="952" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="952" text="return m_productName;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_productName&amp;#010;&amp;#010;@return the value of m_productName" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="952" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="952" text="m_productName = value;" >
+              <codeaccessormethod accessType="1" parent_id="952" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="952" text="m_productName = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_productName&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="953" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="953" text="return m_productDescription;" >
+              <codeaccessormethod accessType="0" parent_id="953" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="953" text="return m_productDescription;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_productDescription&amp;#010;&amp;#010;@return the value of m_productDescription" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="953" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="953" text="m_productDescription = value;" >
+              <codeaccessormethod accessType="1" parent_id="953" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="953" text="m_productDescription = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_productDescription&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="954" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="954" text="return m_productInfo;" >
+              <codeaccessormethod accessType="0" parent_id="954" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="954" text="return m_productInfo;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_productInfo&amp;#010;&amp;#010;@return the value of m_productInfo" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="954" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="954" text="m_productInfo = value;" >
+              <codeaccessormethod accessType="1" parent_id="954" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="954" text="m_productInfo = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_productInfo&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="955" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="955" text="return m_manufacturer;" >
+              <codeaccessormethod accessType="0" parent_id="955" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="955" text="return m_manufacturer;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_manufacturer&amp;#010;&amp;#010;@return the value of m_manufacturer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="955" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="955" text="m_manufacturer = value;" >
+              <codeaccessormethod accessType="1" parent_id="955" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="955" text="m_manufacturer = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_manufacturer&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="956" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="956" text="return m_lcmsColorType;" >
+              <codeaccessormethod accessType="0" parent_id="956" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="956" text="return m_lcmsColorType;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_lcmsColorType&amp;#010;&amp;#010;@return the value of m_lcmsColorType" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="956" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="956" text="m_lcmsColorType = value;" >
+              <codeaccessormethod accessType="1" parent_id="956" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="956" text="m_lcmsColorType = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_lcmsColorType&amp;#010;&amp;#010;" />
                </header>
@@ -14105,82 +14105,82 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="923" tag="operation_923" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="923" tag="operation_923" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param colorType &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="926" tag="operation_926" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="926" tag="operation_926" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param file &amp;#010;@param colorType &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="929" tag="operation_929" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="929" tag="operation_929" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param profile &amp;#010;@param colorType &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="934" tag="operation_934" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="934" tag="operation_934" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="935" tag="operation_935" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="935" tag="operation_935" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="936" tag="operation_936" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="936" tag="operation_936" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="937" tag="operation_937" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="937" tag="operation_937" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QImage  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="938" tag="operation_938" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="938" tag="operation_938" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return icColorSpaceSignature  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="940" tag="operation_940" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="940" tag="operation_940" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return icProfileClassSignature  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="942" tag="operation_942" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="942" tag="operation_942" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="943" tag="operation_943" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="943" tag="operation_943" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="944" tag="operation_944" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="944" tag="operation_944" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="945" tag="operation_945" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="945" tag="operation_945" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="946" tag="operation_946" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="946" tag="operation_946" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return cmsHPROFILE  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="947" tag="operation_947" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="947" tag="operation_947" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_UINT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="948" tag="operation_948" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="948" tag="operation_948" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
@@ -14196,231 +14196,231 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="917" field_type="2097267" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="917" field_type="2097267" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisResource  = new KisResource ( );" >
+       <ccfdeclarationcodeblock parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisResource  = new KisResource ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisResource to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisResource from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="920" field_type="7536741" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="920" field_type="7536741" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
+       <ccfdeclarationcodeblock parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="949" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="949" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="949" tag="tblock_0" canDelete="false" indentLevel="1" text="private cmsHPROFILE m_profile;" >
+       <ccfdeclarationcodeblock parent_id="949" tag="tblock_0" canDelete="false" indentLevel="1" text="private cmsHPROFILE m_profile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="949" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="949" text="return m_profile;" >
+       <codeaccessormethod accessType="0" parent_id="949" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="949" text="return m_profile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="949" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="949" text="m_profile = value;" >
+       <codeaccessormethod accessType="1" parent_id="949" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="949" text="m_profile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="950" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="950" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="950" tag="tblock_2" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
+       <ccfdeclarationcodeblock parent_id="950" tag="tblock_2" canDelete="false" indentLevel="1" text="private icColorSpaceSignature m_colorSpaceSignature;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="950" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="950" text="return m_colorSpaceSignature;" >
+       <codeaccessormethod accessType="0" parent_id="950" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="950" text="return m_colorSpaceSignature;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorSpaceSignature&amp;#010;&amp;#010;@return the value of m_colorSpaceSignature" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="950" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="950" text="m_colorSpaceSignature = value;" >
+       <codeaccessormethod accessType="1" parent_id="950" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="950" text="m_colorSpaceSignature = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorSpaceSignature&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="951" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="951" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="951" tag="tblock_5" canDelete="false" indentLevel="1" text="private icProfileClassSignature m_deviceClass;" >
+       <ccfdeclarationcodeblock parent_id="951" tag="tblock_5" canDelete="false" indentLevel="1" text="private icProfileClassSignature m_deviceClass;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="951" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="951" text="return m_deviceClass;" >
+       <codeaccessormethod accessType="0" parent_id="951" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="951" text="return m_deviceClass;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_deviceClass&amp;#010;&amp;#010;@return the value of m_deviceClass" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="951" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="951" text="m_deviceClass = value;" >
+       <codeaccessormethod accessType="1" parent_id="951" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="951" text="m_deviceClass = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_deviceClass&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="952" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="952" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="952" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_productName;" >
+       <ccfdeclarationcodeblock parent_id="952" tag="tblock_8" canDelete="false" indentLevel="1" text="private QString m_productName;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="952" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="952" text="return m_productName;" >
+       <codeaccessormethod accessType="0" parent_id="952" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="952" text="return m_productName;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_productName&amp;#010;&amp;#010;@return the value of m_productName" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="952" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="952" text="m_productName = value;" >
+       <codeaccessormethod accessType="1" parent_id="952" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="952" text="m_productName = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_productName&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="953" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="953" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="953" tag="tblock_11" canDelete="false" indentLevel="1" text="private QString m_productDescription;" >
+       <ccfdeclarationcodeblock parent_id="953" tag="tblock_11" canDelete="false" indentLevel="1" text="private QString m_productDescription;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="953" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="953" text="return m_productDescription;" >
+       <codeaccessormethod accessType="0" parent_id="953" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="953" text="return m_productDescription;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_productDescription&amp;#010;&amp;#010;@return the value of m_productDescription" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="953" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="953" text="m_productDescription = value;" >
+       <codeaccessormethod accessType="1" parent_id="953" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="953" text="m_productDescription = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_productDescription&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="954" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="954" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="954" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_productInfo;" >
+       <ccfdeclarationcodeblock parent_id="954" tag="tblock_14" canDelete="false" indentLevel="1" text="private QString m_productInfo;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="954" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="954" text="return m_productInfo;" >
+       <codeaccessormethod accessType="0" parent_id="954" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="954" text="return m_productInfo;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_productInfo&amp;#010;&amp;#010;@return the value of m_productInfo" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="954" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="954" text="m_productInfo = value;" >
+       <codeaccessormethod accessType="1" parent_id="954" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="954" text="m_productInfo = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_productInfo&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="955" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="955" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="955" tag="tblock_17" canDelete="false" indentLevel="1" text="private QString m_manufacturer;" >
+       <ccfdeclarationcodeblock parent_id="955" tag="tblock_17" canDelete="false" indentLevel="1" text="private QString m_manufacturer;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="955" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="955" text="return m_manufacturer;" >
+       <codeaccessormethod accessType="0" parent_id="955" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="955" text="return m_manufacturer;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_manufacturer&amp;#010;&amp;#010;@return the value of m_manufacturer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="955" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="955" text="m_manufacturer = value;" >
+       <codeaccessormethod accessType="1" parent_id="955" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="955" text="m_manufacturer = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_manufacturer&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="956" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="956" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="956" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT32 m_lcmsColorType;" >
+       <ccfdeclarationcodeblock parent_id="956" tag="tblock_20" canDelete="false" indentLevel="1" text="private Q_UINT32 m_lcmsColorType;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="956" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="956" text="return m_lcmsColorType;" >
+       <codeaccessormethod accessType="0" parent_id="956" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="956" text="return m_lcmsColorType;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_lcmsColorType&amp;#010;&amp;#010;@return the value of m_lcmsColorType" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="956" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="956" text="m_lcmsColorType = value;" >
+       <codeaccessormethod accessType="1" parent_id="956" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="956" text="m_lcmsColorType = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_lcmsColorType&amp;#010;&amp;#010;" />
         </header>
@@ -14428,7 +14428,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="438" tqparent_class="438" fileExt=".java" fileName="KisProfileSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="438" parent_class="438" fileExt=".java" fileName="KisProfileSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14440,7 +14440,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="438" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="438" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProfileSP&amp;#010;" />
        </header>
@@ -14503,7 +14503,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="439" tqparent_class="439" fileExt=".java" fileName="vKisProfileSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="439" parent_class="439" fileExt=".java" fileName="vKisProfileSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14515,7 +14515,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="439" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="439" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisProfileSP&amp;#010;" />
        </header>
@@ -14578,7 +14578,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="440" tqparent_class="440" fileExt=".java" fileName="KisChannelInfo" >
+    <classifiercodedocument writeOutCode="true" package="" id="440" parent_class="440" fileExt=".java" fileName="KisChannelInfo" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14590,7 +14590,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="440" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="440" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisChannelInfo&amp;#010;" />
        </header>
@@ -14653,7 +14653,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="441" tqparent_class="441" fileExt=".java" fileName="KisChannelInfoSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="441" parent_class="441" fileExt=".java" fileName="KisChannelInfoSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14665,7 +14665,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="441" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="441" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisChannelInfoSP&amp;#010;" />
        </header>
@@ -14728,7 +14728,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="442" tqparent_class="442" fileExt=".java" fileName="vKisChannelInfoSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="442" parent_class="442" fileExt=".java" fileName="vKisChannelInfoSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14740,7 +14740,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="442" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="442" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisChannelInfoSP&amp;#010;" />
        </header>
@@ -14803,7 +14803,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="443" tqparent_class="443" fileExt=".java" fileName="vKisChannelInfoSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="443" parent_class="443" fileExt=".java" fileName="vKisChannelInfoSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14815,7 +14815,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="443" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="443" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisChannelInfoSP_it&amp;#010;" />
        </header>
@@ -14878,7 +14878,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="444" tqparent_class="444" fileExt=".java" fileName="vKisChannelInfoSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="444" parent_class="444" fileExt=".java" fileName="vKisChannelInfoSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14890,7 +14890,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="444" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="444" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisChannelInfoSP_cit&amp;#010;" />
        </header>
@@ -14953,7 +14953,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="445" tqparent_class="445" fileExt=".java" fileName="KisAnnotation" >
+    <classifiercodedocument writeOutCode="true" package="" id="445" parent_class="445" fileExt=".java" fileName="KisAnnotation" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -14965,7 +14965,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="445" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="445" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAnnotation&amp;#010;This file is part of the KDE project&amp;#010;&amp;#010;Copyright (c) 2005 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;An data extension mechanism for Chalk.&amp;#010;&amp;#010;An annotation can be of something like a QByteArray or a QString op a more specific&amp;#010;datatype that can be attached to an image (or maybe later, if needed, to a layer)&amp;#010;and contains data that must be associated with an image for purposes of import/export." />
        </header>
@@ -14975,17 +14975,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="670" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_type;" >
+          <ccfdeclarationcodeblock parent_id="670" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_type;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="671" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_description;" >
+          <ccfdeclarationcodeblock parent_id="671" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_description;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="672" tag="tblock_5" canDelete="false" indentLevel="1" text="private QByteArray m_annotation;" >
+          <ccfdeclarationcodeblock parent_id="672" tag="tblock_5" canDelete="false" indentLevel="1" text="private QByteArray m_annotation;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -15019,32 +15019,32 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="670" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="670" text="return m_type;" >
+              <codeaccessormethod accessType="0" parent_id="670" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="670" text="return m_type;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_type&amp;#010;&amp;#010;@return the value of m_type" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="670" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="670" text="m_type = value;" >
+              <codeaccessormethod accessType="1" parent_id="670" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="670" text="m_type = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_type&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="671" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="671" text="return m_description;" >
+              <codeaccessormethod accessType="0" parent_id="671" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="671" text="return m_description;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_description&amp;#010;&amp;#010;@return the value of m_description" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="671" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="671" text="m_description = value;" >
+              <codeaccessormethod accessType="1" parent_id="671" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="671" text="m_description = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_description&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="672" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="672" text="return m_annotation;" >
+              <codeaccessormethod accessType="0" parent_id="672" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="672" text="return m_annotation;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_annotation&amp;#010;&amp;#010;@return the value of m_annotation" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="672" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="672" text="m_annotation = value;" >
+              <codeaccessormethod accessType="1" parent_id="672" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="672" text="m_annotation = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_annotation&amp;#010;&amp;#010;" />
                </header>
@@ -15064,22 +15064,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="659" tag="operation_659" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="659" tag="operation_659" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param type &amp;#010;@param description &amp;#010;@param data &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="665" tag="operation_665" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="665" tag="operation_665" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString&amp;  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="667" tag="operation_667" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="667" tag="operation_667" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString&amp;  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="668" tag="operation_668" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="668" tag="operation_668" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QByteArray&amp;  " />
              </header>
@@ -15095,96 +15095,96 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="656" field_type="7209061" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="656" field_type="7209061" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
+       <ccfdeclarationcodeblock parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="670" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="670" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="670" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_type;" >
+       <ccfdeclarationcodeblock parent_id="670" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_type;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="670" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="670" text="return m_type;" >
+       <codeaccessormethod accessType="0" parent_id="670" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="670" text="return m_type;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_type&amp;#010;&amp;#010;@return the value of m_type" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="670" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="670" text="m_type = value;" >
+       <codeaccessormethod accessType="1" parent_id="670" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="670" text="m_type = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_type&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="671" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="671" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_description;" >
+       <ccfdeclarationcodeblock parent_id="671" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_description;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="671" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="671" text="return m_description;" >
+       <codeaccessormethod accessType="0" parent_id="671" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="671" text="return m_description;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_description&amp;#010;&amp;#010;@return the value of m_description" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="671" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="671" text="m_description = value;" >
+       <codeaccessormethod accessType="1" parent_id="671" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="671" text="m_description = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_description&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="672" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="672" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="672" tag="tblock_5" canDelete="false" indentLevel="1" text="private QByteArray m_annotation;" >
+       <ccfdeclarationcodeblock parent_id="672" tag="tblock_5" canDelete="false" indentLevel="1" text="private QByteArray m_annotation;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="672" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="672" text="return m_annotation;" >
+       <codeaccessormethod accessType="0" parent_id="672" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="672" text="return m_annotation;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_annotation&amp;#010;&amp;#010;@return the value of m_annotation" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="672" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="672" text="m_annotation = value;" >
+       <codeaccessormethod accessType="1" parent_id="672" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="672" text="m_annotation = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_annotation&amp;#010;&amp;#010;" />
         </header>
@@ -15192,7 +15192,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="446" tqparent_class="446" fileExt=".java" fileName="KisAnnotationSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="446" parent_class="446" fileExt=".java" fileName="KisAnnotationSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15204,7 +15204,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="446" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="446" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAnnotationSP&amp;#010;" />
        </header>
@@ -15267,7 +15267,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="447" tqparent_class="447" fileExt=".java" fileName="vKisAnnotationSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="447" parent_class="447" fileExt=".java" fileName="vKisAnnotationSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15279,7 +15279,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="447" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="447" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisAnnotationSP&amp;#010;" />
        </header>
@@ -15342,7 +15342,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="448" tqparent_class="448" fileExt=".java" fileName="vKisAnnotationSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="448" parent_class="448" fileExt=".java" fileName="vKisAnnotationSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15354,7 +15354,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="448" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="448" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisAnnotationSP_it&amp;#010;" />
        </header>
@@ -15417,7 +15417,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="449" tqparent_class="449" fileExt=".java" fileName="vKisAnnotationSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="449" parent_class="449" fileExt=".java" fileName="vKisAnnotationSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15429,7 +15429,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="449" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="449" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisAnnotationSP_cit&amp;#010;" />
        </header>
@@ -15492,7 +15492,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="450" tqparent_class="450" fileExt=".java" fileName="KisFileFormat" >
+    <classifiercodedocument writeOutCode="true" package="" id="450" parent_class="450" fileExt=".java" fileName="KisFileFormat" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15504,7 +15504,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="450" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="450" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFileFormat&amp;#010;" />
        </header>
@@ -15567,7 +15567,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="451" tqparent_class="451" fileExt=".java" fileName="KisFileFormatSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="451" parent_class="451" fileExt=".java" fileName="KisFileFormatSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15579,7 +15579,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="451" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="451" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFileFormatSP&amp;#010;" />
        </header>
@@ -15642,7 +15642,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="452" tqparent_class="452" fileExt=".java" fileName="vKisFileFormatSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="452" parent_class="452" fileExt=".java" fileName="vKisFileFormatSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15654,7 +15654,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="452" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="452" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisFileFormatSP&amp;#010;" />
        </header>
@@ -15717,7 +15717,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="453" tqparent_class="453" fileExt=".java" fileName="vKisFileFormatSP_it" >
+    <classifiercodedocument writeOutCode="true" package="" id="453" parent_class="453" fileExt=".java" fileName="vKisFileFormatSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15729,7 +15729,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="453" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="453" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisFileFormatSP_it&amp;#010;" />
        </header>
@@ -15792,7 +15792,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="454" tqparent_class="454" fileExt=".java" fileName="vKisFileFormatSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="" id="454" parent_class="454" fileExt=".java" fileName="vKisFileFormatSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15804,7 +15804,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="454" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="454" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisFileFormatSP_cit&amp;#010;" />
        </header>
@@ -15867,7 +15867,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="455" tqparent_class="455" fileExt=".java" fileName=TQWIDGET_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="455" parent_class="455" fileExt=".java" fileName=TQWIDGET_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15879,7 +15879,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="455" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="455" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QWidget&amp;#010;" />
        </header>
@@ -15942,7 +15942,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="456" tqparent_class="456" fileExt=".java" fileName="KisRect" >
+    <classifiercodedocument writeOutCode="true" package="" id="456" parent_class="456" fileExt=".java" fileName="KisRect" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -15954,7 +15954,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="456" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="456" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRect&amp;#010;" />
        </header>
@@ -16017,7 +16017,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="457" tqparent_class="457" fileExt=".java" fileName="KisPoint" >
+    <classifiercodedocument writeOutCode="true" package="" id="457" parent_class="457" fileExt=".java" fileName="KisPoint" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16029,7 +16029,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="457" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="457" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPoint&amp;#010;" />
        </header>
@@ -16092,7 +16092,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="461" tqparent_class="461" fileExt=".java" fileName="QWidget*" >
+    <classifiercodedocument writeOutCode="true" package="" id="461" parent_class="461" fileExt=".java" fileName="QWidget*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16104,7 +16104,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="461" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="461" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QWidget*&amp;#010;" />
        </header>
@@ -16167,7 +16167,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="463" tqparent_class="463" fileExt=".java" fileName="Q_INT32" >
+    <classifiercodedocument writeOutCode="true" package="" id="463" parent_class="463" fileExt=".java" fileName="Q_INT32" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16179,7 +16179,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="463" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="463" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_INT32&amp;#010;" />
        </header>
@@ -16242,7 +16242,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="475" tqparent_class="475" fileExt=".java" fileName="QRect" >
+    <classifiercodedocument writeOutCode="true" package="" id="475" parent_class="475" fileExt=".java" fileName="QRect" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16254,7 +16254,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="475" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="475" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QRect&amp;#010;" />
        </header>
@@ -16317,7 +16317,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="476" tqparent_class="476" fileExt=".java" fileName="const QRect&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="476" parent_class="476" fileExt=".java" fileName="const QRect&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16329,7 +16329,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="476" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="476" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QRect&amp;&amp;#010;" />
        </header>
@@ -16392,7 +16392,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="494" tqparent_class="494" fileExt=".java" fileName="const KisRect&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="494" parent_class="494" fileExt=".java" fileName="const KisRect&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16404,7 +16404,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="494" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="494" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisRect&amp;&amp;#010;" />
        </header>
@@ -16467,7 +16467,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="497" tqparent_class="497" fileExt=".java" fileName=TQPOINT_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="497" parent_class="497" fileExt=".java" fileName=TQPOINT_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16479,7 +16479,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="497" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="497" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPoint&amp;#010;" />
        </header>
@@ -16542,7 +16542,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="498" tqparent_class="498" fileExt=".java" fileName="const QPoint&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="498" parent_class="498" fileExt=".java" fileName="const QPoint&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16554,7 +16554,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="498" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="498" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QPoint&amp;&amp;#010;" />
        </header>
@@ -16617,7 +16617,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="501" tqparent_class="501" fileExt=".java" fileName="const KisPoint&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="501" parent_class="501" fileExt=".java" fileName="const KisPoint&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16629,7 +16629,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="501" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="501" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisPoint&amp;&amp;#010;" />
        </header>
@@ -16692,7 +16692,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="508" tqparent_class="508" fileExt=".java" fileName="Q_INT32*" >
+    <classifiercodedocument writeOutCode="true" package="" id="508" parent_class="508" fileExt=".java" fileName="Q_INT32*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16704,7 +16704,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="508" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="508" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_INT32*&amp;#010;" />
        </header>
@@ -16767,7 +16767,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="523" tqparent_class="523" fileExt=".java" fileName="const KisCanvasControllerInterface&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="523" parent_class="523" fileExt=".java" fileName="const KisCanvasControllerInterface&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16779,7 +16779,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="523" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="523" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisCanvasControllerInterface&amp;&amp;#010;" />
        </header>
@@ -16842,7 +16842,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="527" tqparent_class="527" fileExt=".java" fileName="KisCanvasControllerInterface&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="527" parent_class="527" fileExt=".java" fileName="KisCanvasControllerInterface&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16854,7 +16854,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="527" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="527" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCanvasControllerInterface&amp;&amp;#010;" />
        </header>
@@ -16917,7 +16917,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="528" tqparent_class="528" fileExt=".java" fileName="KisPainterControllerInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="528" parent_class="528" fileExt=".java" fileName="KisPainterControllerInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -16929,7 +16929,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="528" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="528" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPainterControllerInterface&amp;#010;The canvas subject is the subset of operations that are directy available to&amp;#010;tools." />
        </header>
@@ -16981,137 +16981,137 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="580" tag="operation_580" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="580" tag="operation_580" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="581" tag="operation_581" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="581" tag="operation_581" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="582" tag="operation_582" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="582" tag="operation_582" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param observer &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="585" tag="operation_585" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="585" tag="operation_585" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param observer &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="587" tag="operation_587" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="587" tag="operation_587" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="588" tag="operation_588" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="588" tag="operation_588" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisImageSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="589" tag="operation_589" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="589" tag="operation_589" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="590" tag="operation_590" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="590" tag="operation_590" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QColor  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="592" tag="operation_592" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="592" tag="operation_592" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="595" tag="operation_595" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="595" tag="operation_595" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QColor  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="596" tag="operation_596" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="596" tag="operation_596" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param c &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="598" tag="operation_598" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="598" tag="operation_598" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisBrush*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="600" tag="operation_600" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="600" tag="operation_600" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisPattern*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="602" tag="operation_602" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="602" tag="operation_602" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisGradient*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="604" tag="operation_604" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="604" tag="operation_604" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return double  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="605" tag="operation_605" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="605" tag="operation_605" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisUndoAdapter*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="607" tag="operation_607" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="607" tag="operation_607" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisCanvasControllerInterface*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="609" tag="operation_609" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="609" tag="operation_609" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisToolControllerInterface*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="611" tag="operation_611" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="611" tag="operation_611" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KoDocument*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="613" tag="operation_613" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="613" tag="operation_613" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisProgressDisplayInterface*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="615" tag="operation_615" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="615" tag="operation_615" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisSelectionManager*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="617" tag="operation_617" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="617" tag="operation_617" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisFilterRegistry*  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="619" tag="operation_619" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="619" tag="operation_619" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@return KisFilterSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="621" tag="operation_621" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="621" tag="operation_621" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisIDList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="622" tag="operation_622" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="622" tag="operation_622" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return QCursor  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="625" tag="operation_625" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="625" tag="operation_625" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="628" tag="operation_628" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="628" tag="operation_628" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return KisCanvasSubject&amp;  " />
              </header>
@@ -17128,7 +17128,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="529" tqparent_class="529" fileExt=".java" fileName="KisCanvasObserver" >
+    <classifiercodedocument writeOutCode="true" package="" id="529" parent_class="529" fileExt=".java" fileName="KisCanvasObserver" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17140,7 +17140,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="529" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="529" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCanvasObserver&amp;#010;" />
        </header>
@@ -17192,27 +17192,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="530" tag="operation_530" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="530" tag="operation_530" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="531" tag="operation_531" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="531" tag="operation_531" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="532" tag="operation_532" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="532" tag="operation_532" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param subject &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="535" tag="operation_535" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="535" tag="operation_535" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="538" tag="operation_538" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="538" tag="operation_538" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return KisCanvasObserver&amp;  " />
              </header>
@@ -17229,7 +17229,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="533" tqparent_class="533" fileExt=".java" fileName="KisCanvasSubject*" >
+    <classifiercodedocument writeOutCode="true" package="" id="533" parent_class="533" fileExt=".java" fileName="KisCanvasSubject*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17241,7 +17241,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="533" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="533" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCanvasSubject*&amp;#010;" />
        </header>
@@ -17304,7 +17304,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="536" tqparent_class="536" fileExt=".java" fileName="const KisCanvasObserver&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="536" parent_class="536" fileExt=".java" fileName="const KisCanvasObserver&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17316,7 +17316,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="536" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="536" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisCanvasObserver&amp;&amp;#010;" />
        </header>
@@ -17379,7 +17379,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="540" tqparent_class="540" fileExt=".java" fileName="KisCanvasObserver&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="540" parent_class="540" fileExt=".java" fileName="KisCanvasObserver&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17391,7 +17391,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="540" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="540" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCanvasObserver&amp;&amp;#010;" />
        </header>
@@ -17454,7 +17454,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="541" tqparent_class="541" fileExt=".java" fileName="KisID" >
+    <classifiercodedocument writeOutCode="true" package="" id="541" parent_class="541" fileExt=".java" fileName="KisID" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17466,7 +17466,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="541" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="541" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisID&amp;#010;This file is part of the KDE project&amp;#010;&amp;#010;Copyright (c) 2005 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;Chalk has a large number of extensible resources. Think:&amp;#010;&amp;#010;- Brushes&amp;#010;- Palettes&amp;#010;- Patterns&amp;#010;- Gradients&amp;#010;- Color models&amp;#010;- Filters&amp;#010;- Composition operations&amp;#010;- Paint operations&amp;#010;- Tools&amp;#010;- Docker tabs&amp;#010;&amp;#010;and more...&amp;#010;&amp;#010;Many of these resources are stored in KisGenericRegistry-based&amp;#010;registries. If we store these resources with a descriptive string&amp;#010;as a key use the same string in our UI, then our UI will not be&amp;#010;localizable, because the identifications of particular resources&amp;#010;will be stored in files, and those files need to be exchangeable.&amp;#010;&amp;#010;So, instead we use and ID class that couples an identification&amp;#010;string that will be the same across all languages, an i18n-able&amp;#010;string that will be used in comboboxes and that has a fast equality&amp;#010;operator to make it well suited for use as key in a registry map.&amp;#010;&amp;#010;That last bit has not been solved yet.&amp;#010;" />
        </header>
@@ -17476,12 +17476,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="568" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_id;" >
+          <ccfdeclarationcodeblock parent_id="568" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_id;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="569" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_name;" >
+          <ccfdeclarationcodeblock parent_id="569" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_name;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -17515,22 +17515,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="568" text="return m_id;" >
+              <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="568" text="return m_id;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_id&amp;#010;&amp;#010;@return the value of m_id" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="568" text="m_id = value;" >
+              <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="568" text="m_id = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_id&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="569" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="569" text="return m_name;" >
+              <codeaccessormethod accessType="0" parent_id="569" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="569" text="return m_name;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="569" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="569" text="m_name = value;" >
+              <codeaccessormethod accessType="1" parent_id="569" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="569" text="m_name = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
                </header>
@@ -17550,42 +17550,42 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="546" tag="operation_546" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="546" tag="operation_546" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="547" tag="operation_547" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="547" tag="operation_547" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="552" tag="operation_552" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="552" tag="operation_552" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="553" tag="operation_553" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="553" tag="operation_553" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="554" tag="operation_554" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="554" tag="operation_554" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="559" tag="operation_559" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="559" tag="operation_559" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="562" tag="operation_562" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="562" tag="operation_562" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="565" tag="operation_565" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="565" tag="operation_565" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@param  &amp;#010;@return boolean  " />
              </header>
@@ -17601,76 +17601,76 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="543" field_type="7471201" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="543" field_type="7471201" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
+       <ccfdeclarationcodeblock parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KShared  = new KShared ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KShared to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KShared from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="568" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="568" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_id;" >
+       <ccfdeclarationcodeblock parent_id="568" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_id;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="568" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="568" text="return m_id;" >
+       <codeaccessormethod accessType="0" parent_id="568" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="568" text="return m_id;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_id&amp;#010;&amp;#010;@return the value of m_id" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="568" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="568" text="m_id = value;" >
+       <codeaccessormethod accessType="1" parent_id="568" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="568" text="m_id = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_id&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="569" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="569" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="569" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="569" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_name;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="569" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="569" text="return m_name;" >
+       <codeaccessormethod accessType="0" parent_id="569" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="569" text="return m_name;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="569" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="569" text="m_name = value;" >
+       <codeaccessormethod accessType="1" parent_id="569" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="569" text="m_name = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
         </header>
@@ -17678,7 +17678,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="542" tqparent_class="542" fileExt=".java" fileName="KShared" >
+    <classifiercodedocument writeOutCode="true" package="" id="542" parent_class="542" fileExt=".java" fileName="KShared" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17690,7 +17690,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="542" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="542" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KShared&amp;#010;" />
        </header>
@@ -17752,211 +17752,211 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="543" field_type="2" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="543" field_type="2" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisID  = new KisID ( );" >
+       <ccfdeclarationcodeblock parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisID  = new KisID ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisID to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisID from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="543" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="543" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="656" field_type="2097220" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="656" field_type="2097220" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisAnnotation  = new KisAnnotation ( );" >
+       <ccfdeclarationcodeblock parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisAnnotation  = new KisAnnotation ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisAnnotation to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisAnnotation from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="656" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="656" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="673" field_type="7602291" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="673" field_type="7602291" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisGuide  = new KisGuide ( );" >
+       <ccfdeclarationcodeblock parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisGuide  = new KisGuide ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisGuide to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisGuide from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="673" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="673" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="920" field_type="2687008" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="920" field_type="2687008" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisProfile  = new KisProfile ( );" >
+       <ccfdeclarationcodeblock parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisProfile  = new KisProfile ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisProfile to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisProfile from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="920" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="920" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="964" field_type="2097192" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="964" field_type="2097192" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisImage  = new KisImage ( );" >
+       <ccfdeclarationcodeblock parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisImage  = new KisImage ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisImage to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisImage from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="964" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="964" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1436" field_type="7274528" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1436" field_type="7274528" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisPaintDevice  = new KisPaintDevice ( );" >
+       <ccfdeclarationcodeblock parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisPaintDevice  = new KisPaintDevice ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisPaintDevice to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisPaintDevice from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1436" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1436" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -17964,7 +17964,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="548" tqparent_class="548" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="548" parent_class="548" fileExt=".java" fileName=TQSTRING_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -17976,7 +17976,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="548" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="548" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QString&amp;#010;" />
        </header>
@@ -18039,7 +18039,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="549" tqparent_class="549" fileExt=".java" fileName="const QString&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="549" parent_class="549" fileExt=".java" fileName="const QString&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18051,7 +18051,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="549" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="549" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QString&amp;&amp;#010;" />
        </header>
@@ -18114,7 +18114,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="555" tqparent_class="555" fileExt=".java" fileName="const KisID&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="555" parent_class="555" fileExt=".java" fileName="const KisID&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18126,7 +18126,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="555" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="555" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisID&amp;&amp;#010;" />
        </header>
@@ -18189,7 +18189,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="558" tqparent_class="558" fileExt=".java" fileName="bool" >
+    <classifiercodedocument writeOutCode="true" package="" id="558" parent_class="558" fileExt=".java" fileName="bool" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18201,7 +18201,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="558" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="558" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Bool&amp;#010;" />
        </header>
@@ -18264,7 +18264,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="570" tqparent_class="570" fileExt=".java" fileName="KisIDList" >
+    <classifiercodedocument writeOutCode="true" package="" id="570" parent_class="570" fileExt=".java" fileName="KisIDList" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18276,7 +18276,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="570" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="570" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisIDList&amp;#010;" />
        </header>
@@ -18339,7 +18339,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="571" tqparent_class="571" fileExt=".java" fileName="KoDocument" >
+    <classifiercodedocument writeOutCode="true" package="" id="571" parent_class="571" fileExt=".java" fileName="KoDocument" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18351,7 +18351,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="571" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="571" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoDocument&amp;#010;" />
        </header>
@@ -18414,7 +18414,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="572" tqparent_class="572" fileExt=".java" fileName="KisBrush" >
+    <classifiercodedocument writeOutCode="true" package="" id="572" parent_class="572" fileExt=".java" fileName="KisBrush" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18426,7 +18426,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="572" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="572" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBrush&amp;#010;" />
        </header>
@@ -18489,7 +18489,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="573" tqparent_class="573" fileExt=".java" fileName="KisGradient" >
+    <classifiercodedocument writeOutCode="true" package="" id="573" parent_class="573" fileExt=".java" fileName="KisGradient" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18501,7 +18501,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="573" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="573" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGradient&amp;#010;" />
        </header>
@@ -18564,7 +18564,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="574" tqparent_class="574" fileExt=".java" fileName="KisPattern" >
+    <classifiercodedocument writeOutCode="true" package="" id="574" parent_class="574" fileExt=".java" fileName="KisPattern" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18576,7 +18576,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="574" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="574" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPattern&amp;#010;" />
        </header>
@@ -18639,7 +18639,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="575" tqparent_class="575" fileExt=".java" fileName="KisUndoAdapter" >
+    <classifiercodedocument writeOutCode="true" package="" id="575" parent_class="575" fileExt=".java" fileName="KisUndoAdapter" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18651,7 +18651,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="575" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="575" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisUndoAdapter&amp;#010;" />
        </header>
@@ -18714,7 +18714,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="576" tqparent_class="576" fileExt=".java" fileName="KisProgressDisplayInterface" >
+    <classifiercodedocument writeOutCode="true" package="" id="576" parent_class="576" fileExt=".java" fileName="KisProgressDisplayInterface" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18726,7 +18726,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="576" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="576" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProgressDisplayInterface&amp;#010;" />
        </header>
@@ -18789,7 +18789,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="577" tqparent_class="577" fileExt=".java" fileName="KisSelectionManager" >
+    <classifiercodedocument writeOutCode="true" package="" id="577" parent_class="577" fileExt=".java" fileName="KisSelectionManager" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -18801,7 +18801,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="577" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="577" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisSelectionManager&amp;#010;The selection manager is responsible selections&amp;#010;and the clipboard." />
        </header>
@@ -18811,122 +18811,122 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1834" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisView* m_parent;" >
+          <ccfdeclarationcodeblock parent_id="1834" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisView* m_parent;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1835" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDoc* m_doc;" >
+          <ccfdeclarationcodeblock parent_id="1835" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDoc* m_doc;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1836" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisSelectionSP m_previousSelection;" >
+          <ccfdeclarationcodeblock parent_id="1836" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisSelectionSP m_previousSelection;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1838" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisClipboard* m_clipboard;" >
+          <ccfdeclarationcodeblock parent_id="1838" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisClipboard* m_clipboard;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private KAction* m_copy;" >
+          <ccfdeclarationcodeblock parent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private KAction* m_copy;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private KAction* m_cut;" >
+          <ccfdeclarationcodeblock parent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private KAction* m_cut;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private KAction* m_paste;" >
+          <ccfdeclarationcodeblock parent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private KAction* m_paste;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private KAction* m_selectAll;" >
+          <ccfdeclarationcodeblock parent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private KAction* m_selectAll;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private KAction* m_deselect;" >
+          <ccfdeclarationcodeblock parent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private KAction* m_deselect;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private KAction* m_clear;" >
+          <ccfdeclarationcodeblock parent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private KAction* m_clear;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private KAction* m_reselect;" >
+          <ccfdeclarationcodeblock parent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private KAction* m_reselect;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private KAction* m_invert;" >
+          <ccfdeclarationcodeblock parent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private KAction* m_invert;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private KAction* m_toNewLayer;" >
+          <ccfdeclarationcodeblock parent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private KAction* m_toNewLayer;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private KAction* m_feather;" >
+          <ccfdeclarationcodeblock parent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private KAction* m_feather;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private KAction* m_border;" >
+          <ccfdeclarationcodeblock parent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private KAction* m_border;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private KAction* m_expand;" >
+          <ccfdeclarationcodeblock parent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private KAction* m_expand;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private KAction* m_smooth;" >
+          <ccfdeclarationcodeblock parent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private KAction* m_smooth;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private KAction* m_contract;" >
+          <ccfdeclarationcodeblock parent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private KAction* m_contract;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private KAction* m_grow;" >
+          <ccfdeclarationcodeblock parent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private KAction* m_grow;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private KAction* m_similar;" >
+          <ccfdeclarationcodeblock parent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private KAction* m_similar;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private KAction* m_transform;" >
+          <ccfdeclarationcodeblock parent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private KAction* m_transform;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private KAction* m_load;" >
+          <ccfdeclarationcodeblock parent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private KAction* m_load;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private KAction* m_save;" >
+          <ccfdeclarationcodeblock parent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private KAction* m_save;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1859" tag="tblock_68" canDelete="false" indentLevel="1" text="private QPtrList m_pluginActions;" >
+          <ccfdeclarationcodeblock parent_id="1859" tag="tblock_68" canDelete="false" indentLevel="1" text="private QPtrList m_pluginActions;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -18960,242 +18960,242 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1834" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1834" text="return m_parent;" >
+              <codeaccessormethod accessType="0" parent_id="1834" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1834" text="return m_parent;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_parent&amp;#010;&amp;#010;@return the value of m_parent" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1834" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1834" text="m_parent = value;" >
+              <codeaccessormethod accessType="1" parent_id="1834" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1834" text="m_parent = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_parent&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1835" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1835" text="return m_doc;" >
+              <codeaccessormethod accessType="0" parent_id="1835" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1835" text="return m_doc;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_doc&amp;#010;&amp;#010;@return the value of m_doc" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1835" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1835" text="m_doc = value;" >
+              <codeaccessormethod accessType="1" parent_id="1835" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1835" text="m_doc = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_doc&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1836" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1836" text="return m_previousSelection;" >
+              <codeaccessormethod accessType="0" parent_id="1836" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1836" text="return m_previousSelection;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_previousSelection&amp;#010;&amp;#010;@return the value of m_previousSelection" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1836" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1836" text="m_previousSelection = value;" >
+              <codeaccessormethod accessType="1" parent_id="1836" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1836" text="m_previousSelection = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_previousSelection&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1838" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1838" text="return m_clipboard;" >
+              <codeaccessormethod accessType="0" parent_id="1838" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1838" text="return m_clipboard;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_clipboard&amp;#010;&amp;#010;@return the value of m_clipboard" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1838" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1838" text="m_clipboard = value;" >
+              <codeaccessormethod accessType="1" parent_id="1838" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1838" text="m_clipboard = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_clipboard&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1839" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1839" text="return m_copy;" >
+              <codeaccessormethod accessType="0" parent_id="1839" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1839" text="return m_copy;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_copy&amp;#010;&amp;#010;@return the value of m_copy" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1839" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1839" text="m_copy = value;" >
+              <codeaccessormethod accessType="1" parent_id="1839" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1839" text="m_copy = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_copy&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1840" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1840" text="return m_cut;" >
+              <codeaccessormethod accessType="0" parent_id="1840" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1840" text="return m_cut;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_cut&amp;#010;&amp;#010;@return the value of m_cut" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1840" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1840" text="m_cut = value;" >
+              <codeaccessormethod accessType="1" parent_id="1840" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1840" text="m_cut = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_cut&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1841" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1841" text="return m_paste;" >
+              <codeaccessormethod accessType="0" parent_id="1841" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1841" text="return m_paste;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paste&amp;#010;&amp;#010;@return the value of m_paste" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1841" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1841" text="m_paste = value;" >
+              <codeaccessormethod accessType="1" parent_id="1841" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1841" text="m_paste = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paste&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1842" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1842" text="return m_selectAll;" >
+              <codeaccessormethod accessType="0" parent_id="1842" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1842" text="return m_selectAll;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_selectAll&amp;#010;&amp;#010;@return the value of m_selectAll" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1842" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1842" text="m_selectAll = value;" >
+              <codeaccessormethod accessType="1" parent_id="1842" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1842" text="m_selectAll = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_selectAll&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1843" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1843" text="return m_deselect;" >
+              <codeaccessormethod accessType="0" parent_id="1843" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1843" text="return m_deselect;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_deselect&amp;#010;&amp;#010;@return the value of m_deselect" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1843" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1843" text="m_deselect = value;" >
+              <codeaccessormethod accessType="1" parent_id="1843" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1843" text="m_deselect = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_deselect&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1844" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1844" text="return m_clear;" >
+              <codeaccessormethod accessType="0" parent_id="1844" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1844" text="return m_clear;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_clear&amp;#010;&amp;#010;@return the value of m_clear" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1844" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1844" text="m_clear = value;" >
+              <codeaccessormethod accessType="1" parent_id="1844" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1844" text="m_clear = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_clear&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1845" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1845" text="return m_reselect;" >
+              <codeaccessormethod accessType="0" parent_id="1845" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1845" text="return m_reselect;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_reselect&amp;#010;&amp;#010;@return the value of m_reselect" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1845" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1845" text="m_reselect = value;" >
+              <codeaccessormethod accessType="1" parent_id="1845" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1845" text="m_reselect = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_reselect&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1846" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1846" text="return m_invert;" >
+              <codeaccessormethod accessType="0" parent_id="1846" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1846" text="return m_invert;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_invert&amp;#010;&amp;#010;@return the value of m_invert" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1846" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1846" text="m_invert = value;" >
+              <codeaccessormethod accessType="1" parent_id="1846" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1846" text="m_invert = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_invert&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1847" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1847" text="return m_toNewLayer;" >
+              <codeaccessormethod accessType="0" parent_id="1847" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1847" text="return m_toNewLayer;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toNewLayer&amp;#010;&amp;#010;@return the value of m_toNewLayer" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1847" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1847" text="m_toNewLayer = value;" >
+              <codeaccessormethod accessType="1" parent_id="1847" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1847" text="m_toNewLayer = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toNewLayer&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1848" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1848" text="return m_feather;" >
+              <codeaccessormethod accessType="0" parent_id="1848" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1848" text="return m_feather;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_feather&amp;#010;&amp;#010;@return the value of m_feather" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1848" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1848" text="m_feather = value;" >
+              <codeaccessormethod accessType="1" parent_id="1848" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1848" text="m_feather = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_feather&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1849" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1849" text="return m_border;" >
+              <codeaccessormethod accessType="0" parent_id="1849" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1849" text="return m_border;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_border&amp;#010;&amp;#010;@return the value of m_border" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1849" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1849" text="m_border = value;" >
+              <codeaccessormethod accessType="1" parent_id="1849" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1849" text="m_border = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_border&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1850" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1850" text="return m_expand;" >
+              <codeaccessormethod accessType="0" parent_id="1850" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1850" text="return m_expand;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_expand&amp;#010;&amp;#010;@return the value of m_expand" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1850" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1850" text="m_expand = value;" >
+              <codeaccessormethod accessType="1" parent_id="1850" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1850" text="m_expand = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_expand&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1851" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1851" text="return m_smooth;" >
+              <codeaccessormethod accessType="0" parent_id="1851" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1851" text="return m_smooth;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_smooth&amp;#010;&amp;#010;@return the value of m_smooth" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1851" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1851" text="m_smooth = value;" >
+              <codeaccessormethod accessType="1" parent_id="1851" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1851" text="m_smooth = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_smooth&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1852" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1852" text="return m_contract;" >
+              <codeaccessormethod accessType="0" parent_id="1852" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1852" text="return m_contract;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_contract&amp;#010;&amp;#010;@return the value of m_contract" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1852" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1852" text="m_contract = value;" >
+              <codeaccessormethod accessType="1" parent_id="1852" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1852" text="m_contract = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_contract&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1853" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1853" text="return m_grow;" >
+              <codeaccessormethod accessType="0" parent_id="1853" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1853" text="return m_grow;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_grow&amp;#010;&amp;#010;@return the value of m_grow" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1853" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1853" text="m_grow = value;" >
+              <codeaccessormethod accessType="1" parent_id="1853" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1853" text="m_grow = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_grow&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1854" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1854" text="return m_similar;" >
+              <codeaccessormethod accessType="0" parent_id="1854" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1854" text="return m_similar;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_similar&amp;#010;&amp;#010;@return the value of m_similar" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1854" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1854" text="m_similar = value;" >
+              <codeaccessormethod accessType="1" parent_id="1854" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1854" text="m_similar = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_similar&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1855" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1855" text="return m_transform;" >
+              <codeaccessormethod accessType="0" parent_id="1855" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1855" text="return m_transform;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_transform&amp;#010;&amp;#010;@return the value of m_transform" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1855" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1855" text="m_transform = value;" >
+              <codeaccessormethod accessType="1" parent_id="1855" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1855" text="m_transform = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_transform&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1856" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1856" text="return m_load;" >
+              <codeaccessormethod accessType="0" parent_id="1856" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1856" text="return m_load;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_load&amp;#010;&amp;#010;@return the value of m_load" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1856" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1856" text="m_load = value;" >
+              <codeaccessormethod accessType="1" parent_id="1856" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1856" text="m_load = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_load&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1857" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1857" text="return m_save;" >
+              <codeaccessormethod accessType="0" parent_id="1857" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1857" text="return m_save;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_save&amp;#010;&amp;#010;@return the value of m_save" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1857" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1857" text="m_save = value;" >
+              <codeaccessormethod accessType="1" parent_id="1857" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1857" text="m_save = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_save&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1859" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1859" text="return m_pluginActions;" >
+              <codeaccessormethod accessType="0" parent_id="1859" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1859" text="return m_pluginActions;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pluginActions&amp;#010;&amp;#010;@return the value of m_pluginActions" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1859" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1859" text="m_pluginActions = value;" >
+              <codeaccessormethod accessType="1" parent_id="1859" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1859" text="m_pluginActions = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pluginActions&amp;#010;&amp;#010;" />
                </header>
@@ -19215,132 +19215,132 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1801" tag="operation_1801" canDelete="false" indentLevel="1" >
+            <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  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1805" tag="operation_1805" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1805" tag="operation_1805" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1806" tag="operation_1806" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1806" tag="operation_1806" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param collection &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1808" tag="operation_1808" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1808" tag="operation_1808" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param action &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1811" tag="operation_1811" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1811" tag="operation_1811" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1812" tag="operation_1812" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1812" tag="operation_1812" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1814" tag="operation_1814" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1814" tag="operation_1814" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1815" tag="operation_1815" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1815" tag="operation_1815" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1816" tag="operation_1816" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1817" tag="operation_1817" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1817" tag="operation_1817" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisLayerSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1818" tag="operation_1818" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1818" tag="operation_1818" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1819" tag="operation_1819" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1820" tag="operation_1820" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1820" tag="operation_1820" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1821" tag="operation_1821" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1821" tag="operation_1821" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1822" tag="operation_1822" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1822" tag="operation_1822" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1823" tag="operation_1823" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1823" tag="operation_1823" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1824" tag="operation_1824" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1824" tag="operation_1824" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1825" tag="operation_1825" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1825" tag="operation_1825" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1826" tag="operation_1826" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1826" tag="operation_1826" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1827" tag="operation_1827" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1827" tag="operation_1827" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1828" tag="operation_1828" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1828" tag="operation_1828" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1829" tag="operation_1829" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1829" tag="operation_1829" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1830" tag="operation_1830" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1830" tag="operation_1830" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1831" tag="operation_1831" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1831" tag="operation_1831" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1832" tag="operation_1832" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1832" tag="operation_1832" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1833" tag="operation_1833" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1833" tag="operation_1833" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
@@ -19356,516 +19356,516 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1798" field_type="7471205" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1798" field_type="7471205" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
+       <ccfdeclarationcodeblock parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type QObject to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type QObject from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1834" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1834" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1834" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisView* m_parent;" >
+       <ccfdeclarationcodeblock parent_id="1834" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisView* m_parent;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1834" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1834" text="return m_parent;" >
+       <codeaccessormethod accessType="0" parent_id="1834" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1834" text="return m_parent;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_parent&amp;#010;&amp;#010;@return the value of m_parent" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1834" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1834" text="m_parent = value;" >
+       <codeaccessormethod accessType="1" parent_id="1834" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1834" text="m_parent = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_parent&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1835" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1835" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1835" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDoc* m_doc;" >
+       <ccfdeclarationcodeblock parent_id="1835" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisDoc* m_doc;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1835" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1835" text="return m_doc;" >
+       <codeaccessormethod accessType="0" parent_id="1835" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1835" text="return m_doc;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_doc&amp;#010;&amp;#010;@return the value of m_doc" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1835" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1835" text="m_doc = value;" >
+       <codeaccessormethod accessType="1" parent_id="1835" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1835" text="m_doc = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_doc&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1836" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1836" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1836" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisSelectionSP m_previousSelection;" >
+       <ccfdeclarationcodeblock parent_id="1836" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisSelectionSP m_previousSelection;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1836" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1836" text="return m_previousSelection;" >
+       <codeaccessormethod accessType="0" parent_id="1836" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1836" text="return m_previousSelection;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_previousSelection&amp;#010;&amp;#010;@return the value of m_previousSelection" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1836" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1836" text="m_previousSelection = value;" >
+       <codeaccessormethod accessType="1" parent_id="1836" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1836" text="m_previousSelection = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_previousSelection&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1838" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1838" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1838" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisClipboard* m_clipboard;" >
+       <ccfdeclarationcodeblock parent_id="1838" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisClipboard* m_clipboard;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1838" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1838" text="return m_clipboard;" >
+       <codeaccessormethod accessType="0" parent_id="1838" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1838" text="return m_clipboard;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_clipboard&amp;#010;&amp;#010;@return the value of m_clipboard" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1838" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1838" text="m_clipboard = value;" >
+       <codeaccessormethod accessType="1" parent_id="1838" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1838" text="m_clipboard = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_clipboard&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1839" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1839" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private KAction* m_copy;" >
+       <ccfdeclarationcodeblock parent_id="1839" tag="tblock_11" canDelete="false" indentLevel="1" text="private KAction* m_copy;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1839" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1839" text="return m_copy;" >
+       <codeaccessormethod accessType="0" parent_id="1839" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1839" text="return m_copy;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_copy&amp;#010;&amp;#010;@return the value of m_copy" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1839" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1839" text="m_copy = value;" >
+       <codeaccessormethod accessType="1" parent_id="1839" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1839" text="m_copy = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_copy&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1840" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1840" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private KAction* m_cut;" >
+       <ccfdeclarationcodeblock parent_id="1840" tag="tblock_14" canDelete="false" indentLevel="1" text="private KAction* m_cut;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1840" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1840" text="return m_cut;" >
+       <codeaccessormethod accessType="0" parent_id="1840" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1840" text="return m_cut;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_cut&amp;#010;&amp;#010;@return the value of m_cut" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1840" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1840" text="m_cut = value;" >
+       <codeaccessormethod accessType="1" parent_id="1840" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1840" text="m_cut = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_cut&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1841" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1841" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private KAction* m_paste;" >
+       <ccfdeclarationcodeblock parent_id="1841" tag="tblock_17" canDelete="false" indentLevel="1" text="private KAction* m_paste;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1841" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1841" text="return m_paste;" >
+       <codeaccessormethod accessType="0" parent_id="1841" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1841" text="return m_paste;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paste&amp;#010;&amp;#010;@return the value of m_paste" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1841" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1841" text="m_paste = value;" >
+       <codeaccessormethod accessType="1" parent_id="1841" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1841" text="m_paste = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paste&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1842" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1842" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private KAction* m_selectAll;" >
+       <ccfdeclarationcodeblock parent_id="1842" tag="tblock_20" canDelete="false" indentLevel="1" text="private KAction* m_selectAll;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1842" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1842" text="return m_selectAll;" >
+       <codeaccessormethod accessType="0" parent_id="1842" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1842" text="return m_selectAll;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_selectAll&amp;#010;&amp;#010;@return the value of m_selectAll" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1842" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1842" text="m_selectAll = value;" >
+       <codeaccessormethod accessType="1" parent_id="1842" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1842" text="m_selectAll = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_selectAll&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1843" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1843" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private KAction* m_deselect;" >
+       <ccfdeclarationcodeblock parent_id="1843" tag="tblock_23" canDelete="false" indentLevel="1" text="private KAction* m_deselect;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1843" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1843" text="return m_deselect;" >
+       <codeaccessormethod accessType="0" parent_id="1843" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1843" text="return m_deselect;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_deselect&amp;#010;&amp;#010;@return the value of m_deselect" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1843" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1843" text="m_deselect = value;" >
+       <codeaccessormethod accessType="1" parent_id="1843" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1843" text="m_deselect = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_deselect&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1844" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1844" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private KAction* m_clear;" >
+       <ccfdeclarationcodeblock parent_id="1844" tag="tblock_26" canDelete="false" indentLevel="1" text="private KAction* m_clear;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1844" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1844" text="return m_clear;" >
+       <codeaccessormethod accessType="0" parent_id="1844" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1844" text="return m_clear;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_clear&amp;#010;&amp;#010;@return the value of m_clear" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1844" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1844" text="m_clear = value;" >
+       <codeaccessormethod accessType="1" parent_id="1844" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1844" text="m_clear = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_clear&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1845" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1845" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private KAction* m_reselect;" >
+       <ccfdeclarationcodeblock parent_id="1845" tag="tblock_29" canDelete="false" indentLevel="1" text="private KAction* m_reselect;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1845" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1845" text="return m_reselect;" >
+       <codeaccessormethod accessType="0" parent_id="1845" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1845" text="return m_reselect;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_reselect&amp;#010;&amp;#010;@return the value of m_reselect" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1845" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1845" text="m_reselect = value;" >
+       <codeaccessormethod accessType="1" parent_id="1845" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1845" text="m_reselect = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_reselect&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1846" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1846" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private KAction* m_invert;" >
+       <ccfdeclarationcodeblock parent_id="1846" tag="tblock_32" canDelete="false" indentLevel="1" text="private KAction* m_invert;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1846" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1846" text="return m_invert;" >
+       <codeaccessormethod accessType="0" parent_id="1846" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1846" text="return m_invert;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_invert&amp;#010;&amp;#010;@return the value of m_invert" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1846" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1846" text="m_invert = value;" >
+       <codeaccessormethod accessType="1" parent_id="1846" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1846" text="m_invert = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_invert&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1847" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1847" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private KAction* m_toNewLayer;" >
+       <ccfdeclarationcodeblock parent_id="1847" tag="tblock_35" canDelete="false" indentLevel="1" text="private KAction* m_toNewLayer;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1847" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1847" text="return m_toNewLayer;" >
+       <codeaccessormethod accessType="0" parent_id="1847" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1847" text="return m_toNewLayer;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toNewLayer&amp;#010;&amp;#010;@return the value of m_toNewLayer" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1847" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1847" text="m_toNewLayer = value;" >
+       <codeaccessormethod accessType="1" parent_id="1847" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1847" text="m_toNewLayer = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toNewLayer&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1848" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1848" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private KAction* m_feather;" >
+       <ccfdeclarationcodeblock parent_id="1848" tag="tblock_38" canDelete="false" indentLevel="1" text="private KAction* m_feather;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1848" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1848" text="return m_feather;" >
+       <codeaccessormethod accessType="0" parent_id="1848" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1848" text="return m_feather;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_feather&amp;#010;&amp;#010;@return the value of m_feather" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1848" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1848" text="m_feather = value;" >
+       <codeaccessormethod accessType="1" parent_id="1848" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1848" text="m_feather = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_feather&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1849" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1849" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private KAction* m_border;" >
+       <ccfdeclarationcodeblock parent_id="1849" tag="tblock_41" canDelete="false" indentLevel="1" text="private KAction* m_border;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1849" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1849" text="return m_border;" >
+       <codeaccessormethod accessType="0" parent_id="1849" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1849" text="return m_border;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_border&amp;#010;&amp;#010;@return the value of m_border" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1849" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1849" text="m_border = value;" >
+       <codeaccessormethod accessType="1" parent_id="1849" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1849" text="m_border = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_border&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1850" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1850" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private KAction* m_expand;" >
+       <ccfdeclarationcodeblock parent_id="1850" tag="tblock_44" canDelete="false" indentLevel="1" text="private KAction* m_expand;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1850" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1850" text="return m_expand;" >
+       <codeaccessormethod accessType="0" parent_id="1850" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1850" text="return m_expand;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_expand&amp;#010;&amp;#010;@return the value of m_expand" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1850" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1850" text="m_expand = value;" >
+       <codeaccessormethod accessType="1" parent_id="1850" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1850" text="m_expand = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_expand&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1851" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1851" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private KAction* m_smooth;" >
+       <ccfdeclarationcodeblock parent_id="1851" tag="tblock_47" canDelete="false" indentLevel="1" text="private KAction* m_smooth;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1851" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1851" text="return m_smooth;" >
+       <codeaccessormethod accessType="0" parent_id="1851" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1851" text="return m_smooth;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_smooth&amp;#010;&amp;#010;@return the value of m_smooth" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1851" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1851" text="m_smooth = value;" >
+       <codeaccessormethod accessType="1" parent_id="1851" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1851" text="m_smooth = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_smooth&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1852" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1852" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private KAction* m_contract;" >
+       <ccfdeclarationcodeblock parent_id="1852" tag="tblock_50" canDelete="false" indentLevel="1" text="private KAction* m_contract;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1852" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1852" text="return m_contract;" >
+       <codeaccessormethod accessType="0" parent_id="1852" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1852" text="return m_contract;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_contract&amp;#010;&amp;#010;@return the value of m_contract" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1852" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1852" text="m_contract = value;" >
+       <codeaccessormethod accessType="1" parent_id="1852" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1852" text="m_contract = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_contract&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1853" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1853" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private KAction* m_grow;" >
+       <ccfdeclarationcodeblock parent_id="1853" tag="tblock_53" canDelete="false" indentLevel="1" text="private KAction* m_grow;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1853" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1853" text="return m_grow;" >
+       <codeaccessormethod accessType="0" parent_id="1853" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1853" text="return m_grow;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_grow&amp;#010;&amp;#010;@return the value of m_grow" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1853" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1853" text="m_grow = value;" >
+       <codeaccessormethod accessType="1" parent_id="1853" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1853" text="m_grow = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_grow&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1854" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1854" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private KAction* m_similar;" >
+       <ccfdeclarationcodeblock parent_id="1854" tag="tblock_56" canDelete="false" indentLevel="1" text="private KAction* m_similar;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1854" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1854" text="return m_similar;" >
+       <codeaccessormethod accessType="0" parent_id="1854" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1854" text="return m_similar;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_similar&amp;#010;&amp;#010;@return the value of m_similar" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1854" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1854" text="m_similar = value;" >
+       <codeaccessormethod accessType="1" parent_id="1854" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1854" text="m_similar = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_similar&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1855" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1855" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private KAction* m_transform;" >
+       <ccfdeclarationcodeblock parent_id="1855" tag="tblock_59" canDelete="false" indentLevel="1" text="private KAction* m_transform;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1855" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1855" text="return m_transform;" >
+       <codeaccessormethod accessType="0" parent_id="1855" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1855" text="return m_transform;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_transform&amp;#010;&amp;#010;@return the value of m_transform" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1855" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1855" text="m_transform = value;" >
+       <codeaccessormethod accessType="1" parent_id="1855" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1855" text="m_transform = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_transform&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1856" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1856" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private KAction* m_load;" >
+       <ccfdeclarationcodeblock parent_id="1856" tag="tblock_62" canDelete="false" indentLevel="1" text="private KAction* m_load;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1856" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1856" text="return m_load;" >
+       <codeaccessormethod accessType="0" parent_id="1856" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1856" text="return m_load;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_load&amp;#010;&amp;#010;@return the value of m_load" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1856" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1856" text="m_load = value;" >
+       <codeaccessormethod accessType="1" parent_id="1856" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1856" text="m_load = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_load&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1857" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1857" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private KAction* m_save;" >
+       <ccfdeclarationcodeblock parent_id="1857" tag="tblock_65" canDelete="false" indentLevel="1" text="private KAction* m_save;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1857" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1857" text="return m_save;" >
+       <codeaccessormethod accessType="0" parent_id="1857" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1857" text="return m_save;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_save&amp;#010;&amp;#010;@return the value of m_save" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1857" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1857" text="m_save = value;" >
+       <codeaccessormethod accessType="1" parent_id="1857" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1857" text="m_save = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_save&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1859" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1859" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1859" tag="tblock_68" canDelete="false" indentLevel="1" text="private QPtrList m_pluginActions;" >
+       <ccfdeclarationcodeblock parent_id="1859" tag="tblock_68" canDelete="false" indentLevel="1" text="private QPtrList m_pluginActions;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1859" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1859" text="return m_pluginActions;" >
+       <codeaccessormethod accessType="0" parent_id="1859" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1859" text="return m_pluginActions;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pluginActions&amp;#010;&amp;#010;@return the value of m_pluginActions" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1859" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1859" text="m_pluginActions = value;" >
+       <codeaccessormethod accessType="1" parent_id="1859" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1859" text="m_pluginActions = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pluginActions&amp;#010;&amp;#010;" />
         </header>
@@ -19873,7 +19873,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="578" tqparent_class="578" fileExt=".java" fileName="KisFilterRegistry" >
+    <classifiercodedocument writeOutCode="true" package="" id="578" parent_class="578" fileExt=".java" fileName="KisFilterRegistry" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -19885,7 +19885,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="578" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="578" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilterRegistry&amp;#010;" />
        </header>
@@ -19948,7 +19948,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="579" tqparent_class="579" fileExt=".java" fileName="QCursor" >
+    <classifiercodedocument writeOutCode="true" package="" id="579" parent_class="579" fileExt=".java" fileName="QCursor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -19960,7 +19960,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="579" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="579" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QCursor&amp;#010;" />
        </header>
@@ -20023,7 +20023,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="583" tqparent_class="583" fileExt=".java" fileName="KisCanvasObserver*" >
+    <classifiercodedocument writeOutCode="true" package="" id="583" parent_class="583" fileExt=".java" fileName="KisCanvasObserver*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20035,7 +20035,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="583" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="583" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCanvasObserver*&amp;#010;" />
        </header>
@@ -20098,7 +20098,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="591" tqparent_class="591" fileExt=".java" fileName="QColor" >
+    <classifiercodedocument writeOutCode="true" package="" id="591" parent_class="591" fileExt=".java" fileName="QColor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20110,7 +20110,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="591" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="591" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QColor&amp;#010;" />
        </header>
@@ -20173,7 +20173,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="593" tqparent_class="593" fileExt=".java" fileName="const QColor&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="593" parent_class="593" fileExt=".java" fileName="const QColor&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20185,7 +20185,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="593" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="593" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QColor&amp;&amp;#010;" />
        </header>
@@ -20248,7 +20248,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="599" tqparent_class="599" fileExt=".java" fileName="KisBrush*" >
+    <classifiercodedocument writeOutCode="true" package="" id="599" parent_class="599" fileExt=".java" fileName="KisBrush*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20260,7 +20260,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="599" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="599" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBrush*&amp;#010;" />
        </header>
@@ -20323,7 +20323,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="601" tqparent_class="601" fileExt=".java" fileName="KisPattern*" >
+    <classifiercodedocument writeOutCode="true" package="" id="601" parent_class="601" fileExt=".java" fileName="KisPattern*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20335,7 +20335,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="601" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="601" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPattern*&amp;#010;" />
        </header>
@@ -20398,7 +20398,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="603" tqparent_class="603" fileExt=".java" fileName="KisGradient*" >
+    <classifiercodedocument writeOutCode="true" package="" id="603" parent_class="603" fileExt=".java" fileName="KisGradient*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20410,7 +20410,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="603" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="603" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGradient*&amp;#010;" />
        </header>
@@ -20473,7 +20473,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="606" tqparent_class="606" fileExt=".java" fileName="KisUndoAdapter*" >
+    <classifiercodedocument writeOutCode="true" package="" id="606" parent_class="606" fileExt=".java" fileName="KisUndoAdapter*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20485,7 +20485,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="606" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="606" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisUndoAdapter*&amp;#010;" />
        </header>
@@ -20548,7 +20548,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="608" tqparent_class="608" fileExt=".java" fileName="KisCanvasControllerInterface*" >
+    <classifiercodedocument writeOutCode="true" package="" id="608" parent_class="608" fileExt=".java" fileName="KisCanvasControllerInterface*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20560,7 +20560,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="608" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="608" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCanvasControllerInterface*&amp;#010;" />
        </header>
@@ -20623,7 +20623,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="610" tqparent_class="610" fileExt=".java" fileName="KisToolControllerInterface*" >
+    <classifiercodedocument writeOutCode="true" package="" id="610" parent_class="610" fileExt=".java" fileName="KisToolControllerInterface*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20635,7 +20635,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="610" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="610" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisToolControllerInterface*&amp;#010;" />
        </header>
@@ -20698,7 +20698,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="612" tqparent_class="612" fileExt=".java" fileName="KoDocument*" >
+    <classifiercodedocument writeOutCode="true" package="" id="612" parent_class="612" fileExt=".java" fileName="KoDocument*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20710,7 +20710,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="612" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="612" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoDocument*&amp;#010;" />
        </header>
@@ -20773,7 +20773,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="614" tqparent_class="614" fileExt=".java" fileName="KisProgressDisplayInterface*" >
+    <classifiercodedocument writeOutCode="true" package="" id="614" parent_class="614" fileExt=".java" fileName="KisProgressDisplayInterface*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20785,7 +20785,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="614" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="614" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProgressDisplayInterface*&amp;#010;" />
        </header>
@@ -20848,7 +20848,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="616" tqparent_class="616" fileExt=".java" fileName="KisSelectionManager*" >
+    <classifiercodedocument writeOutCode="true" package="" id="616" parent_class="616" fileExt=".java" fileName="KisSelectionManager*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20860,7 +20860,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="616" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="616" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisSelectionManager*&amp;#010;" />
        </header>
@@ -20923,7 +20923,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="618" tqparent_class="618" fileExt=".java" fileName="KisFilterRegistry*" >
+    <classifiercodedocument writeOutCode="true" package="" id="618" parent_class="618" fileExt=".java" fileName="KisFilterRegistry*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -20935,7 +20935,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="618" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="618" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilterRegistry*&amp;#010;" />
        </header>
@@ -20998,7 +20998,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="623" tqparent_class="623" fileExt=".java" fileName="const QCursor&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="623" parent_class="623" fileExt=".java" fileName="const QCursor&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21010,7 +21010,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="623" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="623" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QCursor&amp;&amp;#010;" />
        </header>
@@ -21073,7 +21073,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="626" tqparent_class="626" fileExt=".java" fileName="const KisCanvasSubject&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="626" parent_class="626" fileExt=".java" fileName="const KisCanvasSubject&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21085,7 +21085,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="626" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="626" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisCanvasSubject&amp;&amp;#010;" />
        </header>
@@ -21148,7 +21148,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="630" tqparent_class="630" fileExt=".java" fileName="KisCanvasSubject&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="630" parent_class="630" fileExt=".java" fileName="KisCanvasSubject&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21160,7 +21160,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="630" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="630" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisCanvasSubject&amp;&amp;#010;" />
        </header>
@@ -21223,7 +21223,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="631" tqparent_class="631" fileExt=".java" fileName="KisGenericRegistry" >
+    <classifiercodedocument writeOutCode="true" package="" id="631" parent_class="631" fileExt=".java" fileName="KisGenericRegistry" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21235,7 +21235,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="631" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="631" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGenericRegistry&amp;#010;" />
        </header>
@@ -21245,7 +21245,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="655" tag="tblock_0" canDelete="false" indentLevel="1" text="protected storageMap m_storage;" >
+          <ccfdeclarationcodeblock parent_id="655" tag="tblock_0" canDelete="false" indentLevel="1" text="protected storageMap m_storage;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -21279,12 +21279,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="655" text="return m_storage;" >
+              <codeaccessormethod accessType="0" parent_id="655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="655" text="return m_storage;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_storage&amp;#010;&amp;#010;@return the value of m_storage" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="655" text="m_storage = value;" >
+              <codeaccessormethod accessType="1" parent_id="655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="655" text="m_storage = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_storage&amp;#010;&amp;#010;" />
                </header>
@@ -21304,57 +21304,57 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="634" tag="operation_634" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="634" tag="operation_634" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="635" tag="operation_635" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="635" tag="operation_635" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="636" tag="operation_636" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="636" tag="operation_636" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param item &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="638" tag="operation_638" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="638" tag="operation_638" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@param item &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="641" tag="operation_641" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="641" tag="operation_641" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="643" tag="operation_643" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="643" tag="operation_643" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="645" tag="operation_645" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="645" tag="operation_645" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="647" tag="operation_647" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="647" tag="operation_647" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param id &amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="649" tag="operation_649" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="649" tag="operation_649" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisIDList  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="650" tag="operation_650" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="650" tag="operation_650" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="653" tag="operation_653" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="653" tag="operation_653" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return KisGenericRegistry  " />
              </header>
@@ -21370,21 +21370,21 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="655" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="655" tag="tblock_0" canDelete="false" indentLevel="1" text="protected storageMap m_storage;" >
+       <ccfdeclarationcodeblock parent_id="655" tag="tblock_0" canDelete="false" indentLevel="1" text="protected storageMap m_storage;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="655" text="return m_storage;" >
+       <codeaccessormethod accessType="0" parent_id="655" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="655" text="return m_storage;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_storage&amp;#010;&amp;#010;@return the value of m_storage" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="655" text="m_storage = value;" >
+       <codeaccessormethod accessType="1" parent_id="655" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="655" text="m_storage = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_storage&amp;#010;&amp;#010;" />
         </header>
@@ -21392,7 +21392,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisGenericRegistry" id="633" tqparent_class="633" fileExt=".java" fileName="storageMap" >
+    <classifiercodedocument writeOutCode="true" package="KisGenericRegistry" id="633" parent_class="633" fileExt=".java" fileName="storageMap" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisGenericRegistry;&amp;#010;" >
        <header>
@@ -21404,7 +21404,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="633" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="633" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class StorageMap&amp;#010;" />
        </header>
@@ -21467,7 +21467,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="651" tqparent_class="651" fileExt=".java" fileName="const KisGenericRegistry&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="651" parent_class="651" fileExt=".java" fileName="const KisGenericRegistry&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21479,7 +21479,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="651" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="651" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisGenericRegistry&amp;&amp;#010;" />
        </header>
@@ -21542,7 +21542,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="662" tqparent_class="662" fileExt=".java" fileName=TQBYTEARRAY_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="662" parent_class="662" fileExt=".java" fileName=TQBYTEARRAY_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21554,7 +21554,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="662" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="662" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QByteArray&amp;#010;" />
        </header>
@@ -21617,7 +21617,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="663" tqparent_class="663" fileExt=".java" fileName="const QByteArray&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="663" parent_class="663" fileExt=".java" fileName="const QByteArray&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21629,7 +21629,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="663" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="663" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QByteArray&amp;&amp;#010;" />
        </header>
@@ -21692,7 +21692,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="666" tqparent_class="666" fileExt=".java" fileName="QString&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="666" parent_class="666" fileExt=".java" fileName="QString&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21704,7 +21704,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="666" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="666" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QString&amp;&amp;#010;" />
        </header>
@@ -21767,7 +21767,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="669" tqparent_class="669" fileExt=".java" fileName="QByteArray&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="669" parent_class="669" fileExt=".java" fileName="QByteArray&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21779,7 +21779,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="669" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="669" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QByteArray&amp;&amp;#010;" />
        </header>
@@ -21842,7 +21842,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="Qt" id="678" tqparent_class="678" fileExt=".java" fileName="Qt::Orientation" >
+    <classifiercodedocument writeOutCode="true" package="Qt" id="678" parent_class="678" fileExt=".java" fileName="Qt::Orientation" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package Qt;&amp;#010;" >
        <header>
@@ -21854,7 +21854,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="678" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="678" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Qt::Orientation&amp;#010;" />
        </header>
@@ -21917,7 +21917,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="685" tqparent_class="685" fileExt=".java" fileName=TQPIXMAP_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="685" parent_class="685" fileExt=".java" fileName=TQPIXMAP_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -21929,7 +21929,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="685" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="685" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPixmap&amp;#010;" />
        </header>
@@ -21992,7 +21992,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="690" tqparent_class="690" fileExt=".java" fileName="KisGuideMgr" >
+    <classifiercodedocument writeOutCode="true" package="" id="690" parent_class="690" fileExt=".java" fileName="KisGuideMgr" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -22004,7 +22004,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="690" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="690" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGuideMgr&amp;#010;" />
        </header>
@@ -22014,57 +22014,57 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="756" tag="tblock_0" canDelete="false" indentLevel="1" text="private QSize m_size;" >
+          <ccfdeclarationcodeblock parent_id="756" tag="tblock_0" canDelete="false" indentLevel="1" text="private QSize m_size;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="757" tag="tblock_2" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLines;" >
+          <ccfdeclarationcodeblock parent_id="757" tag="tblock_2" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLines;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLines;" >
+          <ccfdeclarationcodeblock parent_id="758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLines;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="759" tag="tblock_8" canDelete="false" indentLevel="1" text="private QPixmap m_pattern;" >
+          <ccfdeclarationcodeblock parent_id="759" tag="tblock_8" canDelete="false" indentLevel="1" text="private QPixmap m_pattern;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="760" tag="tblock_11" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLinesSelected;" >
+          <ccfdeclarationcodeblock parent_id="760" tag="tblock_11" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLinesSelected;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="761" tag="tblock_14" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLinesSelected;" >
+          <ccfdeclarationcodeblock parent_id="761" tag="tblock_14" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLinesSelected;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="762" tag="tblock_17" canDelete="false" indentLevel="1" text="private QPixmap m_patternSelected;" >
+          <ccfdeclarationcodeblock parent_id="762" tag="tblock_17" canDelete="false" indentLevel="1" text="private QPixmap m_patternSelected;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="763" tag="tblock_20" canDelete="false" indentLevel="1" text="private vKisGuideSP m_lines;" >
+          <ccfdeclarationcodeblock parent_id="763" tag="tblock_20" canDelete="false" indentLevel="1" text="private vKisGuideSP m_lines;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="764" tag="tblock_23" canDelete="false" indentLevel="1" text="private vKisGuideSP m_slines;" >
+          <ccfdeclarationcodeblock parent_id="764" tag="tblock_23" canDelete="false" indentLevel="1" text="private vKisGuideSP m_slines;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="766" tag="tblock_26" canDelete="false" indentLevel="1" text="static private const char* s_xbm;" >
+          <ccfdeclarationcodeblock parent_id="766" tag="tblock_26" canDelete="false" indentLevel="1" text="static private const char* s_xbm;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="767" tag="tblock_29" canDelete="false" indentLevel="1" text="static private const char* s_xbm_selected;" >
+          <ccfdeclarationcodeblock parent_id="767" tag="tblock_29" canDelete="false" indentLevel="1" text="static private const char* s_xbm_selected;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -22098,112 +22098,112 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="756" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="756" text="return m_size;" >
+              <codeaccessormethod accessType="0" parent_id="756" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="756" text="return m_size;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_size&amp;#010;&amp;#010;@return the value of m_size" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="756" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="756" text="m_size = value;" >
+              <codeaccessormethod accessType="1" parent_id="756" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="756" text="m_size = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_size&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="757" text="return m_vGuideLines;" >
+              <codeaccessormethod accessType="0" parent_id="757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="757" text="return m_vGuideLines;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_vGuideLines&amp;#010;&amp;#010;@return the value of m_vGuideLines" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="757" text="m_vGuideLines = value;" >
+              <codeaccessormethod accessType="1" parent_id="757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="757" text="m_vGuideLines = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_vGuideLines&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="758" text="return m_hGuideLines;" >
+              <codeaccessormethod accessType="0" parent_id="758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="758" text="return m_hGuideLines;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_hGuideLines&amp;#010;&amp;#010;@return the value of m_hGuideLines" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="758" text="m_hGuideLines = value;" >
+              <codeaccessormethod accessType="1" parent_id="758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="758" text="m_hGuideLines = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_hGuideLines&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="759" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="759" text="return m_pattern;" >
+              <codeaccessormethod accessType="0" parent_id="759" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="759" text="return m_pattern;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pattern&amp;#010;&amp;#010;@return the value of m_pattern" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="759" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="759" text="m_pattern = value;" >
+              <codeaccessormethod accessType="1" parent_id="759" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="759" text="m_pattern = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pattern&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="760" text="return m_vGuideLinesSelected;" >
+              <codeaccessormethod accessType="0" parent_id="760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="760" text="return m_vGuideLinesSelected;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_vGuideLinesSelected&amp;#010;&amp;#010;@return the value of m_vGuideLinesSelected" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="760" text="m_vGuideLinesSelected = value;" >
+              <codeaccessormethod accessType="1" parent_id="760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="760" text="m_vGuideLinesSelected = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_vGuideLinesSelected&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="761" text="return m_hGuideLinesSelected;" >
+              <codeaccessormethod accessType="0" parent_id="761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="761" text="return m_hGuideLinesSelected;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_hGuideLinesSelected&amp;#010;&amp;#010;@return the value of m_hGuideLinesSelected" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="761" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="761" text="m_hGuideLinesSelected = value;" >
+              <codeaccessormethod accessType="1" parent_id="761" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="761" text="m_hGuideLinesSelected = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_hGuideLinesSelected&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="762" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="762" text="return m_patternSelected;" >
+              <codeaccessormethod accessType="0" parent_id="762" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="762" text="return m_patternSelected;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_patternSelected&amp;#010;&amp;#010;@return the value of m_patternSelected" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="762" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="762" text="m_patternSelected = value;" >
+              <codeaccessormethod accessType="1" parent_id="762" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="762" text="m_patternSelected = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_patternSelected&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="763" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="763" text="return m_lines;" >
+              <codeaccessormethod accessType="0" parent_id="763" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="763" text="return m_lines;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_lines&amp;#010;&amp;#010;@return the value of m_lines" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="763" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="763" text="m_lines = value;" >
+              <codeaccessormethod accessType="1" parent_id="763" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="763" text="m_lines = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_lines&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="764" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="764" text="return m_slines;" >
+              <codeaccessormethod accessType="0" parent_id="764" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="764" text="return m_slines;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_slines&amp;#010;&amp;#010;@return the value of m_slines" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="764" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="764" text="m_slines = value;" >
+              <codeaccessormethod accessType="1" parent_id="764" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="764" text="m_slines = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_slines&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="766" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="766" text="return s_xbm;" >
+              <codeaccessormethod accessType="0" parent_id="766" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="766" text="return s_xbm;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of s_xbm&amp;#010;&amp;#010;@return the value of s_xbm" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="766" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="766" text="s_xbm = value;" >
+              <codeaccessormethod accessType="1" parent_id="766" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="766" text="s_xbm = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of s_xbm&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="767" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="767" text="return s_xbm_selected;" >
+              <codeaccessormethod accessType="0" parent_id="767" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="767" text="return s_xbm_selected;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of s_xbm_selected&amp;#010;&amp;#010;@return the value of s_xbm_selected" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="767" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="767" text="s_xbm_selected = value;" >
+              <codeaccessormethod accessType="1" parent_id="767" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="767" text="s_xbm_selected = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of s_xbm_selected&amp;#010;&amp;#010;" />
                </header>
@@ -22223,117 +22223,117 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="694" tag="operation_694" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="694" tag="operation_694" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="695" tag="operation_695" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="695" tag="operation_695" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="696" tag="operation_696" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="696" tag="operation_696" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pos &amp;#010;@param o &amp;#010;@return KisGuideSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="699" tag="operation_699" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="699" tag="operation_699" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gd &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="701" tag="operation_701" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="701" tag="operation_701" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param y &amp;#010;@param d &amp;#010;@return KisGuideSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="705" tag="operation_705" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="705" tag="operation_705" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param y &amp;#010;@param d &amp;#010;@return KisGuideSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="708" tag="operation_708" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="708" tag="operation_708" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@param d &amp;#010;@return KisGuideSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="711" tag="operation_711" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="711" tag="operation_711" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="712" tag="operation_712" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="712" tag="operation_712" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="713" tag="operation_713" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="713" tag="operation_713" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param element &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="717" tag="operation_717" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="717" tag="operation_717" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param element &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="720" tag="operation_720" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="720" tag="operation_720" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gd &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="722" tag="operation_722" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="722" tag="operation_722" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gd &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="724" tag="operation_724" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="724" tag="operation_724" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="725" tag="operation_725" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="725" tag="operation_725" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="726" tag="operation_726" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="726" tag="operation_726" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="727" tag="operation_727" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="727" tag="operation_727" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param size &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="731" tag="operation_731" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="731" tag="operation_731" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="732" tag="operation_732" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="732" tag="operation_732" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device &amp;#010;@param w &amp;#010;@param xOffset &amp;#010;@param yOffset &amp;#010;@param zoom &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="740" tag="operation_740" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="740" tag="operation_740" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param device &amp;#010;@param w &amp;#010;@param xOffset &amp;#010;@param yOffset &amp;#010;@param zoom &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="746" tag="operation_746" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="746" tag="operation_746" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param d &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="748" tag="operation_748" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="748" tag="operation_748" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param d &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="750" tag="operation_750" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="750" tag="operation_750" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param size &amp;#010;@param vLine &amp;#010;@param hLine &amp;#010;@param linePattern &amp;#010;@return void  " />
              </header>
@@ -22349,221 +22349,221 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="756" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="756" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="756" tag="tblock_0" canDelete="false" indentLevel="1" text="private QSize m_size;" >
+       <ccfdeclarationcodeblock parent_id="756" tag="tblock_0" canDelete="false" indentLevel="1" text="private QSize m_size;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="756" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="756" text="return m_size;" >
+       <codeaccessormethod accessType="0" parent_id="756" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="756" text="return m_size;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_size&amp;#010;&amp;#010;@return the value of m_size" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="756" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="756" text="m_size = value;" >
+       <codeaccessormethod accessType="1" parent_id="756" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="756" text="m_size = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_size&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="757" tag="tblock_2" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLines;" >
+       <ccfdeclarationcodeblock parent_id="757" tag="tblock_2" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLines;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="757" text="return m_vGuideLines;" >
+       <codeaccessormethod accessType="0" parent_id="757" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="757" text="return m_vGuideLines;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_vGuideLines&amp;#010;&amp;#010;@return the value of m_vGuideLines" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="757" text="m_vGuideLines = value;" >
+       <codeaccessormethod accessType="1" parent_id="757" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="757" text="m_vGuideLines = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_vGuideLines&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="758" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLines;" >
+       <ccfdeclarationcodeblock parent_id="758" tag="tblock_5" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLines;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="758" text="return m_hGuideLines;" >
+       <codeaccessormethod accessType="0" parent_id="758" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="758" text="return m_hGuideLines;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_hGuideLines&amp;#010;&amp;#010;@return the value of m_hGuideLines" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="758" text="m_hGuideLines = value;" >
+       <codeaccessormethod accessType="1" parent_id="758" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="758" text="m_hGuideLines = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_hGuideLines&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="759" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="759" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="759" tag="tblock_8" canDelete="false" indentLevel="1" text="private QPixmap m_pattern;" >
+       <ccfdeclarationcodeblock parent_id="759" tag="tblock_8" canDelete="false" indentLevel="1" text="private QPixmap m_pattern;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="759" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="759" text="return m_pattern;" >
+       <codeaccessormethod accessType="0" parent_id="759" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="759" text="return m_pattern;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pattern&amp;#010;&amp;#010;@return the value of m_pattern" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="759" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="759" text="m_pattern = value;" >
+       <codeaccessormethod accessType="1" parent_id="759" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="759" text="m_pattern = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pattern&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="760" tag="tblock_11" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLinesSelected;" >
+       <ccfdeclarationcodeblock parent_id="760" tag="tblock_11" canDelete="false" indentLevel="1" text="private QPixmap m_vGuideLinesSelected;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="760" text="return m_vGuideLinesSelected;" >
+       <codeaccessormethod accessType="0" parent_id="760" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="760" text="return m_vGuideLinesSelected;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_vGuideLinesSelected&amp;#010;&amp;#010;@return the value of m_vGuideLinesSelected" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="760" text="m_vGuideLinesSelected = value;" >
+       <codeaccessormethod accessType="1" parent_id="760" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="760" text="m_vGuideLinesSelected = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_vGuideLinesSelected&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="761" tag="tblock_14" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLinesSelected;" >
+       <ccfdeclarationcodeblock parent_id="761" tag="tblock_14" canDelete="false" indentLevel="1" text="private QPixmap m_hGuideLinesSelected;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="761" text="return m_hGuideLinesSelected;" >
+       <codeaccessormethod accessType="0" parent_id="761" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="761" text="return m_hGuideLinesSelected;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_hGuideLinesSelected&amp;#010;&amp;#010;@return the value of m_hGuideLinesSelected" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="761" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="761" text="m_hGuideLinesSelected = value;" >
+       <codeaccessormethod accessType="1" parent_id="761" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="761" text="m_hGuideLinesSelected = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_hGuideLinesSelected&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="762" tag="tblock_17" canDelete="false" indentLevel="1" text="private QPixmap m_patternSelected;" >
+       <ccfdeclarationcodeblock parent_id="762" tag="tblock_17" canDelete="false" indentLevel="1" text="private QPixmap m_patternSelected;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="762" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="762" text="return m_patternSelected;" >
+       <codeaccessormethod accessType="0" parent_id="762" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="762" text="return m_patternSelected;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_patternSelected&amp;#010;&amp;#010;@return the value of m_patternSelected" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="762" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="762" text="m_patternSelected = value;" >
+       <codeaccessormethod accessType="1" parent_id="762" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="762" text="m_patternSelected = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_patternSelected&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="763" tag="tblock_20" canDelete="false" indentLevel="1" text="private vKisGuideSP m_lines;" >
+       <ccfdeclarationcodeblock parent_id="763" tag="tblock_20" canDelete="false" indentLevel="1" text="private vKisGuideSP m_lines;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="763" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="763" text="return m_lines;" >
+       <codeaccessormethod accessType="0" parent_id="763" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="763" text="return m_lines;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_lines&amp;#010;&amp;#010;@return the value of m_lines" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="763" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="763" text="m_lines = value;" >
+       <codeaccessormethod accessType="1" parent_id="763" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="763" text="m_lines = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_lines&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="764" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="764" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="764" tag="tblock_23" canDelete="false" indentLevel="1" text="private vKisGuideSP m_slines;" >
+       <ccfdeclarationcodeblock parent_id="764" tag="tblock_23" canDelete="false" indentLevel="1" text="private vKisGuideSP m_slines;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="764" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="764" text="return m_slines;" >
+       <codeaccessormethod accessType="0" parent_id="764" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="764" text="return m_slines;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_slines&amp;#010;&amp;#010;@return the value of m_slines" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="764" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="764" text="m_slines = value;" >
+       <codeaccessormethod accessType="1" parent_id="764" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="764" text="m_slines = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_slines&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="766" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="766" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="766" tag="tblock_26" canDelete="false" indentLevel="1" text="static private const char* s_xbm;" >
+       <ccfdeclarationcodeblock parent_id="766" tag="tblock_26" canDelete="false" indentLevel="1" text="static private const char* s_xbm;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="766" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="766" text="return s_xbm;" >
+       <codeaccessormethod accessType="0" parent_id="766" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="766" text="return s_xbm;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of s_xbm&amp;#010;&amp;#010;@return the value of s_xbm" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="766" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="766" text="s_xbm = value;" >
+       <codeaccessormethod accessType="1" parent_id="766" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="766" text="s_xbm = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of s_xbm&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="767" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="767" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="767" tag="tblock_29" canDelete="false" indentLevel="1" text="static private const char* s_xbm_selected;" >
+       <ccfdeclarationcodeblock parent_id="767" tag="tblock_29" canDelete="false" indentLevel="1" text="static private const char* s_xbm_selected;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="767" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="767" text="return s_xbm_selected;" >
+       <codeaccessormethod accessType="0" parent_id="767" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="767" text="return s_xbm_selected;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of s_xbm_selected&amp;#010;&amp;#010;@return the value of s_xbm_selected" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="767" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="767" text="s_xbm_selected = value;" >
+       <codeaccessormethod accessType="1" parent_id="767" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="767" text="s_xbm_selected = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of s_xbm_selected&amp;#010;&amp;#010;" />
         </header>
@@ -22571,7 +22571,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisGuideMgr" id="691" tqparent_class="691" fileExt=".java" fileName="vKisGuideSP" >
+    <classifiercodedocument writeOutCode="true" package="KisGuideMgr" id="691" parent_class="691" fileExt=".java" fileName="vKisGuideSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisGuideMgr;&amp;#010;" >
        <header>
@@ -22583,7 +22583,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="691" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="691" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisGuideSP&amp;#010;" />
        </header>
@@ -22646,7 +22646,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisGuideMgr" id="692" tqparent_class="692" fileExt=".java" fileName="vKisGuideSP_it" >
+    <classifiercodedocument writeOutCode="true" package="KisGuideMgr" id="692" parent_class="692" fileExt=".java" fileName="vKisGuideSP_it" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisGuideMgr;&amp;#010;" >
        <header>
@@ -22658,7 +22658,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="692" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="692" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisGuideSP_it&amp;#010;" />
        </header>
@@ -22721,7 +22721,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisGuideMgr" id="693" tqparent_class="693" fileExt=".java" fileName="vKisGuideSP_cit" >
+    <classifiercodedocument writeOutCode="true" package="KisGuideMgr" id="693" parent_class="693" fileExt=".java" fileName="vKisGuideSP_cit" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisGuideMgr;&amp;#010;" >
        <header>
@@ -22733,7 +22733,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="693" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="693" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class VKisGuideSP_cit&amp;#010;" />
        </header>
@@ -22796,7 +22796,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="714" tqparent_class="714" fileExt=".java" fileName="QDomElement" >
+    <classifiercodedocument writeOutCode="true" package="" id="714" parent_class="714" fileExt=".java" fileName="QDomElement" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -22808,7 +22808,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="714" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="714" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QDomElement&amp;#010;" />
        </header>
@@ -22871,7 +22871,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="715" tqparent_class="715" fileExt=".java" fileName="QDomElement&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="715" parent_class="715" fileExt=".java" fileName="QDomElement&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -22883,7 +22883,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="715" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="715" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QDomElement&amp;&amp;#010;" />
        </header>
@@ -22946,7 +22946,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="718" tqparent_class="718" fileExt=".java" fileName="const QDomElement&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="718" parent_class="718" fileExt=".java" fileName="const QDomElement&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -22958,7 +22958,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="718" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="718" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QDomElement&amp;&amp;#010;" />
        </header>
@@ -23021,7 +23021,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="728" tqparent_class="728" fileExt=".java" fileName="QSize" >
+    <classifiercodedocument writeOutCode="true" package="" id="728" parent_class="728" fileExt=".java" fileName="QSize" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23033,7 +23033,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="728" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="728" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QSize&amp;#010;" />
        </header>
@@ -23096,7 +23096,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="729" tqparent_class="729" fileExt=".java" fileName="const QSize&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="729" parent_class="729" fileExt=".java" fileName="const QSize&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23108,7 +23108,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="729" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="729" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QSize&amp;&amp;#010;" />
        </header>
@@ -23171,7 +23171,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="733" tqparent_class="733" fileExt=".java" fileName="QPaintDevice" >
+    <classifiercodedocument writeOutCode="true" package="" id="733" parent_class="733" fileExt=".java" fileName="QPaintDevice" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23183,7 +23183,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="733" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="733" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPaintDevice&amp;#010;" />
        </header>
@@ -23246,7 +23246,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="734" tqparent_class="734" fileExt=".java" fileName="QPaintDevice*" >
+    <classifiercodedocument writeOutCode="true" package="" id="734" parent_class="734" fileExt=".java" fileName="QPaintDevice*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23258,7 +23258,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="734" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="734" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPaintDevice*&amp;#010;" />
        </header>
@@ -23321,7 +23321,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="752" tqparent_class="752" fileExt=".java" fileName="QPixmap*" >
+    <classifiercodedocument writeOutCode="true" package="" id="752" parent_class="752" fileExt=".java" fileName="QPixmap*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23333,7 +23333,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="752" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="752" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPixmap*&amp;#010;" />
        </header>
@@ -23396,7 +23396,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="765" tqparent_class="765" fileExt=".java" fileName="const char*" >
+    <classifiercodedocument writeOutCode="true" package="" id="765" parent_class="765" fileExt=".java" fileName="const char*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23408,7 +23408,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="765" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="765" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const char*&amp;#010;" />
        </header>
@@ -23471,7 +23471,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="768" tqparent_class="768" fileExt=".java" fileName="enumFilterType" >
+    <classifiercodedocument writeOutCode="true" package="" id="768" parent_class="768" fileExt=".java" fileName="enumFilterType" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23483,7 +23483,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="768" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="768" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class EnumFilterType&amp;#010;" />
        </header>
@@ -23546,7 +23546,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="776" tqparent_class="776" fileExt=".java" fileName="KisScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="776" parent_class="776" fileExt=".java" fileName="KisScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23558,7 +23558,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="776" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="776" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisScaleFilterStrategy&amp;#010;" />
        </header>
@@ -23568,17 +23568,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="789" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxScaleFilterStrategy  = new KisBoxScaleFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="789" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxScaleFilterStrategy  = new KisBoxScaleFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="817" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisLanczos3ScaleFilterStrategy  = new KisLanczos3ScaleFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="817" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisLanczos3ScaleFilterStrategy  = new KisLanczos3ScaleFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="826" tag="tblock_11" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellScaleFilterStrategy  = new KisMitchellScaleFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="826" tag="tblock_11" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellScaleFilterStrategy  = new KisMitchellScaleFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -23612,77 +23612,77 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="789" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="789" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="789" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="789" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="789" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="789" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBoxScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="789" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="789" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBoxScaleFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="789" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="789" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="817" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="817" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="817" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="817" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="817" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="817" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisLanczos3ScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="817" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="817" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisLanczos3ScaleFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="817" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="817" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="826" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="826" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="826" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="826" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="826" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="826" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisMitchellScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="826" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="826" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisMitchellScaleFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="826" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="826" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -23702,17 +23702,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="777" tag="operation_777" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="777" tag="operation_777" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="778" tag="operation_778" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="778" tag="operation_778" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="779" tag="operation_779" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="779" tag="operation_779" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -23728,246 +23728,246 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="782" field_type="7602273" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="782" field_type="7602273" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSimpleScaleFilterStrategy  = new KisSimpleScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSimpleScaleFilterStrategy  = new KisSimpleScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisSimpleScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisSimpleScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="782" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="789" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="789" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="789" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxScaleFilterStrategy  = new KisBoxScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="789" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxScaleFilterStrategy  = new KisBoxScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="789" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="789" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="789" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="789" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="789" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="789" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBoxScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="789" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="789" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBoxScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="789" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="789" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="796" field_type="6357106" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="796" field_type="6357106" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTriangleScaleFilterStrategy  = new KisTriangleScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTriangleScaleFilterStrategy  = new KisTriangleScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisTriangleScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisTriangleScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="803" field_type="7602208" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="803" field_type="7602208" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBellScaleFilterStrategy  = new KisBellScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBellScaleFilterStrategy  = new KisBellScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBellScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBellScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="803" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="810" field_type="6357106" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="810" field_type="6357106" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBSplineScaleFilterStrategy  = new KisBSplineScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBSplineScaleFilterStrategy  = new KisBSplineScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBSplineScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBSplineScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="817" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="817" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="817" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisLanczos3ScaleFilterStrategy  = new KisLanczos3ScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="817" tag="tblock_5" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisLanczos3ScaleFilterStrategy  = new KisLanczos3ScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="817" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="817" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="817" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="817" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="817" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="817" tag="hblock_tag_8" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisLanczos3ScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="817" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="817" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisLanczos3ScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="817" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="817" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="826" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="826" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="826" tag="tblock_11" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellScaleFilterStrategy  = new KisMitchellScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="826" tag="tblock_11" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellScaleFilterStrategy  = new KisMitchellScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="826" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="826" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="826" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="826" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="826" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="826" tag="hblock_tag_14" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisMitchellScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="826" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="826" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisMitchellScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="826" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="826" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -23975,7 +23975,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="781" tqparent_class="781" fileExt=".java" fileName="KisSimpleScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="781" parent_class="781" fileExt=".java" fileName="KisSimpleScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -23987,7 +23987,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="781" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="781" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisSimpleScaleFilterStrategy&amp;#010;" />
        </header>
@@ -23997,7 +23997,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="782" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="782" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -24031,27 +24031,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="782" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="782" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="782" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="782" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="782" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="782" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="782" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="782" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="782" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="782" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -24071,12 +24071,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="785" tag="operation_785" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="785" tag="operation_785" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="786" tag="operation_786" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="786" tag="operation_786" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -24092,36 +24092,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="782" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="782" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="782" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="782" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="782" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="782" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="782" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="782" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="782" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="782" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="782" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="782" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="782" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="782" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="782" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -24129,7 +24129,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="788" tqparent_class="788" fileExt=".java" fileName="KisBoxScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="788" parent_class="788" fileExt=".java" fileName="KisBoxScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -24141,7 +24141,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="788" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="788" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBoxScaleFilterStrategy&amp;#010;" />
        </header>
@@ -24193,12 +24193,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="792" tag="operation_792" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="792" tag="operation_792" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="793" tag="operation_793" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="793" tag="operation_793" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -24214,36 +24214,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="789" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="789" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="789" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="789" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -24251,7 +24251,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="795" tqparent_class="795" fileExt=".java" fileName="KisTriangleScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="795" parent_class="795" fileExt=".java" fileName="KisTriangleScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -24263,7 +24263,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="795" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="795" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTriangleScaleFilterStrategy&amp;#010;" />
        </header>
@@ -24315,12 +24315,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="799" tag="operation_799" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="799" tag="operation_799" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="800" tag="operation_800" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="800" tag="operation_800" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -24336,36 +24336,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="796" field_type="6357106" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="796" field_type="6357106" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="796" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="796" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -24373,7 +24373,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="802" tqparent_class="802" fileExt=".java" fileName="KisBellScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="802" parent_class="802" fileExt=".java" fileName="KisBellScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -24385,7 +24385,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="802" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="802" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBellScaleFilterStrategy&amp;#010;" />
        </header>
@@ -24395,7 +24395,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="803" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="803" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -24429,27 +24429,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="803" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="803" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="803" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="803" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="803" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="803" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="803" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="803" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="803" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="803" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -24469,12 +24469,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="806" tag="operation_806" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="806" tag="operation_806" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="807" tag="operation_807" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="807" tag="operation_807" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -24490,36 +24490,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="803" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="803" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="803" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="803" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="803" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="803" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="803" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="803" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="803" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="803" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="803" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="803" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="803" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="803" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="803" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -24527,7 +24527,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="809" tqparent_class="809" fileExt=".java" fileName="KisBSplineScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="809" parent_class="809" fileExt=".java" fileName="KisBSplineScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -24539,7 +24539,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="809" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="809" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBSplineScaleFilterStrategy&amp;#010;" />
        </header>
@@ -24591,12 +24591,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="813" tag="operation_813" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="813" tag="operation_813" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="814" tag="operation_814" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="814" tag="operation_814" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -24612,36 +24612,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="810" field_type="6619252" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="810" field_type="6619252" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="810" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="810" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -24649,7 +24649,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="816" tqparent_class="816" fileExt=".java" fileName="KisLanczos3ScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="816" parent_class="816" fileExt=".java" fileName="KisLanczos3ScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -24661,7 +24661,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="816" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="816" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisLanczos3ScaleFilterStrategy&amp;#010;" />
        </header>
@@ -24713,17 +24713,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="820" tag="operation_820" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="820" tag="operation_820" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="821" tag="operation_821" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="821" tag="operation_821" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="823" tag="operation_823" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="823" tag="operation_823" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@return double  " />
              </header>
@@ -24739,36 +24739,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="817" field_type="6357106" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="817" field_type="6357106" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="817" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="817" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -24776,7 +24776,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="825" tqparent_class="825" fileExt=".java" fileName="KisMitchellScaleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="825" parent_class="825" fileExt=".java" fileName="KisMitchellScaleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -24788,7 +24788,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="825" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="825" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisMitchellScaleFilterStrategy&amp;#010;" />
        </header>
@@ -24798,7 +24798,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="826" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="826" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -24832,27 +24832,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="826" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="826" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="826" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="826" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="826" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="826" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="826" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="826" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="826" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="826" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -24872,12 +24872,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="829" tag="operation_829" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="829" tag="operation_829" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="830" tag="operation_830" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="830" tag="operation_830" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -24893,36 +24893,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="826" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="826" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="826" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="826" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisScaleFilterStrategy  = new KisScaleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="826" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="826" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="826" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="826" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="826" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="826" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="826" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="826" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="826" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="826" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="826" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -24930,7 +24930,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="832" tqparent_class="832" fileExt=".java" fileName="KisScaleVisitor" >
+    <classifiercodedocument writeOutCode="true" package="" id="832" parent_class="832" fileExt=".java" fileName="KisScaleVisitor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -24942,7 +24942,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="832" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="832" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisScaleVisitor&amp;#010;" />
        </header>
@@ -24952,17 +24952,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="854" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
+          <ccfdeclarationcodeblock parent_id="854" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="865" tag="tblock_2" canDelete="false" indentLevel="1" text="private CLIST* contrib;" >
+          <ccfdeclarationcodeblock parent_id="865" tag="tblock_2" canDelete="false" indentLevel="1" text="private CLIST* contrib;" >
            <header>
             <codecomment tag="" indentLevel="1" text="//array of contribution lists" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="866" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
+          <ccfdeclarationcodeblock parent_id="866" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Implement KisProgressSubject" />
            </header>
@@ -24996,32 +24996,32 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="854" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="854" text="return m_dev;" >
+              <codeaccessormethod accessType="0" parent_id="854" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="854" text="return m_dev;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dev&amp;#010;&amp;#010;@return the value of m_dev" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="854" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="854" text="m_dev = value;" >
+              <codeaccessormethod accessType="1" parent_id="854" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="854" text="m_dev = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dev&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="865" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="865" text="return contrib;" >
+              <codeaccessormethod accessType="0" parent_id="865" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="865" text="return contrib;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="//array of contribution lists" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="865" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="865" text="contrib = value;" >
+              <codeaccessormethod accessType="1" parent_id="865" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="865" text="contrib = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="//array of contribution lists" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="866" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="866" text="return m_cancelRequested;" >
+              <codeaccessormethod accessType="0" parent_id="866" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="866" text="return m_cancelRequested;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="866" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="866" text="m_cancelRequested = value;" >
+              <codeaccessormethod accessType="1" parent_id="866" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="866" text="m_cancelRequested = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
                </header>
@@ -25041,32 +25041,32 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="844" tag="operation_844" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="844" tag="operation_844" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="845" tag="operation_845" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="845" tag="operation_845" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="846" tag="operation_846" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="846" tag="operation_846" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dev &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="849" tag="operation_849" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="849" tag="operation_849" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param sx &amp;#010;@param sy &amp;#010;@param m_progress &amp;#010;@param filterType &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="855" tag="operation_855" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="855" tag="operation_855" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="calc_x_contrib()&amp;#010;      &amp;#010;Calculates the filter weights for a single target column.&amp;#010;contribX->p must be freed afterwards.&amp;#010;&amp;#010;Returns -1 if error, 0 otherwise." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="867" tag="operation_867" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="867" tag="operation_867" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
@@ -25082,96 +25082,96 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="834" field_type="7602296" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="834" field_type="7602296" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisProgressSubject  = new KisProgressSubject ( );" >
+       <ccfdeclarationcodeblock parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisProgressSubject  = new KisProgressSubject ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisProgressSubject to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisProgressSubject from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="854" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="854" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="854" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
+       <ccfdeclarationcodeblock parent_id="854" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="854" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="854" text="return m_dev;" >
+       <codeaccessormethod accessType="0" parent_id="854" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="854" text="return m_dev;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dev&amp;#010;&amp;#010;@return the value of m_dev" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="854" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="854" text="m_dev = value;" >
+       <codeaccessormethod accessType="1" parent_id="854" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="854" text="m_dev = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dev&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="865" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="865" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="//array of contribution lists" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="865" tag="tblock_2" canDelete="false" indentLevel="1" text="private CLIST* contrib;" >
+       <ccfdeclarationcodeblock parent_id="865" tag="tblock_2" canDelete="false" indentLevel="1" text="private CLIST* contrib;" >
         <header>
          <codecomment tag="" indentLevel="1" text="//array of contribution lists" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="865" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="865" text="return contrib;" >
+       <codeaccessormethod accessType="0" parent_id="865" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="865" text="return contrib;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="//array of contribution lists" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="865" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="865" text="contrib = value;" >
+       <codeaccessormethod accessType="1" parent_id="865" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="865" text="contrib = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="//array of contribution lists" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="866" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="866" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Implement KisProgressSubject" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="866" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
+       <ccfdeclarationcodeblock parent_id="866" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Implement KisProgressSubject" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="866" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="866" text="return m_cancelRequested;" >
+       <codeaccessormethod accessType="0" parent_id="866" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="866" text="return m_cancelRequested;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="866" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="866" text="m_cancelRequested = value;" >
+       <codeaccessormethod accessType="1" parent_id="866" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="866" text="m_cancelRequested = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
         </header>
@@ -25179,7 +25179,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="833" tqparent_class="833" fileExt=".java" fileName="KisProgressSubject" >
+    <classifiercodedocument writeOutCode="true" package="" id="833" parent_class="833" fileExt=".java" fileName="KisProgressSubject" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -25191,7 +25191,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="833" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="833" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisProgressSubject&amp;#010;" />
        </header>
@@ -25253,71 +25253,71 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="834" field_type="6357096" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="834" field_type="6357096" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisScaleVisitor  = new KisScaleVisitor ( );" >
+       <ccfdeclarationcodeblock parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisScaleVisitor  = new KisScaleVisitor ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisScaleVisitor to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisScaleVisitor from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="834" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="834" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1319" field_type="6881355" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1319" field_type="6881355" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTransformVisitor  = new KisTransformVisitor ( );" >
+       <ccfdeclarationcodeblock parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTransformVisitor  = new KisTransformVisitor ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisTransformVisitor to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisTransformVisitor from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -25325,7 +25325,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisScaleVisitor" id="837" tqparent_class="837" fileExt=".java" fileName="CONTRIB" >
+    <classifiercodedocument writeOutCode="true" package="KisScaleVisitor" id="837" parent_class="837" fileExt=".java" fileName="CONTRIB" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisScaleVisitor;&amp;#010;" >
        <header>
@@ -25337,7 +25337,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="837" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="837" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CONTRIB&amp;#010;Structs for the image rescaling routine" />
        </header>
@@ -25347,12 +25347,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="838" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 m_pixel;" >
+          <ccfdeclarationcodeblock parent_id="838" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 m_pixel;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="839" tag="tblock_2" canDelete="false" indentLevel="1" text="public double m_weight;" >
+          <ccfdeclarationcodeblock parent_id="839" tag="tblock_2" canDelete="false" indentLevel="1" text="public double m_weight;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -25386,22 +25386,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="838" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="838" text="return m_pixel;" >
+              <codeaccessormethod accessType="0" parent_id="838" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="838" text="return m_pixel;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pixel&amp;#010;&amp;#010;@return the value of m_pixel" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="838" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="838" text="m_pixel = value;" >
+              <codeaccessormethod accessType="1" parent_id="838" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="838" text="m_pixel = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pixel&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="839" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="839" text="return m_weight;" >
+              <codeaccessormethod accessType="0" parent_id="839" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="839" text="return m_weight;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_weight&amp;#010;&amp;#010;@return the value of m_weight" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="839" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="839" text="m_weight = value;" >
+              <codeaccessormethod accessType="1" parent_id="839" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="839" text="m_weight = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_weight&amp;#010;&amp;#010;" />
                </header>
@@ -25431,41 +25431,41 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="838" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="838" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="838" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 m_pixel;" >
+       <ccfdeclarationcodeblock parent_id="838" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 m_pixel;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="838" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="838" text="return m_pixel;" >
+       <codeaccessormethod accessType="0" parent_id="838" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="838" text="return m_pixel;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_pixel&amp;#010;&amp;#010;@return the value of m_pixel" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="838" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="838" text="m_pixel = value;" >
+       <codeaccessormethod accessType="1" parent_id="838" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="838" text="m_pixel = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_pixel&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="839" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="839" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="839" tag="tblock_2" canDelete="false" indentLevel="1" text="public double m_weight;" >
+       <ccfdeclarationcodeblock parent_id="839" tag="tblock_2" canDelete="false" indentLevel="1" text="public double m_weight;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="839" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="839" text="return m_weight;" >
+       <codeaccessormethod accessType="0" parent_id="839" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="839" text="return m_weight;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_weight&amp;#010;&amp;#010;@return the value of m_weight" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="839" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="839" text="m_weight = value;" >
+       <codeaccessormethod accessType="1" parent_id="839" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="839" text="m_weight = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_weight&amp;#010;&amp;#010;" />
         </header>
@@ -25473,7 +25473,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KisScaleVisitor" id="840" tqparent_class="840" fileExt=".java" fileName="CLIST" >
+    <classifiercodedocument writeOutCode="true" package="KisScaleVisitor" id="840" parent_class="840" fileExt=".java" fileName="CLIST" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KisScaleVisitor;&amp;#010;" >
        <header>
@@ -25485,7 +25485,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="840" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="840" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CLIST&amp;#010;" />
        </header>
@@ -25495,12 +25495,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="841" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 n;" >
+          <ccfdeclarationcodeblock parent_id="841" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 n;" >
            <header>
             <codecomment tag="" indentLevel="1" text="//number of contributors" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="843" tag="tblock_2" canDelete="false" indentLevel="1" text="public CONTRIB* p;" >
+          <ccfdeclarationcodeblock parent_id="843" tag="tblock_2" canDelete="false" indentLevel="1" text="public CONTRIB* p;" >
            <header>
             <codecomment tag="" indentLevel="1" text="//pointer to list of contributions" />
            </header>
@@ -25534,22 +25534,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="841" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="841" text="return n;" >
+              <codeaccessormethod accessType="0" parent_id="841" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="841" text="return n;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="//number of contributors" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="841" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="841" text="n = value;" >
+              <codeaccessormethod accessType="1" parent_id="841" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="841" text="n = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="//number of contributors" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="843" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="843" text="return p;" >
+              <codeaccessormethod accessType="0" parent_id="843" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="843" text="return p;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="//pointer to list of contributions" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="843" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="843" text="p = value;" >
+              <codeaccessormethod accessType="1" parent_id="843" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="843" text="p = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="//pointer to list of contributions" />
                </header>
@@ -25579,41 +25579,41 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="841" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="841" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="//number of contributors" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="841" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 n;" >
+       <ccfdeclarationcodeblock parent_id="841" tag="tblock_0" canDelete="false" indentLevel="1" text="public Q_INT32 n;" >
         <header>
          <codecomment tag="" indentLevel="1" text="//number of contributors" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="841" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="841" text="return n;" >
+       <codeaccessormethod accessType="0" parent_id="841" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="841" text="return n;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="//number of contributors" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="841" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="841" text="n = value;" >
+       <codeaccessormethod accessType="1" parent_id="841" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="841" text="n = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="//number of contributors" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="843" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="843" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="//pointer to list of contributions" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="843" tag="tblock_2" canDelete="false" indentLevel="1" text="public CONTRIB* p;" >
+       <ccfdeclarationcodeblock parent_id="843" tag="tblock_2" canDelete="false" indentLevel="1" text="public CONTRIB* p;" >
         <header>
          <codecomment tag="" indentLevel="1" text="//pointer to list of contributions" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="843" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="843" text="return p;" >
+       <codeaccessormethod accessType="0" parent_id="843" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="843" text="return p;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="//pointer to list of contributions" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="843" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="843" text="p = value;" >
+       <codeaccessormethod accessType="1" parent_id="843" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="843" text="p = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="//pointer to list of contributions" />
         </header>
@@ -25621,7 +25621,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="842" tqparent_class="842" fileExt=".java" fileName="CONTRIB*" >
+    <classifiercodedocument writeOutCode="true" package="" id="842" parent_class="842" fileExt=".java" fileName="CONTRIB*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -25633,7 +25633,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="842" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="842" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CONTRIB*&amp;#010;" />
        </header>
@@ -25696,7 +25696,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="847" tqparent_class="847" fileExt=".java" fileName="KisPaintDevice*" >
+    <classifiercodedocument writeOutCode="true" package="" id="847" parent_class="847" fileExt=".java" fileName="KisPaintDevice*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -25708,7 +25708,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="847" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="847" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintDevice*&amp;#010;" />
        </header>
@@ -25771,7 +25771,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="856" tqparent_class="856" fileExt=".java" fileName="CLIST*" >
+    <classifiercodedocument writeOutCode="true" package="" id="856" parent_class="856" fileExt=".java" fileName="CLIST*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -25783,7 +25783,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="856" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="856" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CLIST*&amp;#010;" />
        </header>
@@ -25846,7 +25846,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="862" tqparent_class="862" fileExt=".java" fileName="KisScaleFilterStrategy*" >
+    <classifiercodedocument writeOutCode="true" package="" id="862" parent_class="862" fileExt=".java" fileName="KisScaleFilterStrategy*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -25858,7 +25858,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="862" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="862" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisScaleFilterStrategy*&amp;#010;" />
        </header>
@@ -25921,7 +25921,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="868" tqparent_class="868" fileExt=".java" fileName="KisResource" >
+    <classifiercodedocument writeOutCode="true" package="" id="868" parent_class="868" fileExt=".java" fileName="KisResource" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -25933,7 +25933,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="868" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="868" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisResource&amp;#010; Copyright (c) 2003 Patrick Julien &lt;freak@codepimps.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 KisResource class provides a representation of Chalk image resources.  This&amp;#010;includes, but not limited to, brushes and patterns.&amp;#010;&amp;#010;This replaces the KisKrayon facility that used to be present in Krayon." />
        </header>
@@ -25943,32 +25943,32 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="911" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_name;" >
+          <ccfdeclarationcodeblock parent_id="911" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_name;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="912" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_filename;" >
+          <ccfdeclarationcodeblock parent_id="912" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_filename;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="913" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
+          <ccfdeclarationcodeblock parent_id="913" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="914" tag="tblock_8" canDelete="false" indentLevel="1" text="private boolean m_valid;" >
+          <ccfdeclarationcodeblock parent_id="914" tag="tblock_8" canDelete="false" indentLevel="1" text="private boolean m_valid;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="915" tag="tblock_11" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
+          <ccfdeclarationcodeblock parent_id="915" tag="tblock_11" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="916" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
+          <ccfdeclarationcodeblock parent_id="916" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -26002,62 +26002,62 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="911" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="911" text="return m_name;" >
+              <codeaccessormethod accessType="0" parent_id="911" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="911" text="return m_name;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="911" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="911" text="m_name = value;" >
+              <codeaccessormethod accessType="1" parent_id="911" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="911" text="m_name = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="912" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="912" text="return m_filename;" >
+              <codeaccessormethod accessType="0" parent_id="912" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="912" text="return m_filename;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_filename&amp;#010;&amp;#010;@return the value of m_filename" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="912" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="912" text="m_filename = value;" >
+              <codeaccessormethod accessType="1" parent_id="912" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="912" text="m_filename = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_filename&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="913" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="913" text="return m_dirty;" >
+              <codeaccessormethod accessType="0" parent_id="913" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="913" text="return m_dirty;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dirty&amp;#010;&amp;#010;@return the value of m_dirty" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="913" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="913" text="m_dirty = value;" >
+              <codeaccessormethod accessType="1" parent_id="913" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="913" text="m_dirty = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dirty&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="914" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="914" text="return m_valid;" >
+              <codeaccessormethod accessType="0" parent_id="914" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="914" text="return m_valid;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_valid&amp;#010;&amp;#010;@return the value of m_valid" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="914" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="914" text="m_valid = value;" >
+              <codeaccessormethod accessType="1" parent_id="914" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="914" text="m_valid = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_valid&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="915" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="915" text="return m_width;" >
+              <codeaccessormethod accessType="0" parent_id="915" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="915" text="return m_width;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_width&amp;#010;&amp;#010;@return the value of m_width" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="915" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="915" text="m_width = value;" >
+              <codeaccessormethod accessType="1" parent_id="915" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="915" text="m_width = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_width&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="916" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="916" text="return m_height;" >
+              <codeaccessormethod accessType="0" parent_id="916" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="916" text="return m_height;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_height&amp;#010;&amp;#010;@return the value of m_height" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="916" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="916" text="m_height = value;" >
+              <codeaccessormethod accessType="1" parent_id="916" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="916" text="m_height = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_height&amp;#010;&amp;#010;" />
                </header>
@@ -26077,112 +26077,112 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="873" tag="operation_873" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="873" tag="operation_873" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Creates a new KisResource object using @p filename.  No file is opened&amp;#010;in the constructor, you have to call loadAsync.&amp;#010;&amp;#010;@param filename the file name to save and load from." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="875" tag="operation_875" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="875" tag="operation_875" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="876" tag="operation_876" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="876" tag="operation_876" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Load this resource asynchronously.  The signal loadComplete is emitted when&amp;#010;the resource has been loaded and valid flag is set to true." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="877" tag="operation_877" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Save this resource asynchronously.  The signal saveComplete is emitted when&amp;#010;the resource has been saved." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="878" tag="operation_878" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="878" tag="operation_878" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="Returns a QImage representing this resource.  This image could be null." />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="880" tag="operation_880" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="880" tag="operation_880" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="881" tag="operation_881" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="881" tag="operation_881" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dirt &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="883" tag="operation_883" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="883" tag="operation_883" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="884" tag="operation_884" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="884" tag="operation_884" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param filename &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="886" tag="operation_886" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="886" tag="operation_886" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QString  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="887" tag="operation_887" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="887" tag="operation_887" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param name &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="889" tag="operation_889" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="889" tag="operation_889" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return boolean  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="890" tag="operation_890" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="890" tag="operation_890" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param valid &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="892" tag="operation_892" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="892" tag="operation_892" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="893" tag="operation_893" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="893" tag="operation_893" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return Q_INT32  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="894" tag="operation_894" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="894" tag="operation_894" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param w &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="896" tag="operation_896" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="896" tag="operation_896" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param h &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="898" tag="operation_898" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="898" tag="operation_898" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param me &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="901" tag="operation_901" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="901" tag="operation_901" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param me &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="903" tag="operation_903" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="903" tag="operation_903" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param me &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="905" tag="operation_905" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="905" tag="operation_905" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="908" tag="operation_908" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="908" tag="operation_908" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return KisResource&amp;  " />
              </header>
@@ -26198,191 +26198,191 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="870" field_type="7536740" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="870" field_type="7536740" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
+       <ccfdeclarationcodeblock parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type QObject to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type QObject from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="911" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="911" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="911" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_name;" >
+       <ccfdeclarationcodeblock parent_id="911" tag="tblock_0" canDelete="false" indentLevel="1" text="private QString m_name;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="911" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="911" text="return m_name;" >
+       <codeaccessormethod accessType="0" parent_id="911" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="911" text="return m_name;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_name&amp;#010;&amp;#010;@return the value of m_name" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="911" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="911" text="m_name = value;" >
+       <codeaccessormethod accessType="1" parent_id="911" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="911" text="m_name = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_name&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="912" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="912" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="912" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_filename;" >
+       <ccfdeclarationcodeblock parent_id="912" tag="tblock_2" canDelete="false" indentLevel="1" text="private QString m_filename;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="912" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="912" text="return m_filename;" >
+       <codeaccessormethod accessType="0" parent_id="912" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="912" text="return m_filename;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_filename&amp;#010;&amp;#010;@return the value of m_filename" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="912" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="912" text="m_filename = value;" >
+       <codeaccessormethod accessType="1" parent_id="912" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="912" text="m_filename = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_filename&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="913" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="913" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="913" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
+       <ccfdeclarationcodeblock parent_id="913" tag="tblock_5" canDelete="false" indentLevel="1" text="private boolean m_dirty;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="913" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="913" text="return m_dirty;" >
+       <codeaccessormethod accessType="0" parent_id="913" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="913" text="return m_dirty;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dirty&amp;#010;&amp;#010;@return the value of m_dirty" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="913" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="913" text="m_dirty = value;" >
+       <codeaccessormethod accessType="1" parent_id="913" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="913" text="m_dirty = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dirty&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="914" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="914" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="914" tag="tblock_8" canDelete="false" indentLevel="1" text="private boolean m_valid;" >
+       <ccfdeclarationcodeblock parent_id="914" tag="tblock_8" canDelete="false" indentLevel="1" text="private boolean m_valid;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="914" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="914" text="return m_valid;" >
+       <codeaccessormethod accessType="0" parent_id="914" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="914" text="return m_valid;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_valid&amp;#010;&amp;#010;@return the value of m_valid" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="914" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="914" text="m_valid = value;" >
+       <codeaccessormethod accessType="1" parent_id="914" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="914" text="m_valid = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_valid&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="915" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="915" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="915" tag="tblock_11" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
+       <ccfdeclarationcodeblock parent_id="915" tag="tblock_11" canDelete="false" indentLevel="1" text="private Q_INT32 m_width;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="915" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="915" text="return m_width;" >
+       <codeaccessormethod accessType="0" parent_id="915" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="915" text="return m_width;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_width&amp;#010;&amp;#010;@return the value of m_width" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="915" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="915" text="m_width = value;" >
+       <codeaccessormethod accessType="1" parent_id="915" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="915" text="m_width = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_width&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="916" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="916" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="916" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
+       <ccfdeclarationcodeblock parent_id="916" tag="tblock_14" canDelete="false" indentLevel="1" text="private Q_INT32 m_height;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="916" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="916" text="return m_height;" >
+       <codeaccessormethod accessType="0" parent_id="916" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="916" text="return m_height;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_height&amp;#010;&amp;#010;@return the value of m_height" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="916" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="916" text="m_height = value;" >
+       <codeaccessormethod accessType="1" parent_id="916" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="916" text="m_height = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_height&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="917" field_type="6881391" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="917" field_type="6881391" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisProfile  = new KisProfile ( );" >
+       <ccfdeclarationcodeblock parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisProfile  = new KisProfile ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisProfile to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisProfile from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="917" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="917" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -26390,7 +26390,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="869" tqparent_class="869" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
+    <classifiercodedocument writeOutCode="true" package="" id="869" parent_class="869" fileExt=".java" fileName=TQOBJECT_OBJECT_NAME_STRING >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -26402,7 +26402,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="869" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="869" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QObject&amp;#010;" />
        </header>
@@ -26464,176 +26464,176 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="870" field_type="2" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="870" field_type="2" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisResource  = new KisResource ( );" >
+       <ccfdeclarationcodeblock parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisResource  = new KisResource ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisResource to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisResource from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="870" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="870" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="961" field_type="2621472" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="961" field_type="2621472" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisImage  = new KisImage ( );" >
+       <ccfdeclarationcodeblock parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisImage  = new KisImage ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisImage to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisImage from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="961" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="961" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1433" field_type="7274528" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1433" field_type="7274528" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisPaintDevice  = new KisPaintDevice ( );" >
+       <ccfdeclarationcodeblock parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisPaintDevice  = new KisPaintDevice ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisPaintDevice to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisPaintDevice from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1433" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1433" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1695" field_type="7536745" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1695" field_type="7536745" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisDockerManager  = new KisDockerManager ( );" >
+       <ccfdeclarationcodeblock parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisDockerManager  = new KisDockerManager ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisDockerManager to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisDockerManager from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1798" field_type="4980850" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1798" field_type="4980850" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSelectionManager  = new KisSelectionManager ( );" >
+       <ccfdeclarationcodeblock parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSelectionManager  = new KisSelectionManager ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisSelectionManager to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisSelectionManager from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1798" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1798" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -26641,7 +26641,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="879" tqparent_class="879" fileExt=".java" fileName="QImage" >
+    <classifiercodedocument writeOutCode="true" package="" id="879" parent_class="879" fileExt=".java" fileName="QImage" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -26653,7 +26653,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="879" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="879" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QImage&amp;#010;" />
        </header>
@@ -26716,7 +26716,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="899" tqparent_class="899" fileExt=".java" fileName="KisResource*" >
+    <classifiercodedocument writeOutCode="true" package="" id="899" parent_class="899" fileExt=".java" fileName="KisResource*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -26728,7 +26728,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="899" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="899" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisResource*&amp;#010;" />
        </header>
@@ -26791,7 +26791,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="906" tqparent_class="906" fileExt=".java" fileName="const KisResource&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="906" parent_class="906" fileExt=".java" fileName="const KisResource&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -26803,7 +26803,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="906" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="906" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisResource&amp;&amp;#010;" />
        </header>
@@ -26866,7 +26866,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="910" tqparent_class="910" fileExt=".java" fileName="KisResource&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="910" parent_class="910" fileExt=".java" fileName="KisResource&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -26878,7 +26878,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="910" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="910" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisResource&amp;&amp;#010;" />
        </header>
@@ -26941,7 +26941,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="924" tqparent_class="924" fileExt=".java" fileName="Q_UINT32" >
+    <classifiercodedocument writeOutCode="true" package="" id="924" parent_class="924" fileExt=".java" fileName="Q_UINT32" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -26953,7 +26953,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="924" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="924" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT32&amp;#010;" />
        </header>
@@ -27016,7 +27016,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="930" tqparent_class="930" fileExt=".java" fileName="cmsHPROFILE" >
+    <classifiercodedocument writeOutCode="true" package="" id="930" parent_class="930" fileExt=".java" fileName="cmsHPROFILE" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27028,7 +27028,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="930" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="930" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class CmsHPROFILE&amp;#010;" />
        </header>
@@ -27091,7 +27091,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="931" tqparent_class="931" fileExt=".java" fileName="const cmsHPROFILE" >
+    <classifiercodedocument writeOutCode="true" package="" id="931" parent_class="931" fileExt=".java" fileName="const cmsHPROFILE" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27103,7 +27103,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="931" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="931" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const cmsHPROFILE&amp;#010;" />
        </header>
@@ -27166,7 +27166,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="939" tqparent_class="939" fileExt=".java" fileName="icColorSpaceSignature" >
+    <classifiercodedocument writeOutCode="true" package="" id="939" parent_class="939" fileExt=".java" fileName="icColorSpaceSignature" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27178,7 +27178,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="939" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="939" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class IcColorSpaceSignature&amp;#010;" />
        </header>
@@ -27241,7 +27241,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="941" tqparent_class="941" fileExt=".java" fileName="icProfileClassSignature" >
+    <classifiercodedocument writeOutCode="true" package="" id="941" parent_class="941" fileExt=".java" fileName="icProfileClassSignature" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27253,7 +27253,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="941" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="941" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class IcProfileClassSignature&amp;#010;" />
        </header>
@@ -27316,7 +27316,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="957" tqparent_class="957" fileExt=".java" fileName="KoCommandHistory" >
+    <classifiercodedocument writeOutCode="true" package="" id="957" parent_class="957" fileExt=".java" fileName="KoCommandHistory" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27328,7 +27328,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="957" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="957" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoCommandHistory&amp;#010;" />
        </header>
@@ -27391,7 +27391,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="958" tqparent_class="958" fileExt=".java" fileName="KisNameServer" >
+    <classifiercodedocument writeOutCode="true" package="" id="958" parent_class="958" fileExt=".java" fileName="KisNameServer" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27403,7 +27403,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="958" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="958" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisNameServer&amp;#010;" />
        </header>
@@ -27466,7 +27466,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="959" tqparent_class="959" fileExt=".java" fileName="KisPainter" >
+    <classifiercodedocument writeOutCode="true" package="" id="959" parent_class="959" fileExt=".java" fileName="KisPainter" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27478,7 +27478,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="959" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="959" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPainter&amp;#010;" />
        </header>
@@ -27541,7 +27541,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="960" tqparent_class="960" fileExt=".java" fileName="DCOPObject" >
+    <classifiercodedocument writeOutCode="true" package="" id="960" parent_class="960" fileExt=".java" fileName="DCOPObject" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27553,7 +27553,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="960" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="960" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class DCOPObject&amp;#010;" />
        </header>
@@ -27616,7 +27616,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="974" tqparent_class="974" fileExt=".java" fileName="const KisImage&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="974" parent_class="974" fileExt=".java" fileName="const KisImage&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27628,7 +27628,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="974" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="974" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisImage&amp;&amp;#010;" />
        </header>
@@ -27691,7 +27691,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="978" tqparent_class="978" fileExt=".java" fileName="DCOPObject*" >
+    <classifiercodedocument writeOutCode="true" package="" id="978" parent_class="978" fileExt=".java" fileName="DCOPObject*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27703,7 +27703,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="978" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="978" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class DCOPObject*&amp;#010;" />
        </header>
@@ -27766,7 +27766,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="989" tqparent_class="989" fileExt=".java" fileName="QPainter" >
+    <classifiercodedocument writeOutCode="true" package="" id="989" parent_class="989" fileExt=".java" fileName="QPainter" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27778,7 +27778,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="989" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="989" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPainter&amp;#010;" />
        </header>
@@ -27841,7 +27841,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="990" tqparent_class="990" fileExt=".java" fileName="QPainter&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="990" parent_class="990" fileExt=".java" fileName="QPainter&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27853,7 +27853,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="990" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="990" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPainter&amp;&amp;#010;" />
        </header>
@@ -27916,7 +27916,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1025" tqparent_class="1025" fileExt=".java" fileName="const KisProfileSP&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1025" parent_class="1025" fileExt=".java" fileName="const KisProfileSP&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -27928,7 +27928,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1025" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1025" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisProfileSP&amp;&amp;#010;" />
        </header>
@@ -27991,7 +27991,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1028" tqparent_class="1028" fileExt=".java" fileName="KoCommandHistory*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1028" parent_class="1028" fileExt=".java" fileName="KoCommandHistory*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28003,7 +28003,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1028" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1028" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoCommandHistory*&amp;#010;" />
        </header>
@@ -28066,7 +28066,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1032" tqparent_class="1032" fileExt=".java" fileName="KURL" >
+    <classifiercodedocument writeOutCode="true" package="" id="1032" parent_class="1032" fileExt=".java" fileName="KURL" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28078,7 +28078,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1032" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1032" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KURL&amp;#010;" />
        </header>
@@ -28141,7 +28141,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1034" tqparent_class="1034" fileExt=".java" fileName="const KURL&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1034" parent_class="1034" fileExt=".java" fileName="const KURL&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28153,7 +28153,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1034" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1034" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KURL&amp;&amp;#010;" />
        </header>
@@ -28216,7 +28216,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="KoUnit" id="1038" tqparent_class="1038" fileExt=".java" fileName="Unit" >
+    <classifiercodedocument writeOutCode="true" package="KoUnit" id="1038" parent_class="1038" fileExt=".java" fileName="Unit" >
      <textblocks>
       <codeblockwithcomments tag="packages" text="package KoUnit;&amp;#010;" >
        <header>
@@ -28228,7 +28228,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1038" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1038" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Unit&amp;#010;" />
        </header>
@@ -28291,7 +28291,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1040" tqparent_class="1040" fileExt=".java" fileName="const KoUnit::Unit&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1040" parent_class="1040" fileExt=".java" fileName="const KoUnit::Unit&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28303,7 +28303,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1040" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1040" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KoUnit::Unit&amp;&amp;#010;" />
        </header>
@@ -28366,7 +28366,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1052" tqparent_class="1052" fileExt=".java" fileName="const vKisLayerSP&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1052" parent_class="1052" fileExt=".java" fileName="const vKisLayerSP&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28378,7 +28378,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1052" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1052" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const vKisLayerSP&amp;&amp;#010;" />
        </header>
@@ -28441,7 +28441,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1056" tqparent_class="1056" fileExt=".java" fileName="const KisLayerSP" >
+    <classifiercodedocument writeOutCode="true" package="" id="1056" parent_class="1056" fileExt=".java" fileName="const KisLayerSP" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28453,7 +28453,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1056" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1056" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisLayerSP&amp;#010;" />
        </header>
@@ -28516,7 +28516,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1062" tqparent_class="1062" fileExt=".java" fileName="const KisLayerSP&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1062" parent_class="1062" fileExt=".java" fileName="const KisLayerSP&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28528,7 +28528,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1062" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1062" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisLayerSP&amp;&amp;#010;" />
        </header>
@@ -28591,7 +28591,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1104" tqparent_class="1104" fileExt=".java" fileName="KisGuideMgr*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1104" parent_class="1104" fileExt=".java" fileName="KisGuideMgr*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28603,7 +28603,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1104" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1104" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGuideMgr*&amp;#010;" />
        </header>
@@ -28666,7 +28666,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1128" tqparent_class="1128" fileExt=".java" fileName="KisImage&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1128" parent_class="1128" fileExt=".java" fileName="KisImage&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28678,7 +28678,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1128" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1128" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisImage&amp;&amp;#010;" />
        </header>
@@ -28741,7 +28741,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1153" tqparent_class="1153" fileExt=".java" fileName="KisNameServer*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1153" parent_class="1153" fileExt=".java" fileName="KisNameServer*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28753,7 +28753,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1153" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1153" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisNameServer*&amp;#010;" />
        </header>
@@ -28816,7 +28816,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1160" tqparent_class="1160" fileExt=".java" fileName="KisQuantumOperation" >
+    <classifiercodedocument writeOutCode="true" package="" id="1160" parent_class="1160" fileExt=".java" fileName="KisQuantumOperation" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -28828,7 +28828,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1160" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1160" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisQuantumOperation&amp;#010; Copyright (c) 2004 Cyrille Berger &lt;cberger@cberger.net>&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;//** This class is meant to be used inside KisQuantum" />
        </header>
@@ -28838,7 +28838,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1178" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisQuantumOperationMasked  = new KisQuantumOperationMasked ( );" >
+          <ccfdeclarationcodeblock parent_id="1178" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisQuantumOperationMasked  = new KisQuantumOperationMasked ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -28872,27 +28872,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1178" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="1178" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1178" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="1178" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="1178" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="1178" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisQuantumOperationMasked to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="1178" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="1178" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisQuantumOperationMasked from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="1178" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="1178" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -28912,17 +28912,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1161" tag="operation_1161" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1161" tag="operation_1161" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1162" tag="operation_1162" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1162" tag="operation_1162" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1165" tag="operation_1165" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1165" tag="operation_1165" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="This function is called to clone this object.&amp;#010;@param index this is the offset" />
              </header>
@@ -28938,71 +28938,71 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1169" field_type="7209071" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1169" field_type="7209071" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisQuantumOperationLinear  = new KisQuantumOperationLinear ( );" >
+       <ccfdeclarationcodeblock parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisQuantumOperationLinear  = new KisQuantumOperationLinear ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisQuantumOperationLinear to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisQuantumOperationLinear from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1178" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1178" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1178" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisQuantumOperationMasked  = new KisQuantumOperationMasked ( );" >
+       <ccfdeclarationcodeblock parent_id="1178" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisQuantumOperationMasked  = new KisQuantumOperationMasked ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1178" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1178" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1178" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1178" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1178" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1178" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisQuantumOperationMasked to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1178" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1178" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisQuantumOperationMasked from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1178" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1178" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -29010,7 +29010,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1163" tqparent_class="1163" fileExt=".java" fileName="QUANTUM" >
+    <classifiercodedocument writeOutCode="true" package="" id="1163" parent_class="1163" fileExt=".java" fileName="QUANTUM" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29022,7 +29022,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1163" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1163" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QUANTUM&amp;#010;" />
        </header>
@@ -29085,7 +29085,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1167" tqparent_class="1167" fileExt=".java" fileName="KisQuantumOperation*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1167" parent_class="1167" fileExt=".java" fileName="KisQuantumOperation*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29097,7 +29097,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1167" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1167" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisQuantumOperation*&amp;#010;" />
        </header>
@@ -29160,7 +29160,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1168" tqparent_class="1168" fileExt=".java" fileName="KisQuantumOperationLinear" >
+    <classifiercodedocument writeOutCode="true" package="" id="1168" parent_class="1168" fileExt=".java" fileName="KisQuantumOperationLinear" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29172,7 +29172,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1168" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1168" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisQuantumOperationLinear&amp;#010;" />
        </header>
@@ -29224,17 +29224,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1172" tag="operation_1172" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1172" tag="operation_1172" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1173" tag="operation_1173" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1173" tag="operation_1173" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1175" tag="operation_1175" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1175" tag="operation_1175" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param index &amp;#010;@return KisQuantumOperation*  " />
              </header>
@@ -29250,36 +29250,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1169" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1169" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisQuantumOperation  = new KisQuantumOperation ( );" >
+       <ccfdeclarationcodeblock parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisQuantumOperation  = new KisQuantumOperation ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisQuantumOperation to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisQuantumOperation from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1169" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1169" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -29287,7 +29287,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1177" tqparent_class="1177" fileExt=".java" fileName="KisQuantumOperationMasked" >
+    <classifiercodedocument writeOutCode="true" package="" id="1177" parent_class="1177" fileExt=".java" fileName="KisQuantumOperationMasked" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29299,7 +29299,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1177" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1177" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisQuantumOperationMasked&amp;#010;" />
        </header>
@@ -29351,17 +29351,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1181" tag="operation_1181" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1181" tag="operation_1181" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1182" tag="operation_1182" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param  &amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1184" tag="operation_1184" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1184" tag="operation_1184" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param index &amp;#010;@return KisQuantumOperation*  " />
              </header>
@@ -29377,36 +29377,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1178" field_type="7209071" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1178" field_type="7209071" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisQuantumOperation  = new KisQuantumOperation ( );" >
+       <ccfdeclarationcodeblock parent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisQuantumOperation  = new KisQuantumOperation ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisQuantumOperation to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisQuantumOperation from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1178" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1178" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -29414,7 +29414,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1186" tqparent_class="1186" fileExt=".java" fileName="KisQuantum" >
+    <classifiercodedocument writeOutCode="true" package="" id="1186" parent_class="1186" fileExt=".java" fileName="KisQuantum" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29426,7 +29426,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1186" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1186" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisQuantum&amp;#010; Copyright (c) 2004 Cyrille Berger &lt;cberger@cberger.net>&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;An editable wrapper around the byte values for a single colour channel." />
        </header>
@@ -29436,12 +29436,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1200" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_quantum;" >
+          <ccfdeclarationcodeblock parent_id="1200" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_quantum;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1201" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisQuantumOperation* m_op;" >
+          <ccfdeclarationcodeblock parent_id="1201" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisQuantumOperation* m_op;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -29475,22 +29475,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1200" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1200" text="return m_quantum;" >
+              <codeaccessormethod accessType="0" parent_id="1200" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1200" text="return m_quantum;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_quantum&amp;#010;&amp;#010;@return the value of m_quantum" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1200" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1200" text="m_quantum = value;" >
+              <codeaccessormethod accessType="1" parent_id="1200" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1200" text="m_quantum = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_quantum&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1201" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1201" text="return m_op;" >
+              <codeaccessormethod accessType="0" parent_id="1201" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1201" text="return m_op;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_op&amp;#010;&amp;#010;@return the value of m_op" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1201" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1201" text="m_op = value;" >
+              <codeaccessormethod accessType="1" parent_id="1201" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1201" text="m_op = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_op&amp;#010;&amp;#010;" />
                </header>
@@ -29510,32 +29510,32 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1187" tag="operation_1187" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1187" tag="operation_1187" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param q &amp;#010;@param op &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1191" tag="operation_1191" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1191" tag="operation_1191" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1192" tag="operation_1192" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1192" tag="operation_1192" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param q &amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1194" tag="operation_1194" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param q &amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1196" tag="operation_1196" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param q &amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1198" tag="operation_1198" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1198" tag="operation_1198" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param index &amp;#010;@return KisQuantum  " />
              </header>
@@ -29551,41 +29551,41 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1200" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1200" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1200" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_quantum;" >
+       <ccfdeclarationcodeblock parent_id="1200" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_quantum;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1200" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1200" text="return m_quantum;" >
+       <codeaccessormethod accessType="0" parent_id="1200" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1200" text="return m_quantum;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_quantum&amp;#010;&amp;#010;@return the value of m_quantum" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1200" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1200" text="m_quantum = value;" >
+       <codeaccessormethod accessType="1" parent_id="1200" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1200" text="m_quantum = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_quantum&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1201" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1201" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1201" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisQuantumOperation* m_op;" >
+       <ccfdeclarationcodeblock parent_id="1201" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisQuantumOperation* m_op;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1201" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1201" text="return m_op;" >
+       <codeaccessormethod accessType="0" parent_id="1201" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1201" text="return m_op;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_op&amp;#010;&amp;#010;@return the value of m_op" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1201" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1201" text="m_op = value;" >
+       <codeaccessormethod accessType="1" parent_id="1201" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1201" text="m_op = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_op&amp;#010;&amp;#010;" />
         </header>
@@ -29593,7 +29593,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1188" tqparent_class="1188" fileExt=".java" fileName="QUANTUM*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1188" parent_class="1188" fileExt=".java" fileName="QUANTUM*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29605,7 +29605,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1188" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1188" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QUANTUM*&amp;#010;" />
        </header>
@@ -29668,7 +29668,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1202" tqparent_class="1202" fileExt=".java" fileName="KisPixelRO" >
+    <classifiercodedocument writeOutCode="true" package="" id="1202" parent_class="1202" fileExt=".java" fileName="KisPixelRO" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29680,7 +29680,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1202" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1202" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPixelRO&amp;#010;// XXX: Template these classes to byte, int, float, double// XXX: Separate color channels from substance channels (wetness, thickness, grainyness) on construction/**&amp;#010;KisPixel and KisPixelRO are the primary classes to access individual pixel data.&amp;#010;A pixel consists of channels of a certain size. At the moment, all channels must&amp;#010;be of the same size, and that size is one byte, or QUANTUM. In the future&amp;#010;pixels with heteregenous channels and larger (or smaller?) channels will be&amp;#010;possible, too.&amp;#010;&amp;#010;The [] operator returns the channel at that index. You can discover the number&amp;#010;of channels and the names of the channels by querying the color strategy.&amp;#010;All channels can be accessed using this method.&amp;#010;&amp;#010;There are three types of channels: color, alpha and substance.&amp;#010;&amp;#010;Generally, in filters and suchlike code, you can treat all color channels the same, &amp;#010;and have a different algorithm for alpha. Substance is a future extension, usable&amp;#010;for wetness, grainyness or thickness.&amp;#010;&amp;#010;The color channels come first -- this is useful if you want to loop over &amp;#010;these channels (for int i = 0; i &lt; colorspace -> nColorChannels(); ++i) { hack(pixel[i]); }.&amp;#010;&amp;#010;The next index after the colour channels points to the alpha channel. A pointer to&amp;#010;the value of the alpha channel can also be retrieved with alpha(). Always&amp;#010;check whether there is actually an alpha channel, otherwise alpha() will&amp;#010;return the first channel of the next pixel, most probably, or perhaps even&amp;#010;something worse.&amp;#010;&amp;#010;After alpha, the substance channels will come.&amp;#010;&amp;#010;Note: once you start working with color management a sequence of bytes that happens to&amp;#010;encode R, G and B values is still meaningless. You cannot know what _color_ the bytes&amp;#010;represent unless you also have a profile. So KisPixel must know about the profile, too.&amp;#010;//**&amp;#010;A read-only pixel. You can retrieve the channel values by name or position&amp;#010;or all channels as a value vector." />
        </header>
@@ -29690,27 +29690,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1220" tag="tblock_0" canDelete="false" indentLevel="1" text="private const QUANTUM* m_channels;" >
+          <ccfdeclarationcodeblock parent_id="1220" tag="tblock_0" canDelete="false" indentLevel="1" text="private const QUANTUM* m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1221" tag="tblock_2" canDelete="false" indentLevel="1" text="private const QUANTUM* m_alpha;" >
+          <ccfdeclarationcodeblock parent_id="1221" tag="tblock_2" canDelete="false" indentLevel="1" text="private const QUANTUM* m_alpha;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1222" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
+          <ccfdeclarationcodeblock parent_id="1222" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1223" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+          <ccfdeclarationcodeblock parent_id="1223" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1224" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+          <ccfdeclarationcodeblock parent_id="1224" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -29744,52 +29744,52 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1220" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1220" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="1220" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1220" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1220" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1220" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1220" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1220" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1221" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1221" text="return m_alpha;" >
+              <codeaccessormethod accessType="0" parent_id="1221" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1221" text="return m_alpha;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alpha&amp;#010;&amp;#010;@return the value of m_alpha" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1221" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1221" text="m_alpha = value;" >
+              <codeaccessormethod accessType="1" parent_id="1221" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1221" text="m_alpha = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alpha&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1222" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1222" text="return m_selected;" >
+              <codeaccessormethod accessType="0" parent_id="1222" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1222" text="return m_selected;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_selected&amp;#010;&amp;#010;@return the value of m_selected" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1222" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1222" text="m_selected = value;" >
+              <codeaccessormethod accessType="1" parent_id="1222" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1222" text="m_selected = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_selected&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1223" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1223" text="return m_colorStrategy;" >
+              <codeaccessormethod accessType="0" parent_id="1223" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1223" text="return m_colorStrategy;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1223" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1223" text="m_colorStrategy = value;" >
+              <codeaccessormethod accessType="1" parent_id="1223" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1223" text="m_colorStrategy = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1224" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1224" text="return m_profile;" >
+              <codeaccessormethod accessType="0" parent_id="1224" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1224" text="return m_profile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1224" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1224" text="m_profile = value;" >
+              <codeaccessormethod accessType="1" parent_id="1224" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1224" text="m_profile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
                </header>
@@ -29809,47 +29809,47 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1203" tag="operation_1203" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1203" tag="operation_1203" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channels &amp;#010;@param alpha &amp;#010;@param colorStrategy &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1209" tag="operation_1209" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1209" tag="operation_1209" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1210" tag="operation_1210" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1210" tag="operation_1210" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param index &amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1212" tag="operation_1212" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1212" tag="operation_1212" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1213" tag="operation_1213" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1213" tag="operation_1213" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1214" tag="operation_1214" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1214" tag="operation_1214" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param selected &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1216" tag="operation_1216" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1216" tag="operation_1216" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisStrategyColorSpaceSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1217" tag="operation_1217" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1217" tag="operation_1217" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1219" tag="operation_1219" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1219" tag="operation_1219" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisProfileSP  " />
              </header>
@@ -29865,101 +29865,101 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1220" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1220" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1220" tag="tblock_0" canDelete="false" indentLevel="1" text="private const QUANTUM* m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1220" tag="tblock_0" canDelete="false" indentLevel="1" text="private const QUANTUM* m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1220" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1220" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1220" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1220" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1220" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1220" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1220" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1220" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1221" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1221" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1221" tag="tblock_2" canDelete="false" indentLevel="1" text="private const QUANTUM* m_alpha;" >
+       <ccfdeclarationcodeblock parent_id="1221" tag="tblock_2" canDelete="false" indentLevel="1" text="private const QUANTUM* m_alpha;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1221" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1221" text="return m_alpha;" >
+       <codeaccessormethod accessType="0" parent_id="1221" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1221" text="return m_alpha;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alpha&amp;#010;&amp;#010;@return the value of m_alpha" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1221" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1221" text="m_alpha = value;" >
+       <codeaccessormethod accessType="1" parent_id="1221" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1221" text="m_alpha = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alpha&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1222" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1222" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1222" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
+       <ccfdeclarationcodeblock parent_id="1222" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1222" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1222" text="return m_selected;" >
+       <codeaccessormethod accessType="0" parent_id="1222" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1222" text="return m_selected;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_selected&amp;#010;&amp;#010;@return the value of m_selected" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1222" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1222" text="m_selected = value;" >
+       <codeaccessormethod accessType="1" parent_id="1222" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1222" text="m_selected = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_selected&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1223" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1223" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1223" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+       <ccfdeclarationcodeblock parent_id="1223" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1223" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1223" text="return m_colorStrategy;" >
+       <codeaccessormethod accessType="0" parent_id="1223" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1223" text="return m_colorStrategy;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1223" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1223" text="m_colorStrategy = value;" >
+       <codeaccessormethod accessType="1" parent_id="1223" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1223" text="m_colorStrategy = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1224" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1224" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1224" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+       <ccfdeclarationcodeblock parent_id="1224" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1224" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1224" text="return m_profile;" >
+       <codeaccessormethod accessType="0" parent_id="1224" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1224" text="return m_profile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1224" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1224" text="m_profile = value;" >
+       <codeaccessormethod accessType="1" parent_id="1224" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1224" text="m_profile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
         </header>
@@ -29967,7 +29967,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1204" tqparent_class="1204" fileExt=".java" fileName="const QUANTUM*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1204" parent_class="1204" fileExt=".java" fileName="const QUANTUM*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -29979,7 +29979,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1204" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1204" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QUANTUM*&amp;#010;" />
        </header>
@@ -30042,7 +30042,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1225" tqparent_class="1225" fileExt=".java" fileName="KisPixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="1225" parent_class="1225" fileExt=".java" fileName="KisPixel" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -30054,7 +30054,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1225" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1225" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPixel&amp;#010;A read-write pixel. You can retrieve the channel values by name or position&amp;#010;or all channels as a pointer vector.&amp;#010;&amp;#010;The alpha channel is separately available." />
        </header>
@@ -30064,27 +30064,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1248" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_channels;" >
+          <ccfdeclarationcodeblock parent_id="1248" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_channels;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1249" tag="tblock_2" canDelete="false" indentLevel="1" text="private QUANTUM* m_alpha;" >
+          <ccfdeclarationcodeblock parent_id="1249" tag="tblock_2" canDelete="false" indentLevel="1" text="private QUANTUM* m_alpha;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1250" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
+          <ccfdeclarationcodeblock parent_id="1250" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1251" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+          <ccfdeclarationcodeblock parent_id="1251" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1252" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+          <ccfdeclarationcodeblock parent_id="1252" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -30118,52 +30118,52 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1248" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1248" text="return m_channels;" >
+              <codeaccessormethod accessType="0" parent_id="1248" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1248" text="return m_channels;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1248" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1248" text="m_channels = value;" >
+              <codeaccessormethod accessType="1" parent_id="1248" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1248" text="m_channels = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1249" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1249" text="return m_alpha;" >
+              <codeaccessormethod accessType="0" parent_id="1249" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1249" text="return m_alpha;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alpha&amp;#010;&amp;#010;@return the value of m_alpha" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1249" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1249" text="m_alpha = value;" >
+              <codeaccessormethod accessType="1" parent_id="1249" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1249" text="m_alpha = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alpha&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1250" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1250" text="return m_selected;" >
+              <codeaccessormethod accessType="0" parent_id="1250" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1250" text="return m_selected;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_selected&amp;#010;&amp;#010;@return the value of m_selected" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1250" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1250" text="m_selected = value;" >
+              <codeaccessormethod accessType="1" parent_id="1250" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1250" text="m_selected = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_selected&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1251" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1251" text="return m_colorStrategy;" >
+              <codeaccessormethod accessType="0" parent_id="1251" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1251" text="return m_colorStrategy;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1251" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1251" text="m_colorStrategy = value;" >
+              <codeaccessormethod accessType="1" parent_id="1251" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1251" text="m_colorStrategy = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1252" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1252" text="return m_profile;" >
+              <codeaccessormethod accessType="0" parent_id="1252" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1252" text="return m_profile;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1252" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1252" text="m_profile = value;" >
+              <codeaccessormethod accessType="1" parent_id="1252" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1252" text="m_profile = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
                </header>
@@ -30183,57 +30183,57 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1226" tag="operation_1226" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1226" tag="operation_1226" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param nbChannels &amp;#010;@param nbAlphaChannels &amp;#010;@param colorStrategy &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1231" tag="operation_1231" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1231" tag="operation_1231" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param channels &amp;#010;@param alpha &amp;#010;@param colorStrategy &amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1236" tag="operation_1236" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1236" tag="operation_1236" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1237" tag="operation_1237" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1237" tag="operation_1237" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param index &amp;#010;@return KisQuantum  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1239" tag="operation_1239" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1239" tag="operation_1239" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisQuantum  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1240" tag="operation_1240" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QUANTUM  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1241" tag="operation_1241" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1241" tag="operation_1241" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param selected &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1243" tag="operation_1243" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1243" tag="operation_1243" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisStrategyColorSpaceSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1244" tag="operation_1244" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1244" tag="operation_1244" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param profile &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1246" tag="operation_1246" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1246" tag="operation_1246" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return KisProfileSP  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1247" tag="operation_1247" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1247" tag="operation_1247" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return QUANTUM*  " />
              </header>
@@ -30249,101 +30249,101 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1248" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1248" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1248" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_channels;" >
+       <ccfdeclarationcodeblock parent_id="1248" tag="tblock_0" canDelete="false" indentLevel="1" text="private QUANTUM* m_channels;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1248" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1248" text="return m_channels;" >
+       <codeaccessormethod accessType="0" parent_id="1248" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1248" text="return m_channels;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channels&amp;#010;&amp;#010;@return the value of m_channels" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1248" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1248" text="m_channels = value;" >
+       <codeaccessormethod accessType="1" parent_id="1248" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1248" text="m_channels = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channels&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1249" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1249" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1249" tag="tblock_2" canDelete="false" indentLevel="1" text="private QUANTUM* m_alpha;" >
+       <ccfdeclarationcodeblock parent_id="1249" tag="tblock_2" canDelete="false" indentLevel="1" text="private QUANTUM* m_alpha;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1249" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1249" text="return m_alpha;" >
+       <codeaccessormethod accessType="0" parent_id="1249" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1249" text="return m_alpha;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_alpha&amp;#010;&amp;#010;@return the value of m_alpha" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1249" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1249" text="m_alpha = value;" >
+       <codeaccessormethod accessType="1" parent_id="1249" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1249" text="m_alpha = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_alpha&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1250" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1250" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1250" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
+       <ccfdeclarationcodeblock parent_id="1250" tag="tblock_5" canDelete="false" indentLevel="1" text="private QUANTUM m_selected;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1250" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1250" text="return m_selected;" >
+       <codeaccessormethod accessType="0" parent_id="1250" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1250" text="return m_selected;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_selected&amp;#010;&amp;#010;@return the value of m_selected" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1250" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1250" text="m_selected = value;" >
+       <codeaccessormethod accessType="1" parent_id="1250" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1250" text="m_selected = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_selected&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1251" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1251" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1251" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
+       <ccfdeclarationcodeblock parent_id="1251" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisStrategyColorSpaceSP m_colorStrategy;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1251" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1251" text="return m_colorStrategy;" >
+       <codeaccessormethod accessType="0" parent_id="1251" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1251" text="return m_colorStrategy;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorStrategy&amp;#010;&amp;#010;@return the value of m_colorStrategy" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1251" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1251" text="m_colorStrategy = value;" >
+       <codeaccessormethod accessType="1" parent_id="1251" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1251" text="m_colorStrategy = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorStrategy&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1252" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1252" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1252" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
+       <ccfdeclarationcodeblock parent_id="1252" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisProfileSP m_profile;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1252" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1252" text="return m_profile;" >
+       <codeaccessormethod accessType="0" parent_id="1252" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1252" text="return m_profile;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_profile&amp;#010;&amp;#010;@return the value of m_profile" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1252" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1252" text="m_profile = value;" >
+       <codeaccessormethod accessType="1" parent_id="1252" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1252" text="m_profile = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_profile&amp;#010;&amp;#010;" />
         </header>
@@ -30351,7 +30351,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1253" tqparent_class="1253" fileExt=".java" fileName="KisFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1253" parent_class="1253" fileExt=".java" fileName="KisFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -30363,7 +30363,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1253" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1253" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilterStrategy&amp;#010;enum enumFilterType {&amp;#010;BOX_FILTER,&amp;#010;TRIANGLE_FILTER,&amp;#010;BELL_FILTER,&amp;#010;B_SPLINE_FILTER,&amp;#010;FILTER,&amp;#010;LANCZOS3_FILTER,&amp;#010;MITCHELL_FILTER&amp;#010;};" />
        </header>
@@ -30373,27 +30373,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1259" tag="tblock_0" canDelete="false" indentLevel="1" text="protected double supportVal;" >
+          <ccfdeclarationcodeblock parent_id="1259" tag="tblock_0" canDelete="false" indentLevel="1" text="protected double supportVal;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1269" tag="tblock_2" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxFilterStrategy  = new KisBoxFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="1269" tag="tblock_2" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxFilterStrategy  = new KisBoxFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1277" tag="tblock_8" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTriangleFilterStrategy  = new KisTriangleFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="1277" tag="tblock_8" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTriangleFilterStrategy  = new KisTriangleFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1285" tag="tblock_14" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBellFilterStrategy  = new KisBellFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="1285" tag="tblock_14" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBellFilterStrategy  = new KisBellFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1311" tag="tblock_20" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellFilterStrategy  = new KisMitchellFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="1311" tag="tblock_20" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellFilterStrategy  = new KisMitchellFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -30427,112 +30427,112 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1259" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1259" text="return supportVal;" >
+              <codeaccessormethod accessType="0" parent_id="1259" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1259" text="return supportVal;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of supportVal&amp;#010;&amp;#010;@return the value of supportVal" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1259" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1259" text="supportVal = value;" >
+              <codeaccessormethod accessType="1" parent_id="1259" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1259" text="supportVal = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of supportVal&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1269" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="1269" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1269" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="1269" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="1269" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="1269" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBoxFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="1269" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="1269" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBoxFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="1269" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="1269" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1277" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="1277" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1277" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="1277" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="1277" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="1277" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisTriangleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="1277" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="1277" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisTriangleFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="1277" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="1277" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBellFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBellFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1311" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="1311" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1311" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="1311" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="1311" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="1311" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisMitchellFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="1311" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="1311" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisMitchellFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="1311" tag="hblock_tag_25" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="1311" tag="hblock_tag_25" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -30552,22 +30552,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1254" tag="operation_1254" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1254" tag="operation_1254" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1255" tag="operation_1255" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1255" tag="operation_1255" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1256" tag="operation_1256" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1256" tag="operation_1256" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1258" tag="operation_1258" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1258" tag="operation_1258" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return double  " />
              </header>
@@ -30583,266 +30583,266 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1259" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1259" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1259" tag="tblock_0" canDelete="false" indentLevel="1" text="protected double supportVal;" >
+       <ccfdeclarationcodeblock parent_id="1259" tag="tblock_0" canDelete="false" indentLevel="1" text="protected double supportVal;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1259" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1259" text="return supportVal;" >
+       <codeaccessormethod accessType="0" parent_id="1259" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1259" text="return supportVal;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of supportVal&amp;#010;&amp;#010;@return the value of supportVal" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1259" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1259" text="supportVal = value;" >
+       <codeaccessormethod accessType="1" parent_id="1259" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1259" text="supportVal = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of supportVal&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1261" field_type="7602208" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1261" field_type="7602208" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSimpleFilterStrategy  = new KisSimpleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisSimpleFilterStrategy  = new KisSimpleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisSimpleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisSimpleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1261" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1269" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1269" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1269" tag="tblock_2" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxFilterStrategy  = new KisBoxFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1269" tag="tblock_2" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBoxFilterStrategy  = new KisBoxFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1269" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1269" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1269" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1269" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1269" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1269" tag="hblock_tag_5" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBoxFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1269" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1269" tag="hblock_tag_6" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBoxFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1269" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1269" tag="hblock_tag_7" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1277" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1277" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1277" tag="tblock_8" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTriangleFilterStrategy  = new KisTriangleFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1277" tag="tblock_8" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisTriangleFilterStrategy  = new KisTriangleFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1277" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1277" tag="hblock_tag_9" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1277" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1277" tag="hblock_tag_10" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1277" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1277" tag="hblock_tag_11" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisTriangleFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1277" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1277" tag="hblock_tag_12" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisTriangleFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1277" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1277" tag="hblock_tag_13" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1285" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1285" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1285" tag="tblock_14" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBellFilterStrategy  = new KisBellFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1285" tag="tblock_14" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBellFilterStrategy  = new KisBellFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1285" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1285" tag="hblock_tag_15" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1285" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1285" tag="hblock_tag_16" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1285" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1285" tag="hblock_tag_17" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBellFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1285" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1285" tag="hblock_tag_18" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBellFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1285" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1285" tag="hblock_tag_19" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1293" field_type="1096849400" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1293" field_type="1096849400" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBSplineFilterStrategy  = new KisBSplineFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisBSplineFilterStrategy  = new KisBSplineFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisBSplineFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisBSplineFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1301" field_type="7602259" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1301" field_type="7602259" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisLanczos3FilterStrategy  = new KisLanczos3FilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisLanczos3FilterStrategy  = new KisLanczos3FilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisLanczos3FilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisLanczos3FilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1311" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1311" field_type="0" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1311" tag="tblock_20" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellFilterStrategy  = new KisMitchellFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1311" tag="tblock_20" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisMitchellFilterStrategy  = new KisMitchellFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1311" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1311" tag="hblock_tag_21" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1311" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1311" tag="hblock_tag_22" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1311" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1311" tag="hblock_tag_23" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisMitchellFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1311" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1311" tag="hblock_tag_24" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisMitchellFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1311" tag="hblock_tag_25" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1311" tag="hblock_tag_25" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -30850,7 +30850,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1260" tqparent_class="1260" fileExt=".java" fileName="KisSimpleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1260" parent_class="1260" fileExt=".java" fileName="KisSimpleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -30862,7 +30862,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1260" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1260" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisSimpleFilterStrategy&amp;#010;" />
        </header>
@@ -30872,7 +30872,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1261" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+          <ccfdeclarationcodeblock parent_id="1261" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
            <header>
             <codecomment tag="" writeOutText="false" indentLevel="1" />
            </header>
@@ -30906,27 +30906,27 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1261" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return ;" >
+              <codeaccessormethod accessType="0" parent_id="1261" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1261" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=" = value;" >
+              <codeaccessormethod accessType="1" parent_id="1261" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=" = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="2" tqparent_id="1261" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".add(value);" >
+              <codeaccessormethod accessType="2" parent_id="1261" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".add(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="3" tqparent_id="1261" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".remove(value);" >
+              <codeaccessormethod accessType="3" parent_id="1261" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".remove(value);" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="4" tqparent_id="1261" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return (List) ;" >
+              <codeaccessormethod accessType="4" parent_id="1261" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return (List) ;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
                </header>
@@ -30946,17 +30946,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1264" tag="operation_1264" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1264" tag="operation_1264" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1265" tag="operation_1265" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1265" tag="operation_1265" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1266" tag="operation_1266" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1266" tag="operation_1266" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -30972,36 +30972,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1261" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1261" field_type="0" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1261" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1261" tag="tblock_0" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1261" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1261" tag="hblock_tag_0" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1261" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1261" tag="hblock_tag_1" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1261" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1261" tag="hblock_tag_2" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1261" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1261" tag="hblock_tag_3" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1261" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1261" tag="hblock_tag_4" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1261" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -31009,7 +31009,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1268" tqparent_class="1268" fileExt=".java" fileName="KisBoxFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1268" parent_class="1268" fileExt=".java" fileName="KisBoxFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -31021,7 +31021,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1268" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1268" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBoxFilterStrategy&amp;#010;" />
        </header>
@@ -31073,17 +31073,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1272" tag="operation_1272" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1272" tag="operation_1272" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1273" tag="operation_1273" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1273" tag="operation_1273" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1274" tag="operation_1274" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1274" tag="operation_1274" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -31099,36 +31099,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1269" field_type="6750309" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1269" field_type="6750309" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1269" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1269" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -31136,7 +31136,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1276" tqparent_class="1276" fileExt=".java" fileName="KisTriangleFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1276" parent_class="1276" fileExt=".java" fileName="KisTriangleFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -31148,7 +31148,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1276" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1276" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTriangleFilterStrategy&amp;#010;" />
        </header>
@@ -31200,17 +31200,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1280" tag="operation_1280" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1281" tag="operation_1281" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1281" tag="operation_1281" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1282" tag="operation_1282" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1282" tag="operation_1282" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -31226,36 +31226,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1277" field_type="7929959" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1277" field_type="7929959" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1277" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1277" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -31263,7 +31263,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1284" tqparent_class="1284" fileExt=".java" fileName="KisBellFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1284" parent_class="1284" fileExt=".java" fileName="KisBellFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -31275,7 +31275,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1284" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1284" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBellFilterStrategy&amp;#010;" />
        </header>
@@ -31327,17 +31327,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1288" tag="operation_1288" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1288" tag="operation_1288" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1289" tag="operation_1289" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1289" tag="operation_1289" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1290" tag="operation_1290" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -31353,36 +31353,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1285" field_type="5439602" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1285" field_type="5439602" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1285" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1285" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -31390,7 +31390,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1292" tqparent_class="1292" fileExt=".java" fileName="KisBSplineFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1292" parent_class="1292" fileExt=".java" fileName="KisBSplineFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -31402,7 +31402,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1292" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1292" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBSplineFilterStrategy&amp;#010;" />
        </header>
@@ -31454,17 +31454,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1296" tag="operation_1296" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1296" tag="operation_1296" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1297" tag="operation_1297" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1297" tag="operation_1297" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1298" tag="operation_1298" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1298" tag="operation_1298" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -31480,36 +31480,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1293" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1293" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1293" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1293" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -31517,7 +31517,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1300" tqparent_class="1300" fileExt=".java" fileName="KisLanczos3FilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1300" parent_class="1300" fileExt=".java" fileName="KisLanczos3FilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -31529,7 +31529,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1300" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1300" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisLanczos3FilterStrategy&amp;#010;" />
        </header>
@@ -31581,22 +31581,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1304" tag="operation_1304" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1304" tag="operation_1304" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1305" tag="operation_1305" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1305" tag="operation_1305" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1306" tag="operation_1306" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1306" tag="operation_1306" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1308" tag="operation_1308" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1308" tag="operation_1308" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param x &amp;#010;@return double  " />
              </header>
@@ -31612,36 +31612,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1301" field_type="7602259" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1301" field_type="7602259" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1301" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1301" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -31649,7 +31649,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1310" tqparent_class="1310" fileExt=".java" fileName="KisMitchellFilterStrategy" >
+    <classifiercodedocument writeOutCode="true" package="" id="1310" parent_class="1310" fileExt=".java" fileName="KisMitchellFilterStrategy" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -31661,7 +31661,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1310" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1310" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisMitchellFilterStrategy&amp;#010;" />
        </header>
@@ -31713,17 +31713,17 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1314" tag="operation_1314" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1314" tag="operation_1314" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1315" tag="operation_1315" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1315" tag="operation_1315" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1316" tag="operation_1316" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1316" tag="operation_1316" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param t &amp;#010;@return double  " />
              </header>
@@ -31739,36 +31739,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1311" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1311" field_type="16" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
+       <ccfdeclarationcodeblock parent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisFilterStrategy  = new KisFilterStrategy ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisFilterStrategy to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisFilterStrategy from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1311" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1311" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -31776,7 +31776,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1318" tqparent_class="1318" fileExt=".java" fileName="KisTransformVisitor" >
+    <classifiercodedocument writeOutCode="true" package="" id="1318" parent_class="1318" fileExt=".java" fileName="KisTransformVisitor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -31788,7 +31788,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1318" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1318" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTransformVisitor&amp;#010;" />
        </header>
@@ -31798,12 +31798,12 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1344" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
+          <ccfdeclarationcodeblock parent_id="1344" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1345" tag="tblock_2" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
+          <ccfdeclarationcodeblock parent_id="1345" tag="tblock_2" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Implement KisProgressSubject" />
            </header>
@@ -31837,22 +31837,22 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1344" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1344" text="return m_dev;" >
+              <codeaccessormethod accessType="0" parent_id="1344" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1344" text="return m_dev;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dev&amp;#010;&amp;#010;@return the value of m_dev" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1344" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1344" text="m_dev = value;" >
+              <codeaccessormethod accessType="1" parent_id="1344" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1344" text="m_dev = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dev&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1345" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1345" text="return m_cancelRequested;" >
+              <codeaccessormethod accessType="0" parent_id="1345" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1345" text="return m_cancelRequested;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1345" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1345" text="m_cancelRequested = value;" >
+              <codeaccessormethod accessType="1" parent_id="1345" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1345" text="m_cancelRequested = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
                </header>
@@ -31872,32 +31872,32 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1322" tag="operation_1322" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1322" tag="operation_1322" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1323" tag="operation_1323" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1323" tag="operation_1323" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1324" tag="operation_1324" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1324" tag="operation_1324" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param dev &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1326" tag="operation_1326" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1326" tag="operation_1326" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param scale &amp;#010;@param scaleDenom &amp;#010;@param shear &amp;#010;@param dx &amp;#010;@param m_progress &amp;#010;@param filterStrategy &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1334" tag="operation_1334" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1334" tag="operation_1334" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param xscale &amp;#010;@param yscale &amp;#010;@param xshear &amp;#010;@param yshear &amp;#010;@param denominator &amp;#010;@param xtranslate &amp;#010;@param ytranslate &amp;#010;@param m_progress &amp;#010;@param filterType &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1346" tag="operation_1346" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1346" tag="operation_1346" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
@@ -31913,76 +31913,76 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1319" field_type="159873936" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1319" field_type="159873936" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisProgressSubject  = new KisProgressSubject ( );" >
+       <ccfdeclarationcodeblock parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public KisProgressSubject  = new KisProgressSubject ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisProgressSubject to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisProgressSubject from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1319" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1319" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1344" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1344" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1344" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
+       <ccfdeclarationcodeblock parent_id="1344" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisPaintDevice* m_dev;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1344" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1344" text="return m_dev;" >
+       <codeaccessormethod accessType="0" parent_id="1344" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1344" text="return m_dev;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dev&amp;#010;&amp;#010;@return the value of m_dev" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1344" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1344" text="m_dev = value;" >
+       <codeaccessormethod accessType="1" parent_id="1344" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1344" text="m_dev = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dev&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1345" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1345" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Implement KisProgressSubject" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1345" tag="tblock_2" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
+       <ccfdeclarationcodeblock parent_id="1345" tag="tblock_2" canDelete="false" indentLevel="1" text="private boolean m_cancelRequested;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Implement KisProgressSubject" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1345" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1345" text="return m_cancelRequested;" >
+       <codeaccessormethod accessType="0" parent_id="1345" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1345" text="return m_cancelRequested;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1345" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1345" text="m_cancelRequested = value;" >
+       <codeaccessormethod accessType="1" parent_id="1345" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1345" text="m_cancelRequested = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Implement KisProgressSubject" />
         </header>
@@ -31990,7 +31990,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1332" tqparent_class="1332" fileExt=".java" fileName="KisFilterStrategy*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1332" parent_class="1332" fileExt=".java" fileName="KisFilterStrategy*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32002,7 +32002,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1332" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1332" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilterStrategy*&amp;#010;" />
        </header>
@@ -32065,7 +32065,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1347" tqparent_class="1347" fileExt=".java" fileName="KoStore" >
+    <classifiercodedocument writeOutCode="true" package="" id="1347" parent_class="1347" fileExt=".java" fileName="KoStore" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32077,7 +32077,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1347" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1347" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoStore&amp;#010;" />
        </header>
@@ -32140,7 +32140,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1348" tqparent_class="1348" fileExt=".java" fileName="KisTiledDataManager" >
+    <classifiercodedocument writeOutCode="true" package="" id="1348" parent_class="1348" fileExt=".java" fileName="KisTiledDataManager" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32152,7 +32152,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1348" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1348" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTiledDataManager&amp;#010;" />
        </header>
@@ -32214,36 +32214,36 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1349" field_type="7471205" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1349" field_type="7471205" initialValue="" role_id="0" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisDataManager  = new KisDataManager ( );" >
+       <ccfdeclarationcodeblock parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="1" text="public KisDataManager  = new KisDataManager ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type KisDataManager to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type KisDataManager from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1349" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1349" role_id="1" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
@@ -32251,7 +32251,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1355" tqparent_class="1355" fileExt=".java" fileName="const KisDataManager&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1355" parent_class="1355" fileExt=".java" fileName="const KisDataManager&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32263,7 +32263,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1355" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1355" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisDataManager&amp;&amp;#010;" />
        </header>
@@ -32326,7 +32326,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1358" tqparent_class="1358" fileExt=".java" fileName="KisMemento" >
+    <classifiercodedocument writeOutCode="true" package="" id="1358" parent_class="1358" fileExt=".java" fileName="KisMemento" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32338,7 +32338,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1358" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1358" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisMemento&amp;#010;" />
        </header>
@@ -32401,7 +32401,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1359" tqparent_class="1359" fileExt=".java" fileName="KisMemento*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1359" parent_class="1359" fileExt=".java" fileName="KisMemento*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32413,7 +32413,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1359" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1359" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisMemento*&amp;#010;" />
        </header>
@@ -32476,7 +32476,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1365" tqparent_class="1365" fileExt=".java" fileName="KoStore*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1365" parent_class="1365" fileExt=".java" fileName="KoStore*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32488,7 +32488,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1365" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1365" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoStore*&amp;#010;" />
        </header>
@@ -32551,7 +32551,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1371" tqparent_class="1371" fileExt=".java" fileName="Q_INT32&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1371" parent_class="1371" fileExt=".java" fileName="Q_INT32&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32563,7 +32563,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1371" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1371" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_INT32&amp;&amp;#010;" />
        </header>
@@ -32626,7 +32626,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1388" tqparent_class="1388" fileExt=".java" fileName="Q_UINT8" >
+    <classifiercodedocument writeOutCode="true" package="" id="1388" parent_class="1388" fileExt=".java" fileName="Q_UINT8" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32638,7 +32638,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1388" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1388" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT8&amp;#010;" />
        </header>
@@ -32701,7 +32701,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1395" tqparent_class="1395" fileExt=".java" fileName="Q_UINT8*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1395" parent_class="1395" fileExt=".java" fileName="Q_UINT8*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32713,7 +32713,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1395" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1395" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_UINT8*&amp;#010;" />
        </header>
@@ -32776,7 +32776,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1398" tqparent_class="1398" fileExt=".java" fileName="KisDataManager*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1398" parent_class="1398" fileExt=".java" fileName="KisDataManager*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32788,7 +32788,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1398" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1398" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDataManager*&amp;#010;" />
        </header>
@@ -32851,7 +32851,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1424" tqparent_class="1424" fileExt=".java" fileName="KisRectIterator" >
+    <classifiercodedocument writeOutCode="true" package="" id="1424" parent_class="1424" fileExt=".java" fileName="KisRectIterator" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32863,7 +32863,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1424" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1424" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRectIterator&amp;#010;" />
        </header>
@@ -32926,7 +32926,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1425" tqparent_class="1425" fileExt=".java" fileName="KisHLineIterator" >
+    <classifiercodedocument writeOutCode="true" package="" id="1425" parent_class="1425" fileExt=".java" fileName="KisHLineIterator" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -32938,7 +32938,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1425" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1425" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisHLineIterator&amp;#010;" />
        </header>
@@ -33001,7 +33001,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1426" tqparent_class="1426" fileExt=".java" fileName="KisVLineIterator" >
+    <classifiercodedocument writeOutCode="true" package="" id="1426" parent_class="1426" fileExt=".java" fileName="KisVLineIterator" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33013,7 +33013,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1426" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1426" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisVLineIterator&amp;#010;" />
        </header>
@@ -33076,7 +33076,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1427" tqparent_class="1427" fileExt=".java" fileName="QWMatrix" >
+    <classifiercodedocument writeOutCode="true" package="" id="1427" parent_class="1427" fileExt=".java" fileName="QWMatrix" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33088,7 +33088,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1427" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1427" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QWMatrix&amp;#010;" />
        </header>
@@ -33151,7 +33151,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1428" tqparent_class="1428" fileExt=".java" fileName="KisRotateVisitor" >
+    <classifiercodedocument writeOutCode="true" package="" id="1428" parent_class="1428" fileExt=".java" fileName="KisRotateVisitor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33163,7 +33163,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1428" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1428" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRotateVisitor&amp;#010;" />
        </header>
@@ -33226,7 +33226,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1429" tqparent_class="1429" fileExt=".java" fileName="KisRectIteratorPixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="1429" parent_class="1429" fileExt=".java" fileName="KisRectIteratorPixel" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33238,7 +33238,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1429" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1429" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRectIteratorPixel&amp;#010;" />
        </header>
@@ -33301,7 +33301,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1430" tqparent_class="1430" fileExt=".java" fileName="KisVLineIteratorPixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="1430" parent_class="1430" fileExt=".java" fileName="KisVLineIteratorPixel" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33313,7 +33313,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1430" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1430" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisVLineIteratorPixel&amp;#010;" />
        </header>
@@ -33376,7 +33376,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1431" tqparent_class="1431" fileExt=".java" fileName="KisHLineIteratorPixel" >
+    <classifiercodedocument writeOutCode="true" package="" id="1431" parent_class="1431" fileExt=".java" fileName="KisHLineIteratorPixel" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33388,7 +33388,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1431" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1431" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisHLineIteratorPixel&amp;#010;" />
        </header>
@@ -33451,7 +33451,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1432" tqparent_class="1432" fileExt=".java" fileName="KNamedCommand" >
+    <classifiercodedocument writeOutCode="true" package="" id="1432" parent_class="1432" fileExt=".java" fileName="KNamedCommand" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33463,7 +33463,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1432" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1432" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KNamedCommand&amp;#010;" />
        </header>
@@ -33526,7 +33526,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1443" tqparent_class="1443" fileExt=".java" fileName="KisImage*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1443" parent_class="1443" fileExt=".java" fileName="KisImage*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33538,7 +33538,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1443" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1443" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisImage*&amp;#010;" />
        </header>
@@ -33601,7 +33601,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1448" tqparent_class="1448" fileExt=".java" fileName="const KisPaintDevice&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1448" parent_class="1448" fileExt=".java" fileName="const KisPaintDevice&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33613,7 +33613,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1448" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1448" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisPaintDevice&amp;&amp;#010;" />
        </header>
@@ -33676,7 +33676,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1465" tqparent_class="1465" fileExt=".java" fileName="KNamedCommand*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1465" parent_class="1465" fileExt=".java" fileName="KNamedCommand*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33688,7 +33688,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1465" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1465" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KNamedCommand*&amp;#010;" />
        </header>
@@ -33751,7 +33751,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1467" tqparent_class="1467" fileExt=".java" fileName="const bool" >
+    <classifiercodedocument writeOutCode="true" package="" id="1467" parent_class="1467" fileExt=".java" fileName="const bool" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33763,7 +33763,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1467" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1467" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const bool&amp;#010;" />
        </header>
@@ -33826,7 +33826,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1510" tqparent_class="1510" fileExt=".java" fileName="const QImage&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1510" parent_class="1510" fileExt=".java" fileName="const QImage&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33838,7 +33838,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1510" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1510" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QImage&amp;&amp;#010;" />
        </header>
@@ -33901,7 +33901,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1526" tqparent_class="1526" fileExt=".java" fileName="QColor*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1526" parent_class="1526" fileExt=".java" fileName="QColor*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33913,7 +33913,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1526" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1526" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QColor*&amp;#010;" />
        </header>
@@ -33976,7 +33976,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1537" tqparent_class="1537" fileExt=".java" fileName="const Q_UINT8*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1537" parent_class="1537" fileExt=".java" fileName="const Q_UINT8*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -33988,7 +33988,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1537" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1537" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const Q_UINT8*&amp;#010;" />
        </header>
@@ -34051,7 +34051,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1557" tqparent_class="1557" fileExt=".java" fileName="const KisImage*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1557" parent_class="1557" fileExt=".java" fileName="const KisImage*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34063,7 +34063,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1557" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1557" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const KisImage*&amp;#010;" />
        </header>
@@ -34126,7 +34126,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1618" tqparent_class="1618" fileExt=".java" fileName="Q_INT8" >
+    <classifiercodedocument writeOutCode="true" package="" id="1618" parent_class="1618" fileExt=".java" fileName="Q_INT8" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34138,7 +34138,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1618" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1618" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Q_INT8&amp;#010;" />
        </header>
@@ -34201,7 +34201,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1626" tqparent_class="1626" fileExt=".java" fileName="KisPaintDevice&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1626" parent_class="1626" fileExt=".java" fileName="KisPaintDevice&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34213,7 +34213,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1626" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1626" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintDevice&amp;&amp;#010;" />
        </header>
@@ -34276,7 +34276,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1639" tqparent_class="1639" fileExt=".java" fileName="KisScaleVisitor&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1639" parent_class="1639" fileExt=".java" fileName="KisScaleVisitor&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34288,7 +34288,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1639" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1639" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisScaleVisitor&amp;&amp;#010;" />
        </header>
@@ -34351,7 +34351,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1642" tqparent_class="1642" fileExt=".java" fileName="KisRotateVisitor&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1642" parent_class="1642" fileExt=".java" fileName="KisRotateVisitor&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34363,7 +34363,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1642" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1642" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRotateVisitor&amp;&amp;#010;" />
        </header>
@@ -34426,7 +34426,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1645" tqparent_class="1645" fileExt=".java" fileName="KisTransformVisitor&amp;" >
+    <classifiercodedocument writeOutCode="true" package="" id="1645" parent_class="1645" fileExt=".java" fileName="KisTransformVisitor&amp;" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34438,7 +34438,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1645" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1645" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTransformVisitor&amp;&amp;#010;" />
        </header>
@@ -34501,7 +34501,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1668" tqparent_class="1668" fileExt=".java" fileName="const QColor" >
+    <classifiercodedocument writeOutCode="true" package="" id="1668" parent_class="1668" fileExt=".java" fileName="const QColor" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34513,7 +34513,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1668" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1668" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class Const QColor&amp;#010;" />
        </header>
@@ -34576,7 +34576,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1674" tqparent_class="1674" fileExt=".java" fileName="KAction" >
+    <classifiercodedocument writeOutCode="true" package="" id="1674" parent_class="1674" fileExt=".java" fileName="KAction" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34588,7 +34588,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1674" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1674" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KAction&amp;#010;" />
        </header>
@@ -34651,7 +34651,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1675" tqparent_class="1675" fileExt=".java" fileName="KisView" >
+    <classifiercodedocument writeOutCode="true" package="" id="1675" parent_class="1675" fileExt=".java" fileName="KisView" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34663,7 +34663,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1675" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1675" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisView&amp;#010;" />
        </header>
@@ -34726,7 +34726,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1676" tqparent_class="1676" fileExt=".java" fileName="KisDockFrameDocker" >
+    <classifiercodedocument writeOutCode="true" package="" id="1676" parent_class="1676" fileExt=".java" fileName="KisDockFrameDocker" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34738,7 +34738,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1676" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1676" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDockFrameDocker&amp;#010;" />
        </header>
@@ -34801,7 +34801,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1677" tqparent_class="1677" fileExt=".java" fileName="KoTabbedToolDock" >
+    <classifiercodedocument writeOutCode="true" package="" id="1677" parent_class="1677" fileExt=".java" fileName="KoTabbedToolDock" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34813,7 +34813,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1677" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1677" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoTabbedToolDock&amp;#010;" />
        </header>
@@ -34876,7 +34876,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1678" tqparent_class="1678" fileExt=".java" fileName="KoToolDockManager" >
+    <classifiercodedocument writeOutCode="true" package="" id="1678" parent_class="1678" fileExt=".java" fileName="KoToolDockManager" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34888,7 +34888,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1678" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1678" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoToolDockManager&amp;#010;" />
        </header>
@@ -34951,7 +34951,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1679" tqparent_class="1679" fileExt=".java" fileName="KActionCollection" >
+    <classifiercodedocument writeOutCode="true" package="" id="1679" parent_class="1679" fileExt=".java" fileName="KActionCollection" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -34963,7 +34963,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1679" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1679" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KActionCollection&amp;#010;" />
        </header>
@@ -35026,7 +35026,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1680" tqparent_class="1680" fileExt=".java" fileName="KisPaintBox" >
+    <classifiercodedocument writeOutCode="true" package="" id="1680" parent_class="1680" fileExt=".java" fileName="KisPaintBox" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35038,7 +35038,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1680" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1680" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintBox&amp;#010;" />
        </header>
@@ -35101,7 +35101,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1681" tqparent_class="1681" fileExt=".java" fileName="KisLayerBox" >
+    <classifiercodedocument writeOutCode="true" package="" id="1681" parent_class="1681" fileExt=".java" fileName="KisLayerBox" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35113,7 +35113,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1681" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1681" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisLayerBox&amp;#010;" />
        </header>
@@ -35176,7 +35176,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1682" tqparent_class="1682" fileExt=".java" fileName="KisFilterBox" >
+    <classifiercodedocument writeOutCode="true" package="" id="1682" parent_class="1682" fileExt=".java" fileName="KisFilterBox" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35188,7 +35188,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1682" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1682" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilterBox&amp;#010;" />
        </header>
@@ -35251,7 +35251,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1683" tqparent_class="1683" fileExt=".java" fileName="ControlFrame" >
+    <classifiercodedocument writeOutCode="true" package="" id="1683" parent_class="1683" fileExt=".java" fileName="ControlFrame" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35263,7 +35263,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1683" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1683" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class ControlFrame&amp;#010;" />
        </header>
@@ -35326,7 +35326,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1684" tqparent_class="1684" fileExt=".java" fileName="KisBirdEyeBox" >
+    <classifiercodedocument writeOutCode="true" package="" id="1684" parent_class="1684" fileExt=".java" fileName="KisBirdEyeBox" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35338,7 +35338,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1684" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1684" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBirdEyeBox&amp;#010;" />
        </header>
@@ -35401,7 +35401,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1685" tqparent_class="1685" fileExt=".java" fileName="KisChannelView" >
+    <classifiercodedocument writeOutCode="true" package="" id="1685" parent_class="1685" fileExt=".java" fileName="KisChannelView" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35413,7 +35413,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1685" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1685" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisChannelView&amp;#010;" />
        </header>
@@ -35476,7 +35476,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1686" tqparent_class="1686" fileExt=".java" fileName="KisAutobrush" >
+    <classifiercodedocument writeOutCode="true" package="" id="1686" parent_class="1686" fileExt=".java" fileName="KisAutobrush" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35488,7 +35488,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1686" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1686" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAutobrush&amp;#010;" />
        </header>
@@ -35551,7 +35551,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1687" tqparent_class="1687" fileExt=".java" fileName="KisTextBrush" >
+    <classifiercodedocument writeOutCode="true" package="" id="1687" parent_class="1687" fileExt=".java" fileName="KisTextBrush" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35563,7 +35563,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1687" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1687" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTextBrush&amp;#010;" />
        </header>
@@ -35626,7 +35626,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1688" tqparent_class="1688" fileExt=".java" fileName="KisAutogradient" >
+    <classifiercodedocument writeOutCode="true" package="" id="1688" parent_class="1688" fileExt=".java" fileName="KisAutogradient" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35638,7 +35638,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1688" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1688" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAutogradient&amp;#010;" />
        </header>
@@ -35701,7 +35701,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1689" tqparent_class="1689" fileExt=".java" fileName="KisHSVWidget" >
+    <classifiercodedocument writeOutCode="true" package="" id="1689" parent_class="1689" fileExt=".java" fileName="KisHSVWidget" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35713,7 +35713,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1689" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1689" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisHSVWidget&amp;#010;" />
        </header>
@@ -35776,7 +35776,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1690" tqparent_class="1690" fileExt=".java" fileName="KisRGBWidget" >
+    <classifiercodedocument writeOutCode="true" package="" id="1690" parent_class="1690" fileExt=".java" fileName="KisRGBWidget" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35788,7 +35788,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1690" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1690" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRGBWidget&amp;#010;" />
        </header>
@@ -35851,7 +35851,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1691" tqparent_class="1691" fileExt=".java" fileName="KisGrayWidget" >
+    <classifiercodedocument writeOutCode="true" package="" id="1691" parent_class="1691" fileExt=".java" fileName="KisGrayWidget" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35863,7 +35863,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1691" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1691" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGrayWidget&amp;#010;" />
        </header>
@@ -35926,7 +35926,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1692" tqparent_class="1692" fileExt=".java" fileName="KisPaletteWidget" >
+    <classifiercodedocument writeOutCode="true" package="" id="1692" parent_class="1692" fileExt=".java" fileName="KisPaletteWidget" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -35938,7 +35938,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1692" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1692" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaletteWidget&amp;#010;" />
        </header>
@@ -36001,7 +36001,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1693" tqparent_class="1693" fileExt=".java" fileName="KisResourceMediator" >
+    <classifiercodedocument writeOutCode="true" package="" id="1693" parent_class="1693" fileExt=".java" fileName="KisResourceMediator" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -36013,7 +36013,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1693" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1693" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisResourceMediator&amp;#010;" />
        </header>
@@ -36076,7 +36076,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1694" tqparent_class="1694" fileExt=".java" fileName="KisDockerManager" >
+    <classifiercodedocument writeOutCode="true" package="" id="1694" parent_class="1694" fileExt=".java" fileName="KisDockerManager" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -36088,7 +36088,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1694" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1694" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDockerManager&amp;#010;The docker manager keeps track of dockers and their tabs.&amp;#010;&amp;#010;There are three kinds of dockers: sliding dockers, shading&amp;#010;dockers and toolboxes.&amp;#010;&amp;#010;Tabs are created by calling addDockerTab with a widget (the tab)&amp;#010;and a KisID (a combination of language-independent identifying&amp;#010;string and a caption). If there is already a docker with the&amp;#010;identifying string, then the tab is added to that docker,&amp;#010;otherwise a new docker is created.&amp;#010;&amp;#010;On application shutdown, the configuration is saved. Next time&amp;#010;on startup, if a tab is added, we first look in the saved configuation,&amp;#010;and if a tab and docker is present with the specified identifying&amp;#010;string, then we restore that tab in that place, otherwise in the&amp;#010;specified place.&amp;#010;&amp;#010;XXX: for post 1.4: make sure we can drag &amp; drop widgets." />
        </header>
@@ -36098,177 +36098,177 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
           <codecomment tag="" indentLevel="1" text="Fields" />
          </header>
          <textblocks>
-          <ccfdeclarationcodeblock tqparent_id="1718" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; QWidget * >* m_tabs;" >
+          <ccfdeclarationcodeblock parent_id="1718" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; QWidget * >* m_tabs;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1720" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisDockFrameDocker * >* m_dockWindows;" >
+          <ccfdeclarationcodeblock parent_id="1720" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisDockFrameDocker * >* m_dockWindows;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1722" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisPaintBox * >* m_toolBoxes;" >
+          <ccfdeclarationcodeblock parent_id="1722" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisPaintBox * >* m_toolBoxes;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1724" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KoTabbedToolDock * >* m_sliders;" >
+          <ccfdeclarationcodeblock parent_id="1724" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KoTabbedToolDock * >* m_sliders;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1725" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisView* m_view;" >
+          <ccfdeclarationcodeblock parent_id="1725" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisView* m_view;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private KActionCollection* m_ac;" >
+          <ccfdeclarationcodeblock parent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private KActionCollection* m_ac;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1751" tag="tblock_17" canDelete="false" indentLevel="1" text="private KoToolDockManager* m_toolDockManager;" >
+          <ccfdeclarationcodeblock parent_id="1751" tag="tblock_17" canDelete="false" indentLevel="1" text="private KoToolDockManager* m_toolDockManager;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1753" tag="tblock_20" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_layerchannelslider;" >
+          <ccfdeclarationcodeblock parent_id="1753" tag="tblock_20" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_layerchannelslider;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Sliders" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
+          <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1755" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_fillsslider;" >
+          <ccfdeclarationcodeblock parent_id="1755" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_fillsslider;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1756" tag="tblock_29" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_toolcontrolslider;" >
+          <ccfdeclarationcodeblock parent_id="1756" tag="tblock_29" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_toolcontrolslider;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1757" tag="tblock_32" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_colorslider;" >
+          <ccfdeclarationcodeblock parent_id="1757" tag="tblock_32" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_colorslider;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1759" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_layerchanneldocker;" >
+          <ccfdeclarationcodeblock parent_id="1759" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_layerchanneldocker;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Dockers" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
+          <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1761" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_fillsdocker;" >
+          <ccfdeclarationcodeblock parent_id="1761" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_fillsdocker;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1762" tag="tblock_44" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_toolcontroldocker;" >
+          <ccfdeclarationcodeblock parent_id="1762" tag="tblock_44" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_toolcontroldocker;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1763" tag="tblock_47" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_colordocker;" >
+          <ccfdeclarationcodeblock parent_id="1763" tag="tblock_47" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_colordocker;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1765" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintboxdocker;" >
+          <ccfdeclarationcodeblock parent_id="1765" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintboxdocker;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Toolbox" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1767" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisLayerBox* m_layerBox;" >
+          <ccfdeclarationcodeblock parent_id="1767" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisLayerBox* m_layerBox;" >
            <header>
             <codecomment tag="" indentLevel="1" text="// Widgets" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1768" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintBox;" >
+          <ccfdeclarationcodeblock parent_id="1768" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintBox;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1770" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisFilterBox* m_filterBox;" >
+          <ccfdeclarationcodeblock parent_id="1770" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisFilterBox* m_filterBox;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1772" tag="tblock_62" canDelete="false" indentLevel="1" text="private ControlFrame* m_controlWidget;" >
+          <ccfdeclarationcodeblock parent_id="1772" tag="tblock_62" canDelete="false" indentLevel="1" text="private ControlFrame* m_controlWidget;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1774" tag="tblock_65" canDelete="false" indentLevel="1" text="private KisBirdEyeBox* m_birdEyeBox;" >
+          <ccfdeclarationcodeblock parent_id="1774" tag="tblock_65" canDelete="false" indentLevel="1" text="private KisBirdEyeBox* m_birdEyeBox;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1776" tag="tblock_68" canDelete="false" indentLevel="1" text="private KisChannelView* m_channelView;" >
+          <ccfdeclarationcodeblock parent_id="1776" tag="tblock_68" canDelete="false" indentLevel="1" text="private KisChannelView* m_channelView;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1778" tag="tblock_71" canDelete="false" indentLevel="1" text="private KisAutobrush* m_autobrush;" >
+          <ccfdeclarationcodeblock parent_id="1778" tag="tblock_71" canDelete="false" indentLevel="1" text="private KisAutobrush* m_autobrush;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1780" tag="tblock_74" canDelete="false" indentLevel="1" text="private KisTextBrush* m_textBrush;" >
+          <ccfdeclarationcodeblock parent_id="1780" tag="tblock_74" canDelete="false" indentLevel="1" text="private KisTextBrush* m_textBrush;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1782" tag="tblock_77" canDelete="false" indentLevel="1" text="private KisAutogradient* m_autogradient;" >
+          <ccfdeclarationcodeblock parent_id="1782" tag="tblock_77" canDelete="false" indentLevel="1" text="private KisAutogradient* m_autogradient;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1784" tag="tblock_80" canDelete="false" indentLevel="1" text="private KisHSVWidget* m_hsvwidget;" >
+          <ccfdeclarationcodeblock parent_id="1784" tag="tblock_80" canDelete="false" indentLevel="1" text="private KisHSVWidget* m_hsvwidget;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1786" tag="tblock_83" canDelete="false" indentLevel="1" text="private KisRGBWidget* m_rgbwidget;" >
+          <ccfdeclarationcodeblock parent_id="1786" tag="tblock_83" canDelete="false" indentLevel="1" text="private KisRGBWidget* m_rgbwidget;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1788" tag="tblock_86" canDelete="false" indentLevel="1" text="private KisGrayWidget* m_graywidget;" >
+          <ccfdeclarationcodeblock parent_id="1788" tag="tblock_86" canDelete="false" indentLevel="1" text="private KisGrayWidget* m_graywidget;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1790" tag="tblock_89" canDelete="false" indentLevel="1" text="private KisPaletteWidget* m_palettewidget;" >
+          <ccfdeclarationcodeblock parent_id="1790" tag="tblock_89" canDelete="false" indentLevel="1" text="private KisPaletteWidget* m_palettewidget;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1792" tag="tblock_92" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_brushMediator;" >
+          <ccfdeclarationcodeblock parent_id="1792" tag="tblock_92" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_brushMediator;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1793" tag="tblock_95" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_patternMediator;" >
+          <ccfdeclarationcodeblock parent_id="1793" tag="tblock_95" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_patternMediator;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1794" tag="tblock_98" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_gradientMediator;" >
+          <ccfdeclarationcodeblock parent_id="1794" tag="tblock_98" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_gradientMediator;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock tqparent_id="1795" tag="tblock_101" canDelete="false" indentLevel="1" text="private boolean m_slidersSetup;" >
+          <ccfdeclarationcodeblock parent_id="1795" tag="tblock_101" canDelete="false" indentLevel="1" text="private boolean m_slidersSetup;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -36302,352 +36302,352 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
               <codecomment tag="" writeOutText="false" indentLevel="1" />
              </header>
              <textblocks>
-              <codeaccessormethod accessType="0" tqparent_id="1718" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1718" text="return m_tabs;" >
+              <codeaccessormethod accessType="0" parent_id="1718" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1718" text="return m_tabs;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tabs&amp;#010;&amp;#010;@return the value of m_tabs" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1718" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1718" text="m_tabs = value;" >
+              <codeaccessormethod accessType="1" parent_id="1718" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1718" text="m_tabs = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tabs&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1720" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1720" text="return m_dockWindows;" >
+              <codeaccessormethod accessType="0" parent_id="1720" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1720" text="return m_dockWindows;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dockWindows&amp;#010;&amp;#010;@return the value of m_dockWindows" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1720" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1720" text="m_dockWindows = value;" >
+              <codeaccessormethod accessType="1" parent_id="1720" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1720" text="m_dockWindows = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dockWindows&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1722" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1722" text="return m_toolBoxes;" >
+              <codeaccessormethod accessType="0" parent_id="1722" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1722" text="return m_toolBoxes;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolBoxes&amp;#010;&amp;#010;@return the value of m_toolBoxes" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1722" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1722" text="m_toolBoxes = value;" >
+              <codeaccessormethod accessType="1" parent_id="1722" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1722" text="m_toolBoxes = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolBoxes&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1724" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1724" text="return m_sliders;" >
+              <codeaccessormethod accessType="0" parent_id="1724" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1724" text="return m_sliders;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_sliders&amp;#010;&amp;#010;@return the value of m_sliders" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1724" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1724" text="m_sliders = value;" >
+              <codeaccessormethod accessType="1" parent_id="1724" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1724" text="m_sliders = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_sliders&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1725" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1725" text="return m_view;" >
+              <codeaccessormethod accessType="0" parent_id="1725" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1725" text="return m_view;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_view&amp;#010;&amp;#010;@return the value of m_view" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1725" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1725" text="m_view = value;" >
+              <codeaccessormethod accessType="1" parent_id="1725" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1725" text="m_view = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_view&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1726" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1726" text="return m_ac;" >
+              <codeaccessormethod accessType="0" parent_id="1726" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1726" text="return m_ac;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_ac&amp;#010;&amp;#010;@return the value of m_ac" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1726" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1726" text="m_ac = value;" >
+              <codeaccessormethod accessType="1" parent_id="1726" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1726" text="m_ac = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_ac&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1751" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1751" text="return m_toolDockManager;" >
+              <codeaccessormethod accessType="0" parent_id="1751" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1751" text="return m_toolDockManager;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolDockManager&amp;#010;&amp;#010;@return the value of m_toolDockManager" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1751" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1751" text="m_toolDockManager = value;" >
+              <codeaccessormethod accessType="1" parent_id="1751" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1751" text="m_toolDockManager = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolDockManager&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1753" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1753" text="return m_layerchannelslider;" >
+              <codeaccessormethod accessType="0" parent_id="1753" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1753" text="return m_layerchannelslider;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Sliders" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1753" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1753" text="m_layerchannelslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1753" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1753" text="m_layerchannelslider = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Sliders" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
+              <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" >
+              <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_fillsslider&amp;#010;&amp;#010;@return the value of m_fillsslider" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1755" text="m_fillsslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1755" text="m_fillsslider = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_fillsslider&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1756" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1756" text="return m_toolcontrolslider;" >
+              <codeaccessormethod accessType="0" parent_id="1756" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1756" text="return m_toolcontrolslider;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolcontrolslider&amp;#010;&amp;#010;@return the value of m_toolcontrolslider" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1756" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1756" text="m_toolcontrolslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1756" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1756" text="m_toolcontrolslider = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolcontrolslider&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1757" text="return m_colorslider;" >
+              <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1757" text="return m_colorslider;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorslider&amp;#010;&amp;#010;@return the value of m_colorslider" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1757" text="m_colorslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1757" text="m_colorslider = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorslider&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1759" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1759" text="return m_layerchanneldocker;" >
+              <codeaccessormethod accessType="0" parent_id="1759" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1759" text="return m_layerchanneldocker;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Dockers" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1759" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1759" text="m_layerchanneldocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1759" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1759" text="m_layerchanneldocker = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Dockers" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
+              <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" >
+              <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_fillsdocker&amp;#010;&amp;#010;@return the value of m_fillsdocker" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1761" text="m_fillsdocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1761" text="m_fillsdocker = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_fillsdocker&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1762" text="return m_toolcontroldocker;" >
+              <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1762" text="return m_toolcontroldocker;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolcontroldocker&amp;#010;&amp;#010;@return the value of m_toolcontroldocker" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1762" text="m_toolcontroldocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1762" text="m_toolcontroldocker = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolcontroldocker&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1763" text="return m_colordocker;" >
+              <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1763" text="return m_colordocker;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colordocker&amp;#010;&amp;#010;@return the value of m_colordocker" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1763" text="m_colordocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1763" text="m_colordocker = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colordocker&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1765" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1765" text="return m_paintboxdocker;" >
+              <codeaccessormethod accessType="0" parent_id="1765" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1765" text="return m_paintboxdocker;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Toolbox" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1765" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1765" text="m_paintboxdocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1765" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1765" text="m_paintboxdocker = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Toolbox" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1767" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1767" text="return m_layerBox;" >
+              <codeaccessormethod accessType="0" parent_id="1767" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1767" text="return m_layerBox;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Widgets" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1767" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1767" text="m_layerBox = value;" >
+              <codeaccessormethod accessType="1" parent_id="1767" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1767" text="m_layerBox = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="// Widgets" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1768" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1768" text="return m_paintBox;" >
+              <codeaccessormethod accessType="0" parent_id="1768" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1768" text="return m_paintBox;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paintBox&amp;#010;&amp;#010;@return the value of m_paintBox" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1768" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1768" text="m_paintBox = value;" >
+              <codeaccessormethod accessType="1" parent_id="1768" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1768" text="m_paintBox = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paintBox&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1770" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1770" text="return m_filterBox;" >
+              <codeaccessormethod accessType="0" parent_id="1770" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1770" text="return m_filterBox;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_filterBox&amp;#010;&amp;#010;@return the value of m_filterBox" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1770" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1770" text="m_filterBox = value;" >
+              <codeaccessormethod accessType="1" parent_id="1770" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1770" text="m_filterBox = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_filterBox&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1772" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1772" text="return m_controlWidget;" >
+              <codeaccessormethod accessType="0" parent_id="1772" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1772" text="return m_controlWidget;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_controlWidget&amp;#010;&amp;#010;@return the value of m_controlWidget" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1772" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1772" text="m_controlWidget = value;" >
+              <codeaccessormethod accessType="1" parent_id="1772" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1772" text="m_controlWidget = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_controlWidget&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1774" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1774" text="return m_birdEyeBox;" >
+              <codeaccessormethod accessType="0" parent_id="1774" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1774" text="return m_birdEyeBox;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_birdEyeBox&amp;#010;&amp;#010;@return the value of m_birdEyeBox" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1774" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1774" text="m_birdEyeBox = value;" >
+              <codeaccessormethod accessType="1" parent_id="1774" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1774" text="m_birdEyeBox = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_birdEyeBox&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1776" text="return m_channelView;" >
+              <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1776" text="return m_channelView;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channelView&amp;#010;&amp;#010;@return the value of m_channelView" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1776" text="m_channelView = value;" >
+              <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1776" text="m_channelView = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channelView&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1778" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1778" text="return m_autobrush;" >
+              <codeaccessormethod accessType="0" parent_id="1778" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1778" text="return m_autobrush;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_autobrush&amp;#010;&amp;#010;@return the value of m_autobrush" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1778" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1778" text="m_autobrush = value;" >
+              <codeaccessormethod accessType="1" parent_id="1778" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1778" text="m_autobrush = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_autobrush&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1780" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1780" text="return m_textBrush;" >
+              <codeaccessormethod accessType="0" parent_id="1780" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1780" text="return m_textBrush;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_textBrush&amp;#010;&amp;#010;@return the value of m_textBrush" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1780" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1780" text="m_textBrush = value;" >
+              <codeaccessormethod accessType="1" parent_id="1780" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1780" text="m_textBrush = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_textBrush&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1782" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1782" text="return m_autogradient;" >
+              <codeaccessormethod accessType="0" parent_id="1782" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1782" text="return m_autogradient;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_autogradient&amp;#010;&amp;#010;@return the value of m_autogradient" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1782" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1782" text="m_autogradient = value;" >
+              <codeaccessormethod accessType="1" parent_id="1782" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1782" text="m_autogradient = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_autogradient&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1784" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1784" text="return m_hsvwidget;" >
+              <codeaccessormethod accessType="0" parent_id="1784" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1784" text="return m_hsvwidget;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_hsvwidget&amp;#010;&amp;#010;@return the value of m_hsvwidget" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1784" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1784" text="m_hsvwidget = value;" >
+              <codeaccessormethod accessType="1" parent_id="1784" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1784" text="m_hsvwidget = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_hsvwidget&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1786" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1786" text="return m_rgbwidget;" >
+              <codeaccessormethod accessType="0" parent_id="1786" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1786" text="return m_rgbwidget;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_rgbwidget&amp;#010;&amp;#010;@return the value of m_rgbwidget" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1786" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1786" text="m_rgbwidget = value;" >
+              <codeaccessormethod accessType="1" parent_id="1786" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1786" text="m_rgbwidget = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_rgbwidget&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1788" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1788" text="return m_graywidget;" >
+              <codeaccessormethod accessType="0" parent_id="1788" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1788" text="return m_graywidget;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_graywidget&amp;#010;&amp;#010;@return the value of m_graywidget" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1788" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1788" text="m_graywidget = value;" >
+              <codeaccessormethod accessType="1" parent_id="1788" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1788" text="m_graywidget = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_graywidget&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1790" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1790" text="return m_palettewidget;" >
+              <codeaccessormethod accessType="0" parent_id="1790" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1790" text="return m_palettewidget;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_palettewidget&amp;#010;&amp;#010;@return the value of m_palettewidget" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1790" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1790" text="m_palettewidget = value;" >
+              <codeaccessormethod accessType="1" parent_id="1790" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1790" text="m_palettewidget = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_palettewidget&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1792" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1792" text="return m_brushMediator;" >
+              <codeaccessormethod accessType="0" parent_id="1792" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1792" text="return m_brushMediator;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_brushMediator&amp;#010;&amp;#010;@return the value of m_brushMediator" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1792" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1792" text="m_brushMediator = value;" >
+              <codeaccessormethod accessType="1" parent_id="1792" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1792" text="m_brushMediator = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_brushMediator&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1793" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1793" text="return m_patternMediator;" >
+              <codeaccessormethod accessType="0" parent_id="1793" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1793" text="return m_patternMediator;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_patternMediator&amp;#010;&amp;#010;@return the value of m_patternMediator" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1793" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1793" text="m_patternMediator = value;" >
+              <codeaccessormethod accessType="1" parent_id="1793" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1793" text="m_patternMediator = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_patternMediator&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1794" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1794" text="return m_gradientMediator;" >
+              <codeaccessormethod accessType="0" parent_id="1794" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1794" text="return m_gradientMediator;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_gradientMediator&amp;#010;&amp;#010;@return the value of m_gradientMediator" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1794" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1794" text="m_gradientMediator = value;" >
+              <codeaccessormethod accessType="1" parent_id="1794" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1794" text="m_gradientMediator = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_gradientMediator&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" tqparent_id="1795" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="1795" text="return m_slidersSetup;" >
+              <codeaccessormethod accessType="0" parent_id="1795" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="1795" text="return m_slidersSetup;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_slidersSetup&amp;#010;&amp;#010;@return the value of m_slidersSetup" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" tqparent_id="1795" tag="hblock_tag_103" canDelete="false" indentLevel="1" classfield_id="1795" text="m_slidersSetup = value;" >
+              <codeaccessormethod accessType="1" parent_id="1795" tag="hblock_tag_103" canDelete="false" indentLevel="1" classfield_id="1795" text="m_slidersSetup = value;" >
                <header>
                 <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_slidersSetup&amp;#010;&amp;#010;" />
                </header>
@@ -36667,107 +36667,107 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="Operations" />
            </header>
            <textblocks>
-            <codeoperation tqparent_id="1698" tag="operation_1698" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1698" tag="operation_1698" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param view &amp;#010;@param ac &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1703" tag="operation_1703" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1703" tag="operation_1703" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1704" tag="operation_1704" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1704" tag="operation_1704" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param tab &amp;#010;@param docker &amp;#010;@param docktype &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1708" tag="operation_1708" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1708" tag="operation_1708" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param oldTool &amp;#010;@param newTool &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1712" tag="operation_1712" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1712" tag="operation_1712" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param oldTool &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1714" tag="operation_1714" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1714" tag="operation_1714" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param img &amp;#010;@param layer &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1727" tag="operation_1727" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1727" tag="operation_1727" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1728" tag="operation_1728" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1728" tag="operation_1728" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param brush &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1730" tag="operation_1730" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1730" tag="operation_1730" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param gradient &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1732" tag="operation_1732" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1732" tag="operation_1732" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param pattern &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1734" tag="operation_1734" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1736" tag="operation_1736" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1736" tag="operation_1736" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1738" tag="operation_1738" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1738" tag="operation_1738" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1740" tag="operation_1740" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1740" tag="operation_1740" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1742" tag="operation_1742" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1742" tag="operation_1742" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@param v &amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1744" tag="operation_1744" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1744" tag="operation_1744" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1745" tag="operation_1745" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1745" tag="operation_1745" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1746" tag="operation_1746" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1746" tag="operation_1746" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1747" tag="operation_1747" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1747" tag="operation_1747" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1748" tag="operation_1748" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1748" tag="operation_1748" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
             </codeoperation>
-            <codeoperation tqparent_id="1749" tag="operation_1749" canDelete="false" indentLevel="1" >
+            <codeoperation parent_id="1749" tag="operation_1749" canDelete="false" indentLevel="1" >
              <header>
               <javacodedocumentation tag="" indentLevel="1" text="&amp;#010;@return void  " />
              </header>
@@ -36783,736 +36783,736 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       <codecomment tag="" />
      </header>
      <classfields>
-      <codeclassfield tqparent_id="1695" field_type="7864421" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1695" field_type="7864421" initialValue="" role_id="1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
+       <ccfdeclarationcodeblock parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" role_id="0" text="public QObject  = new QObject ( );" >
         <header>
          <codecomment tag="" writeOutText="false" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text="return ;" >
+       <codeaccessormethod accessType="0" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text="return ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of &amp;#010;&amp;#010;@return the value of " />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text=" = value;" >
+       <codeaccessormethod accessType="1" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text=" = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of &amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="2" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text=".add(value);" >
+       <codeaccessormethod accessType="2" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text=".add(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Add an object of type QObject to the List &amp;#010;&amp;#010;@return void" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="3" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text=".remove(value);" >
+       <codeaccessormethod accessType="3" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text=".remove(value);" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Remove an object of type QObject from the List &amp;#010;" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="4" tqparent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text="return (List) ;" >
+       <codeaccessormethod accessType="4" parent_id="1695" tag="" canDelete="false" writeOutText="false" indentLevel="1" classfield_id="1695" role_id="0" text="return (List) ;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the list of &amp;#010;&amp;#010;@return List of " />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1718" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1718" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1718" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; QWidget * >* m_tabs;" >
+       <ccfdeclarationcodeblock parent_id="1718" tag="tblock_0" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; QWidget * >* m_tabs;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1718" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1718" text="return m_tabs;" >
+       <codeaccessormethod accessType="0" parent_id="1718" tag="hblock_tag_0" canDelete="false" indentLevel="1" classfield_id="1718" text="return m_tabs;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tabs&amp;#010;&amp;#010;@return the value of m_tabs" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1718" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1718" text="m_tabs = value;" >
+       <codeaccessormethod accessType="1" parent_id="1718" tag="hblock_tag_1" canDelete="false" indentLevel="1" classfield_id="1718" text="m_tabs = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tabs&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1720" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1720" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1720" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisDockFrameDocker * >* m_dockWindows;" >
+       <ccfdeclarationcodeblock parent_id="1720" tag="tblock_2" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisDockFrameDocker * >* m_dockWindows;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1720" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1720" text="return m_dockWindows;" >
+       <codeaccessormethod accessType="0" parent_id="1720" tag="hblock_tag_3" canDelete="false" indentLevel="1" classfield_id="1720" text="return m_dockWindows;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_dockWindows&amp;#010;&amp;#010;@return the value of m_dockWindows" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1720" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1720" text="m_dockWindows = value;" >
+       <codeaccessormethod accessType="1" parent_id="1720" tag="hblock_tag_4" canDelete="false" indentLevel="1" classfield_id="1720" text="m_dockWindows = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_dockWindows&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1722" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1722" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1722" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisPaintBox * >* m_toolBoxes;" >
+       <ccfdeclarationcodeblock parent_id="1722" tag="tblock_5" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KisPaintBox * >* m_toolBoxes;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1722" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1722" text="return m_toolBoxes;" >
+       <codeaccessormethod accessType="0" parent_id="1722" tag="hblock_tag_6" canDelete="false" indentLevel="1" classfield_id="1722" text="return m_toolBoxes;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolBoxes&amp;#010;&amp;#010;@return the value of m_toolBoxes" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1722" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1722" text="m_toolBoxes = value;" >
+       <codeaccessormethod accessType="1" parent_id="1722" tag="hblock_tag_7" canDelete="false" indentLevel="1" classfield_id="1722" text="m_toolBoxes = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolBoxes&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1724" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1724" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1724" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KoTabbedToolDock * >* m_sliders;" >
+       <ccfdeclarationcodeblock parent_id="1724" tag="tblock_8" canDelete="false" indentLevel="1" text="private KisGenericRegistry&lt; KoTabbedToolDock * >* m_sliders;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1724" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1724" text="return m_sliders;" >
+       <codeaccessormethod accessType="0" parent_id="1724" tag="hblock_tag_9" canDelete="false" indentLevel="1" classfield_id="1724" text="return m_sliders;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_sliders&amp;#010;&amp;#010;@return the value of m_sliders" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1724" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1724" text="m_sliders = value;" >
+       <codeaccessormethod accessType="1" parent_id="1724" tag="hblock_tag_10" canDelete="false" indentLevel="1" classfield_id="1724" text="m_sliders = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_sliders&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1725" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1725" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1725" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisView* m_view;" >
+       <ccfdeclarationcodeblock parent_id="1725" tag="tblock_11" canDelete="false" indentLevel="1" text="private KisView* m_view;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1725" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1725" text="return m_view;" >
+       <codeaccessormethod accessType="0" parent_id="1725" tag="hblock_tag_12" canDelete="false" indentLevel="1" classfield_id="1725" text="return m_view;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_view&amp;#010;&amp;#010;@return the value of m_view" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1725" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1725" text="m_view = value;" >
+       <codeaccessormethod accessType="1" parent_id="1725" tag="hblock_tag_13" canDelete="false" indentLevel="1" classfield_id="1725" text="m_view = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_view&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1726" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1726" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private KActionCollection* m_ac;" >
+       <ccfdeclarationcodeblock parent_id="1726" tag="tblock_14" canDelete="false" indentLevel="1" text="private KActionCollection* m_ac;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1726" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1726" text="return m_ac;" >
+       <codeaccessormethod accessType="0" parent_id="1726" tag="hblock_tag_15" canDelete="false" indentLevel="1" classfield_id="1726" text="return m_ac;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_ac&amp;#010;&amp;#010;@return the value of m_ac" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1726" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1726" text="m_ac = value;" >
+       <codeaccessormethod accessType="1" parent_id="1726" tag="hblock_tag_16" canDelete="false" indentLevel="1" classfield_id="1726" text="m_ac = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_ac&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1751" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1751" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1751" tag="tblock_17" canDelete="false" indentLevel="1" text="private KoToolDockManager* m_toolDockManager;" >
+       <ccfdeclarationcodeblock parent_id="1751" tag="tblock_17" canDelete="false" indentLevel="1" text="private KoToolDockManager* m_toolDockManager;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1751" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1751" text="return m_toolDockManager;" >
+       <codeaccessormethod accessType="0" parent_id="1751" tag="hblock_tag_18" canDelete="false" indentLevel="1" classfield_id="1751" text="return m_toolDockManager;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolDockManager&amp;#010;&amp;#010;@return the value of m_toolDockManager" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1751" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1751" text="m_toolDockManager = value;" >
+       <codeaccessormethod accessType="1" parent_id="1751" tag="hblock_tag_19" canDelete="false" indentLevel="1" classfield_id="1751" text="m_toolDockManager = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolDockManager&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1753" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1753" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Sliders" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1753" tag="tblock_20" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_layerchannelslider;" >
+       <ccfdeclarationcodeblock parent_id="1753" tag="tblock_20" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_layerchannelslider;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Sliders" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1753" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1753" text="return m_layerchannelslider;" >
+       <codeaccessormethod accessType="0" parent_id="1753" tag="hblock_tag_21" canDelete="false" indentLevel="1" classfield_id="1753" text="return m_layerchannelslider;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Sliders" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1753" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1753" text="m_layerchannelslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1753" tag="hblock_tag_22" canDelete="false" indentLevel="1" classfield_id="1753" text="m_layerchannelslider = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Sliders" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1754" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1754" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
+       <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
+       <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1755" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1755" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_fillsslider;" >
+       <ccfdeclarationcodeblock parent_id="1755" tag="tblock_26" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_fillsslider;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" >
+       <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_fillsslider&amp;#010;&amp;#010;@return the value of m_fillsslider" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1755" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1755" text="m_fillsslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1755" tag="hblock_tag_28" canDelete="false" indentLevel="1" classfield_id="1755" text="m_fillsslider = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_fillsslider&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1756" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1756" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1756" tag="tblock_29" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_toolcontrolslider;" >
+       <ccfdeclarationcodeblock parent_id="1756" tag="tblock_29" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_toolcontrolslider;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1756" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1756" text="return m_toolcontrolslider;" >
+       <codeaccessormethod accessType="0" parent_id="1756" tag="hblock_tag_30" canDelete="false" indentLevel="1" classfield_id="1756" text="return m_toolcontrolslider;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolcontrolslider&amp;#010;&amp;#010;@return the value of m_toolcontrolslider" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1756" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1756" text="m_toolcontrolslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1756" tag="hblock_tag_31" canDelete="false" indentLevel="1" classfield_id="1756" text="m_toolcontrolslider = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolcontrolslider&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1757" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1757" tag="tblock_32" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_colorslider;" >
+       <ccfdeclarationcodeblock parent_id="1757" tag="tblock_32" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_colorslider;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1757" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1757" text="return m_colorslider;" >
+       <codeaccessormethod accessType="0" parent_id="1757" tag="hblock_tag_33" canDelete="false" indentLevel="1" classfield_id="1757" text="return m_colorslider;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colorslider&amp;#010;&amp;#010;@return the value of m_colorslider" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1757" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1757" text="m_colorslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1757" tag="hblock_tag_34" canDelete="false" indentLevel="1" classfield_id="1757" text="m_colorslider = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colorslider&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1759" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1759" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Dockers" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1759" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_layerchanneldocker;" >
+       <ccfdeclarationcodeblock parent_id="1759" tag="tblock_35" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_layerchanneldocker;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Dockers" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1759" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1759" text="return m_layerchanneldocker;" >
+       <codeaccessormethod accessType="0" parent_id="1759" tag="hblock_tag_36" canDelete="false" indentLevel="1" classfield_id="1759" text="return m_layerchanneldocker;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Dockers" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1759" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1759" text="m_layerchanneldocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1759" tag="hblock_tag_37" canDelete="false" indentLevel="1" classfield_id="1759" text="m_layerchanneldocker = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Dockers" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1760" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
+       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
+       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1761" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1761" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_fillsdocker;" >
+       <ccfdeclarationcodeblock parent_id="1761" tag="tblock_41" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_fillsdocker;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" >
+       <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_fillsdocker&amp;#010;&amp;#010;@return the value of m_fillsdocker" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1761" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1761" text="m_fillsdocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1761" tag="hblock_tag_43" canDelete="false" indentLevel="1" classfield_id="1761" text="m_fillsdocker = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_fillsdocker&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1762" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1762" tag="tblock_44" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_toolcontroldocker;" >
+       <ccfdeclarationcodeblock parent_id="1762" tag="tblock_44" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_toolcontroldocker;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1762" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1762" text="return m_toolcontroldocker;" >
+       <codeaccessormethod accessType="0" parent_id="1762" tag="hblock_tag_45" canDelete="false" indentLevel="1" classfield_id="1762" text="return m_toolcontroldocker;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_toolcontroldocker&amp;#010;&amp;#010;@return the value of m_toolcontroldocker" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1762" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1762" text="m_toolcontroldocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1762" tag="hblock_tag_46" canDelete="false" indentLevel="1" classfield_id="1762" text="m_toolcontroldocker = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_toolcontroldocker&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1763" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1763" tag="tblock_47" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_colordocker;" >
+       <ccfdeclarationcodeblock parent_id="1763" tag="tblock_47" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_colordocker;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1763" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1763" text="return m_colordocker;" >
+       <codeaccessormethod accessType="0" parent_id="1763" tag="hblock_tag_48" canDelete="false" indentLevel="1" classfield_id="1763" text="return m_colordocker;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_colordocker&amp;#010;&amp;#010;@return the value of m_colordocker" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1763" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1763" text="m_colordocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1763" tag="hblock_tag_49" canDelete="false" indentLevel="1" classfield_id="1763" text="m_colordocker = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_colordocker&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1765" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1765" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Toolbox" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1765" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintboxdocker;" >
+       <ccfdeclarationcodeblock parent_id="1765" tag="tblock_50" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintboxdocker;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Toolbox" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1765" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1765" text="return m_paintboxdocker;" >
+       <codeaccessormethod accessType="0" parent_id="1765" tag="hblock_tag_51" canDelete="false" indentLevel="1" classfield_id="1765" text="return m_paintboxdocker;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Toolbox" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1765" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1765" text="m_paintboxdocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1765" tag="hblock_tag_52" canDelete="false" indentLevel="1" classfield_id="1765" text="m_paintboxdocker = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Toolbox" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1767" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1767" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" text="// Widgets" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1767" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisLayerBox* m_layerBox;" >
+       <ccfdeclarationcodeblock parent_id="1767" tag="tblock_53" canDelete="false" indentLevel="1" text="private KisLayerBox* m_layerBox;" >
         <header>
          <codecomment tag="" indentLevel="1" text="// Widgets" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1767" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1767" text="return m_layerBox;" >
+       <codeaccessormethod accessType="0" parent_id="1767" tag="hblock_tag_54" canDelete="false" indentLevel="1" classfield_id="1767" text="return m_layerBox;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Widgets" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1767" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1767" text="m_layerBox = value;" >
+       <codeaccessormethod accessType="1" parent_id="1767" tag="hblock_tag_55" canDelete="false" indentLevel="1" classfield_id="1767" text="m_layerBox = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="// Widgets" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1768" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1768" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1768" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintBox;" >
+       <ccfdeclarationcodeblock parent_id="1768" tag="tblock_56" canDelete="false" indentLevel="1" text="private KisPaintBox* m_paintBox;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1768" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1768" text="return m_paintBox;" >
+       <codeaccessormethod accessType="0" parent_id="1768" tag="hblock_tag_57" canDelete="false" indentLevel="1" classfield_id="1768" text="return m_paintBox;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_paintBox&amp;#010;&amp;#010;@return the value of m_paintBox" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1768" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1768" text="m_paintBox = value;" >
+       <codeaccessormethod accessType="1" parent_id="1768" tag="hblock_tag_58" canDelete="false" indentLevel="1" classfield_id="1768" text="m_paintBox = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_paintBox&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1770" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1770" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1770" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisFilterBox* m_filterBox;" >
+       <ccfdeclarationcodeblock parent_id="1770" tag="tblock_59" canDelete="false" indentLevel="1" text="private KisFilterBox* m_filterBox;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1770" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1770" text="return m_filterBox;" >
+       <codeaccessormethod accessType="0" parent_id="1770" tag="hblock_tag_60" canDelete="false" indentLevel="1" classfield_id="1770" text="return m_filterBox;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_filterBox&amp;#010;&amp;#010;@return the value of m_filterBox" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1770" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1770" text="m_filterBox = value;" >
+       <codeaccessormethod accessType="1" parent_id="1770" tag="hblock_tag_61" canDelete="false" indentLevel="1" classfield_id="1770" text="m_filterBox = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_filterBox&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1772" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1772" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1772" tag="tblock_62" canDelete="false" indentLevel="1" text="private ControlFrame* m_controlWidget;" >
+       <ccfdeclarationcodeblock parent_id="1772" tag="tblock_62" canDelete="false" indentLevel="1" text="private ControlFrame* m_controlWidget;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1772" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1772" text="return m_controlWidget;" >
+       <codeaccessormethod accessType="0" parent_id="1772" tag="hblock_tag_63" canDelete="false" indentLevel="1" classfield_id="1772" text="return m_controlWidget;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_controlWidget&amp;#010;&amp;#010;@return the value of m_controlWidget" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1772" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1772" text="m_controlWidget = value;" >
+       <codeaccessormethod accessType="1" parent_id="1772" tag="hblock_tag_64" canDelete="false" indentLevel="1" classfield_id="1772" text="m_controlWidget = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_controlWidget&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1774" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1774" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1774" tag="tblock_65" canDelete="false" indentLevel="1" text="private KisBirdEyeBox* m_birdEyeBox;" >
+       <ccfdeclarationcodeblock parent_id="1774" tag="tblock_65" canDelete="false" indentLevel="1" text="private KisBirdEyeBox* m_birdEyeBox;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1774" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1774" text="return m_birdEyeBox;" >
+       <codeaccessormethod accessType="0" parent_id="1774" tag="hblock_tag_66" canDelete="false" indentLevel="1" classfield_id="1774" text="return m_birdEyeBox;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_birdEyeBox&amp;#010;&amp;#010;@return the value of m_birdEyeBox" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1774" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1774" text="m_birdEyeBox = value;" >
+       <codeaccessormethod accessType="1" parent_id="1774" tag="hblock_tag_67" canDelete="false" indentLevel="1" classfield_id="1774" text="m_birdEyeBox = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_birdEyeBox&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1776" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1776" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1776" tag="tblock_68" canDelete="false" indentLevel="1" text="private KisChannelView* m_channelView;" >
+       <ccfdeclarationcodeblock parent_id="1776" tag="tblock_68" canDelete="false" indentLevel="1" text="private KisChannelView* m_channelView;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1776" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1776" text="return m_channelView;" >
+       <codeaccessormethod accessType="0" parent_id="1776" tag="hblock_tag_69" canDelete="false" indentLevel="1" classfield_id="1776" text="return m_channelView;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_channelView&amp;#010;&amp;#010;@return the value of m_channelView" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1776" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1776" text="m_channelView = value;" >
+       <codeaccessormethod accessType="1" parent_id="1776" tag="hblock_tag_70" canDelete="false" indentLevel="1" classfield_id="1776" text="m_channelView = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_channelView&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1778" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1778" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1778" tag="tblock_71" canDelete="false" indentLevel="1" text="private KisAutobrush* m_autobrush;" >
+       <ccfdeclarationcodeblock parent_id="1778" tag="tblock_71" canDelete="false" indentLevel="1" text="private KisAutobrush* m_autobrush;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1778" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1778" text="return m_autobrush;" >
+       <codeaccessormethod accessType="0" parent_id="1778" tag="hblock_tag_72" canDelete="false" indentLevel="1" classfield_id="1778" text="return m_autobrush;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_autobrush&amp;#010;&amp;#010;@return the value of m_autobrush" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1778" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1778" text="m_autobrush = value;" >
+       <codeaccessormethod accessType="1" parent_id="1778" tag="hblock_tag_73" canDelete="false" indentLevel="1" classfield_id="1778" text="m_autobrush = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_autobrush&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1780" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1780" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1780" tag="tblock_74" canDelete="false" indentLevel="1" text="private KisTextBrush* m_textBrush;" >
+       <ccfdeclarationcodeblock parent_id="1780" tag="tblock_74" canDelete="false" indentLevel="1" text="private KisTextBrush* m_textBrush;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1780" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1780" text="return m_textBrush;" >
+       <codeaccessormethod accessType="0" parent_id="1780" tag="hblock_tag_75" canDelete="false" indentLevel="1" classfield_id="1780" text="return m_textBrush;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_textBrush&amp;#010;&amp;#010;@return the value of m_textBrush" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1780" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1780" text="m_textBrush = value;" >
+       <codeaccessormethod accessType="1" parent_id="1780" tag="hblock_tag_76" canDelete="false" indentLevel="1" classfield_id="1780" text="m_textBrush = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_textBrush&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1782" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1782" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1782" tag="tblock_77" canDelete="false" indentLevel="1" text="private KisAutogradient* m_autogradient;" >
+       <ccfdeclarationcodeblock parent_id="1782" tag="tblock_77" canDelete="false" indentLevel="1" text="private KisAutogradient* m_autogradient;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1782" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1782" text="return m_autogradient;" >
+       <codeaccessormethod accessType="0" parent_id="1782" tag="hblock_tag_78" canDelete="false" indentLevel="1" classfield_id="1782" text="return m_autogradient;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_autogradient&amp;#010;&amp;#010;@return the value of m_autogradient" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1782" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1782" text="m_autogradient = value;" >
+       <codeaccessormethod accessType="1" parent_id="1782" tag="hblock_tag_79" canDelete="false" indentLevel="1" classfield_id="1782" text="m_autogradient = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_autogradient&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1784" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1784" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1784" tag="tblock_80" canDelete="false" indentLevel="1" text="private KisHSVWidget* m_hsvwidget;" >
+       <ccfdeclarationcodeblock parent_id="1784" tag="tblock_80" canDelete="false" indentLevel="1" text="private KisHSVWidget* m_hsvwidget;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1784" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1784" text="return m_hsvwidget;" >
+       <codeaccessormethod accessType="0" parent_id="1784" tag="hblock_tag_81" canDelete="false" indentLevel="1" classfield_id="1784" text="return m_hsvwidget;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_hsvwidget&amp;#010;&amp;#010;@return the value of m_hsvwidget" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1784" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1784" text="m_hsvwidget = value;" >
+       <codeaccessormethod accessType="1" parent_id="1784" tag="hblock_tag_82" canDelete="false" indentLevel="1" classfield_id="1784" text="m_hsvwidget = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_hsvwidget&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1786" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1786" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1786" tag="tblock_83" canDelete="false" indentLevel="1" text="private KisRGBWidget* m_rgbwidget;" >
+       <ccfdeclarationcodeblock parent_id="1786" tag="tblock_83" canDelete="false" indentLevel="1" text="private KisRGBWidget* m_rgbwidget;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1786" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1786" text="return m_rgbwidget;" >
+       <codeaccessormethod accessType="0" parent_id="1786" tag="hblock_tag_84" canDelete="false" indentLevel="1" classfield_id="1786" text="return m_rgbwidget;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_rgbwidget&amp;#010;&amp;#010;@return the value of m_rgbwidget" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1786" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1786" text="m_rgbwidget = value;" >
+       <codeaccessormethod accessType="1" parent_id="1786" tag="hblock_tag_85" canDelete="false" indentLevel="1" classfield_id="1786" text="m_rgbwidget = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_rgbwidget&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1788" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1788" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1788" tag="tblock_86" canDelete="false" indentLevel="1" text="private KisGrayWidget* m_graywidget;" >
+       <ccfdeclarationcodeblock parent_id="1788" tag="tblock_86" canDelete="false" indentLevel="1" text="private KisGrayWidget* m_graywidget;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1788" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1788" text="return m_graywidget;" >
+       <codeaccessormethod accessType="0" parent_id="1788" tag="hblock_tag_87" canDelete="false" indentLevel="1" classfield_id="1788" text="return m_graywidget;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_graywidget&amp;#010;&amp;#010;@return the value of m_graywidget" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1788" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1788" text="m_graywidget = value;" >
+       <codeaccessormethod accessType="1" parent_id="1788" tag="hblock_tag_88" canDelete="false" indentLevel="1" classfield_id="1788" text="m_graywidget = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_graywidget&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1790" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1790" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1790" tag="tblock_89" canDelete="false" indentLevel="1" text="private KisPaletteWidget* m_palettewidget;" >
+       <ccfdeclarationcodeblock parent_id="1790" tag="tblock_89" canDelete="false" indentLevel="1" text="private KisPaletteWidget* m_palettewidget;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1790" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1790" text="return m_palettewidget;" >
+       <codeaccessormethod accessType="0" parent_id="1790" tag="hblock_tag_90" canDelete="false" indentLevel="1" classfield_id="1790" text="return m_palettewidget;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_palettewidget&amp;#010;&amp;#010;@return the value of m_palettewidget" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1790" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1790" text="m_palettewidget = value;" >
+       <codeaccessormethod accessType="1" parent_id="1790" tag="hblock_tag_91" canDelete="false" indentLevel="1" classfield_id="1790" text="m_palettewidget = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_palettewidget&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1792" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1792" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1792" tag="tblock_92" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_brushMediator;" >
+       <ccfdeclarationcodeblock parent_id="1792" tag="tblock_92" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_brushMediator;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1792" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1792" text="return m_brushMediator;" >
+       <codeaccessormethod accessType="0" parent_id="1792" tag="hblock_tag_93" canDelete="false" indentLevel="1" classfield_id="1792" text="return m_brushMediator;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_brushMediator&amp;#010;&amp;#010;@return the value of m_brushMediator" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1792" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1792" text="m_brushMediator = value;" >
+       <codeaccessormethod accessType="1" parent_id="1792" tag="hblock_tag_94" canDelete="false" indentLevel="1" classfield_id="1792" text="m_brushMediator = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_brushMediator&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1793" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1793" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1793" tag="tblock_95" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_patternMediator;" >
+       <ccfdeclarationcodeblock parent_id="1793" tag="tblock_95" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_patternMediator;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1793" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1793" text="return m_patternMediator;" >
+       <codeaccessormethod accessType="0" parent_id="1793" tag="hblock_tag_96" canDelete="false" indentLevel="1" classfield_id="1793" text="return m_patternMediator;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_patternMediator&amp;#010;&amp;#010;@return the value of m_patternMediator" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1793" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1793" text="m_patternMediator = value;" >
+       <codeaccessormethod accessType="1" parent_id="1793" tag="hblock_tag_97" canDelete="false" indentLevel="1" classfield_id="1793" text="m_patternMediator = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_patternMediator&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1794" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1794" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1794" tag="tblock_98" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_gradientMediator;" >
+       <ccfdeclarationcodeblock parent_id="1794" tag="tblock_98" canDelete="false" indentLevel="1" text="private KisResourceMediator* m_gradientMediator;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1794" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1794" text="return m_gradientMediator;" >
+       <codeaccessormethod accessType="0" parent_id="1794" tag="hblock_tag_99" canDelete="false" indentLevel="1" classfield_id="1794" text="return m_gradientMediator;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_gradientMediator&amp;#010;&amp;#010;@return the value of m_gradientMediator" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1794" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1794" text="m_gradientMediator = value;" >
+       <codeaccessormethod accessType="1" parent_id="1794" tag="hblock_tag_100" canDelete="false" indentLevel="1" classfield_id="1794" text="m_gradientMediator = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_gradientMediator&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
-      <codeclassfield tqparent_id="1795" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
+      <codeclassfield parent_id="1795" field_type="0" initialValue="" role_id="-1" writeOutMethods="true" listClassName="" >
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock tqparent_id="1795" tag="tblock_101" canDelete="false" indentLevel="1" text="private boolean m_slidersSetup;" >
+       <ccfdeclarationcodeblock parent_id="1795" tag="tblock_101" canDelete="false" indentLevel="1" text="private boolean m_slidersSetup;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" tqparent_id="1795" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="1795" text="return m_slidersSetup;" >
+       <codeaccessormethod accessType="0" parent_id="1795" tag="hblock_tag_102" canDelete="false" indentLevel="1" classfield_id="1795" text="return m_slidersSetup;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_slidersSetup&amp;#010;&amp;#010;@return the value of m_slidersSetup" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" tqparent_id="1795" tag="hblock_tag_103" canDelete="false" indentLevel="1" classfield_id="1795" text="m_slidersSetup = value;" >
+       <codeaccessormethod accessType="1" parent_id="1795" tag="hblock_tag_103" canDelete="false" indentLevel="1" classfield_id="1795" text="m_slidersSetup = value;" >
         <header>
          <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_slidersSetup&amp;#010;&amp;#010;" />
         </header>
@@ -37520,7 +37520,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
       </codeclassfield>
      </classfields>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1699" tqparent_class="1699" fileExt=".java" fileName="KisView*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1699" parent_class="1699" fileExt=".java" fileName="KisView*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -37532,7 +37532,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1699" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1699" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisView*&amp;#010;" />
        </header>
@@ -37595,7 +37595,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1701" tqparent_class="1701" fileExt=".java" fileName="KActionCollection*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1701" parent_class="1701" fileExt=".java" fileName="KActionCollection*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -37607,7 +37607,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1701" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1701" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KActionCollection*&amp;#010;" />
        </header>
@@ -37670,7 +37670,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1709" tqparent_class="1709" fileExt=".java" fileName="KisTool*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1709" parent_class="1709" fileExt=".java" fileName="KisTool*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -37682,7 +37682,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1709" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1709" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTool*&amp;#010;" />
        </header>
@@ -37745,7 +37745,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1717" tqparent_class="1717" fileExt=".java" fileName="KisGenericRegistry&lt; QWidget * >*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1717" parent_class="1717" fileExt=".java" fileName="KisGenericRegistry&lt; QWidget * >*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -37757,7 +37757,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1717" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1717" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGenericRegistry&lt; QWidget * >*&amp;#010;" />
        </header>
@@ -37820,7 +37820,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1719" tqparent_class="1719" fileExt=".java" fileName="KisGenericRegistry&lt; KisDockFrameDocker * >*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1719" parent_class="1719" fileExt=".java" fileName="KisGenericRegistry&lt; KisDockFrameDocker * >*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -37832,7 +37832,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1719" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1719" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGenericRegistry&lt; KisDockFrameDocker * >*&amp;#010;" />
        </header>
@@ -37895,7 +37895,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1721" tqparent_class="1721" fileExt=".java" fileName="KisGenericRegistry&lt; KisPaintBox * >*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1721" parent_class="1721" fileExt=".java" fileName="KisGenericRegistry&lt; KisPaintBox * >*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -37907,7 +37907,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1721" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1721" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGenericRegistry&lt; KisPaintBox * >*&amp;#010;" />
        </header>
@@ -37970,7 +37970,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1723" tqparent_class="1723" fileExt=".java" fileName="KisGenericRegistry&lt; KoTabbedToolDock * >*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1723" parent_class="1723" fileExt=".java" fileName="KisGenericRegistry&lt; KoTabbedToolDock * >*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -37982,7 +37982,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1723" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1723" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGenericRegistry&lt; KoTabbedToolDock * >*&amp;#010;" />
        </header>
@@ -38045,7 +38045,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1750" tqparent_class="1750" fileExt=".java" fileName="KoToolDockManager*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1750" parent_class="1750" fileExt=".java" fileName="KoToolDockManager*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38057,7 +38057,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1750" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1750" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoToolDockManager*&amp;#010;" />
        </header>
@@ -38120,7 +38120,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1752" tqparent_class="1752" fileExt=".java" fileName="KoTabbedToolDock*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1752" parent_class="1752" fileExt=".java" fileName="KoTabbedToolDock*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38132,7 +38132,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1752" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1752" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KoTabbedToolDock*&amp;#010;" />
        </header>
@@ -38195,7 +38195,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1758" tqparent_class="1758" fileExt=".java" fileName="KisDockFrameDocker*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1758" parent_class="1758" fileExt=".java" fileName="KisDockFrameDocker*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38207,7 +38207,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1758" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1758" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDockFrameDocker*&amp;#010;" />
        </header>
@@ -38270,7 +38270,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1764" tqparent_class="1764" fileExt=".java" fileName="KisPaintBox*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1764" parent_class="1764" fileExt=".java" fileName="KisPaintBox*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38282,7 +38282,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1764" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1764" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaintBox*&amp;#010;" />
        </header>
@@ -38345,7 +38345,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1766" tqparent_class="1766" fileExt=".java" fileName="KisLayerBox*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1766" parent_class="1766" fileExt=".java" fileName="KisLayerBox*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38357,7 +38357,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1766" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1766" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisLayerBox*&amp;#010;" />
        </header>
@@ -38420,7 +38420,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1769" tqparent_class="1769" fileExt=".java" fileName="KisFilterBox*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1769" parent_class="1769" fileExt=".java" fileName="KisFilterBox*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38432,7 +38432,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1769" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1769" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisFilterBox*&amp;#010;" />
        </header>
@@ -38495,7 +38495,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1771" tqparent_class="1771" fileExt=".java" fileName="ControlFrame*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1771" parent_class="1771" fileExt=".java" fileName="ControlFrame*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38507,7 +38507,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1771" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1771" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class ControlFrame*&amp;#010;" />
        </header>
@@ -38570,7 +38570,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1773" tqparent_class="1773" fileExt=".java" fileName="KisBirdEyeBox*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1773" parent_class="1773" fileExt=".java" fileName="KisBirdEyeBox*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38582,7 +38582,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1773" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1773" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisBirdEyeBox*&amp;#010;" />
        </header>
@@ -38645,7 +38645,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1775" tqparent_class="1775" fileExt=".java" fileName="KisChannelView*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1775" parent_class="1775" fileExt=".java" fileName="KisChannelView*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38657,7 +38657,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1775" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1775" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisChannelView*&amp;#010;" />
        </header>
@@ -38720,7 +38720,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1777" tqparent_class="1777" fileExt=".java" fileName="KisAutobrush*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1777" parent_class="1777" fileExt=".java" fileName="KisAutobrush*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38732,7 +38732,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1777" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1777" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAutobrush*&amp;#010;" />
        </header>
@@ -38795,7 +38795,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1779" tqparent_class="1779" fileExt=".java" fileName="KisTextBrush*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1779" parent_class="1779" fileExt=".java" fileName="KisTextBrush*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38807,7 +38807,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1779" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1779" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisTextBrush*&amp;#010;" />
        </header>
@@ -38870,7 +38870,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1781" tqparent_class="1781" fileExt=".java" fileName="KisAutogradient*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1781" parent_class="1781" fileExt=".java" fileName="KisAutogradient*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38882,7 +38882,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1781" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1781" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisAutogradient*&amp;#010;" />
        </header>
@@ -38945,7 +38945,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1783" tqparent_class="1783" fileExt=".java" fileName="KisHSVWidget*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1783" parent_class="1783" fileExt=".java" fileName="KisHSVWidget*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -38957,7 +38957,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1783" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1783" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisHSVWidget*&amp;#010;" />
        </header>
@@ -39020,7 +39020,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1785" tqparent_class="1785" fileExt=".java" fileName="KisRGBWidget*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1785" parent_class="1785" fileExt=".java" fileName="KisRGBWidget*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39032,7 +39032,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1785" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1785" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisRGBWidget*&amp;#010;" />
        </header>
@@ -39095,7 +39095,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1787" tqparent_class="1787" fileExt=".java" fileName="KisGrayWidget*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1787" parent_class="1787" fileExt=".java" fileName="KisGrayWidget*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39107,7 +39107,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1787" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1787" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisGrayWidget*&amp;#010;" />
        </header>
@@ -39170,7 +39170,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1789" tqparent_class="1789" fileExt=".java" fileName="KisPaletteWidget*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1789" parent_class="1789" fileExt=".java" fileName="KisPaletteWidget*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39182,7 +39182,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1789" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1789" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisPaletteWidget*&amp;#010;" />
        </header>
@@ -39245,7 +39245,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1791" tqparent_class="1791" fileExt=".java" fileName="KisResourceMediator*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1791" parent_class="1791" fileExt=".java" fileName="KisResourceMediator*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39257,7 +39257,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1791" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1791" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisResourceMediator*&amp;#010;" />
        </header>
@@ -39320,7 +39320,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1796" tqparent_class="1796" fileExt=".java" fileName="KisDoc" >
+    <classifiercodedocument writeOutCode="true" package="" id="1796" parent_class="1796" fileExt=".java" fileName="KisDoc" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39332,7 +39332,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1796" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1796" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDoc&amp;#010;" />
        </header>
@@ -39395,7 +39395,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1797" tqparent_class="1797" fileExt=".java" fileName="KisClipboard" >
+    <classifiercodedocument writeOutCode="true" package="" id="1797" parent_class="1797" fileExt=".java" fileName="KisClipboard" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39407,7 +39407,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1797" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1797" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisClipboard&amp;#010;" />
        </header>
@@ -39470,7 +39470,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1803" tqparent_class="1803" fileExt=".java" fileName="KisDoc*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1803" parent_class="1803" fileExt=".java" fileName="KisDoc*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39482,7 +39482,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1803" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1803" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisDoc*&amp;#010;" />
        </header>
@@ -39545,7 +39545,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1809" tqparent_class="1809" fileExt=".java" fileName="KAction*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1809" parent_class="1809" fileExt=".java" fileName="KAction*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39557,7 +39557,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1809" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1809" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KAction*&amp;#010;" />
        </header>
@@ -39620,7 +39620,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1837" tqparent_class="1837" fileExt=".java" fileName="KisClipboard*" >
+    <classifiercodedocument writeOutCode="true" package="" id="1837" parent_class="1837" fileExt=".java" fileName="KisClipboard*" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39632,7 +39632,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1837" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1837" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class KisClipboard*&amp;#010;" />
        </header>
@@ -39695,7 +39695,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
      </header>
      <classfields/>
     </classifiercodedocument>
-    <classifiercodedocument writeOutCode="true" package="" id="1858" tqparent_class="1858" fileExt=".java" fileName="QPtrList" >
+    <classifiercodedocument writeOutCode="true" package="" id="1858" parent_class="1858" fileExt=".java" fileName="QPtrList" >
      <textblocks>
       <codeblockwithcomments tag="packages" writeOutText="false" >
        <header>
@@ -39707,7 +39707,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
         <codecomment tag="" writeOutText="false" />
        </header>
       </codeblockwithcomments>
-      <javaclassdeclarationblock tqparent_id="1858" tag="ClassDeclBlock" canDelete="false" >
+      <javaclassdeclarationblock parent_id="1858" tag="ClassDeclBlock" canDelete="false" >
        <header>
         <javacodedocumentation tag="" text="Class QPtrList&amp;#010;" />
        </header>
diff --git a/chalk/doc/doc-outline b/chalk/doc/doc-outline
index 373370b5..081f9ed7 100644
--- a/chalk/doc/doc-outline
+++ b/chalk/doc/doc-outline
@@ -62,7 +62,7 @@ The current outline (working towards 1.6):
   - Layer box
   - Working with layers ([TODO] expand)
   - Adjustment layers ([TODO] expand)
-  - [TODO] Layer tqmasks
+  - [TODO] Layer masks
   - Compositing modes ([TODO] expand)
   - [TODO] Create, transform, combine, histograms, ...
 
diff --git a/chalk/doc/howtofilters.txt b/chalk/doc/howtofilters.txt
index 09deabf6..8be969b9 100644
--- a/chalk/doc/howtofilters.txt
+++ b/chalk/doc/howtofilters.txt
@@ -22,7 +22,7 @@ Just copy the following in a file named (for instance) myfiltercw.ui :
         <string>kisFilterConfigurationWidget1</string>
     </property>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
 
 And then open Qt/Designer
diff --git a/chalk/doc/paint_device.txt b/chalk/doc/paint_device.txt
index a3c34a35..ab071cfe 100644
--- a/chalk/doc/paint_device.txt
+++ b/chalk/doc/paint_device.txt
@@ -59,7 +59,7 @@ per channel; QUANTUM can be bigger.
 Fill the buf with the data. x1, y1, x2, y2 are the top left and bottom
 right corner of the section you want. stride is the width of the
 section in bytes, i.e. (x2 - x1 + 1) * depth. Note that stride does
-not need to be pre-multiplied with sizeof(QUANTUM), aptqparently.
+not need to be pre-multiplied with sizeof(QUANTUM), apparently.
 
 	tilemgr -> readPixelData(x1, y1, x2, y2, buf, stride);
 
diff --git a/chalk/plugins/filters/blur/wdgblur.ui b/chalk/plugins/filters/blur/wdgblur.ui
index 06119596..3e381bbe 100644
--- a/chalk/plugins/filters/blur/wdgblur.ui
+++ b/chalk/plugins/filters/blur/wdgblur.ui
@@ -212,7 +212,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui
index a783dd85..513912ea 100644
--- a/chalk/plugins/filters/bumpmap/wdgbumpmap.ui
+++ b/chalk/plugins/filters/bumpmap/wdgbumpmap.ui
@@ -360,7 +360,7 @@ layer, the current layer will be used.</string>
     <tabstop>intWaterLevel</tabstop>
     <tabstop>intAmbient</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/filters/cimg/CImg.h b/chalk/plugins/filters/cimg/CImg.h
index 871cb496..f69fe2a1 100644
--- a/chalk/plugins/filters/cimg/CImg.h
+++ b/chalk/plugins/filters/cimg/CImg.h
@@ -8799,8 +8799,8 @@ namespace cimg_library {
        - -1 = Backward finite differences
        - 0 = Centered finite differences
        - 1 = Forward finite differences
-       - 2 = Using Sobel tqmasks
-       - 3 = Using rotation invariant tqmasks
+       - 2 = Using Sobel masks
+       - 3 = Using rotation invariant masks
        - 4 = Using Deriche recusrsive filter.
     **/
     CImgl<typename cimg::largest<T,float>::type> get_gradientXY(const int scheme=0) const {
@@ -9822,7 +9822,7 @@ namespace cimg_library {
     }
 #endif
 
-    //! Draw a tqmasked sprite image in the instance image, at coordinates (\c x0,\c y0,\c z0,\c v0).
+    //! 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.
@@ -9830,7 +9830,7 @@ namespace cimg_library {
        \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 tqmask_valmax = Maximum pixel value of the tqmask image \c tqmask.
+       \param mask_valmax = Maximum pixel value of the tqmask image \c tqmask.
        \param opacity = opacity of the drawing.
        \note Pixel values of \c tqmask set the opacity of the corresponding pixels in \c sprite.
        \note Clipping is supported.
@@ -9838,7 +9838,7 @@ namespace cimg_library {
     **/
     template<typename ti,typename tm> CImg& draw_image(const CImg<ti>& sprite,const CImg<tm>& tqmask,
                                                        const int x0=0,const int y0=0,const int z0=0,const int v0=0,
-                                                       const tm tqmask_valmax=1,const float opacity=1) {
+                                                       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.",
@@ -9873,8 +9873,8 @@ namespace cimg_library {
 	      for (int y=0; y<lY; y++) {
 		for (int x=0; x<lX; x++) {
 		  const float mopacity = *(ptrm++)*opacity,
-		    nopacity = cimg::abs(mopacity), copacity = tqmask_valmax-cimg::max(mopacity,0.0f);
-		  *ptrd = (T)((nopacity*(*(ptrs++))+copacity*(*ptrd))/tqmask_valmax);
+		    nopacity = cimg::abs(mopacity), copacity = mask_valmax-cimg::max(mopacity,0.0f);
+		  *ptrd = (T)((nopacity*(*(ptrs++))+copacity*(*ptrd))/mask_valmax);
 		  ptrd++;
 		}
 		ptrd+=offX; ptrs+=soffX; ptrm+=soffX;
@@ -12042,7 +12042,7 @@ namespace cimg_library {
           }
         }
       } else { 
-        // Generic version for other tqmasks      
+        // 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);
         cimg_mapV(*this,v) 
           if (!weighted_correl) {	// Classical correlation
diff --git a/chalk/plugins/filters/cimg/wdg_cimg.ui b/chalk/plugins/filters/cimg/wdg_cimg.ui
index 80476616..397e52e6 100644
--- a/chalk/plugins/filters/cimg/wdg_cimg.ui
+++ b/chalk/plugins/filters/cimg/wdg_cimg.ui
@@ -276,7 +276,7 @@
     <tabstop>chkLinearInterpolation</tabstop>
     <tabstop>chkNormalize</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/filters/colorify/WdgColorifyBase.ui b/chalk/plugins/filters/colorify/WdgColorifyBase.ui
index a5fcebf9..ad1c062e 100644
--- a/chalk/plugins/filters/colorify/WdgColorifyBase.ui
+++ b/chalk/plugins/filters/colorify/WdgColorifyBase.ui
@@ -90,7 +90,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
index f824a9ab..525b221c 100644
--- a/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
+++ b/chalk/plugins/filters/colors/wdgcolortoalphabase.ui
@@ -106,7 +106,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
index 9474462b..1e576f66 100644
--- a/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
+++ b/chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui
@@ -285,7 +285,7 @@
         <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcurve.h</includehint>
 </includehints>
diff --git a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
index 243d628f..8d95814c 100644
--- a/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
+++ b/chalk/plugins/filters/colorsfilters/wdg_perchannel.ui
@@ -183,7 +183,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcurve.h</includehint>
 </includehints>
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
index 495fd3bc..03c0e336 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui
@@ -185,5 +185,5 @@
         <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890e04c250185262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
index a7184b4b..c14bd51a 100644
--- a/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
+++ b/chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui
@@ -66,7 +66,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
index d5ef416d..6ee2631a 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
+++ b/chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui
@@ -213,7 +213,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/filters/levelfilter/wdg_level.ui b/chalk/plugins/filters/levelfilter/wdg_level.ui
index 0db94640..841b78fb 100644
--- a/chalk/plugins/filters/levelfilter/wdg_level.ui
+++ b/chalk/plugins/filters/levelfilter/wdg_level.ui
@@ -323,7 +323,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kgradientslider.h</includehint>
     <includehint>kgradientslider.h</includehint>
diff --git a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
index 969d4153..3bafae01 100644
--- a/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
+++ b/chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui
@@ -101,7 +101,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
index 5bdae980..c9ce3acf 100644
--- a/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
+++ b/chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui
@@ -123,7 +123,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/filters/unsharp/wdgunsharp.ui b/chalk/plugins/filters/unsharp/wdgunsharp.ui
index 376ed16e..faf74dd4 100644
--- a/chalk/plugins/filters/unsharp/wdgunsharp.ui
+++ b/chalk/plugins/filters/unsharp/wdgunsharp.ui
@@ -126,7 +126,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
index 10fff389..b8132262 100644
--- a/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
+++ b/chalk/plugins/filters/wavefilter/wdgwaveoptions.ui
@@ -261,7 +261,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
index 85bef3f6..1977d58b 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
@@ -122,7 +122,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
     m_painter->setDab(dab); // Cache dab for future paints in the painter.
     m_painter->setPressure(info.pressure); // Cache pressure in the current painter.
 
-    TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
+    TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
     TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
 
     KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
index 360fa66e..ffa51114 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
@@ -251,8 +251,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
 
     m_painter->setPressure(adjustedInfo.pressure);
 
-    TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo),
-                          brush->tqmaskHeight(adjustedInfo));
+    TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo),
+                          brush->maskHeight(adjustedInfo));
     TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
 
     KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
index f6021ecc..89207a50 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
+++ b/chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui
@@ -262,7 +262,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcurve.h</includehint>
     <includehint>kcurve.h</includehint>
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
index 139ed51d..7ad4a4da 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
@@ -312,7 +312,7 @@ void KisDuplicateOp::paintAt(const KisPoint &pos, const KisPaintInformation& inf
                              OPACITY_OPAQUE, 0, 0, sw, sh);
     copyPainter.end();
 
-    TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
+    TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
     TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
 
     KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
index 13045139..794923a4 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
@@ -99,19 +99,19 @@ void KisEraseOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     KisPaintDeviceSP dab = new KisPaintDevice(device->colorSpace(), "erase op dab");
     Q_CHECK_PTR(dab);
 
-    TQ_INT32 tqmaskWidth = tqmask->width();
-    TQ_INT32 tqmaskHeight = tqmask->height();
+    TQ_INT32 maskWidth = tqmask->width();
+    TQ_INT32 maskHeight = tqmask->height();
 
     TQRect dstRect;
 
-    KisRectIteratorPixel it = dab->createRectIterator(0, 0, tqmaskWidth, tqmaskHeight, true);
+    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);
         ++it;
     }
 
-    TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight);
+    TQRect dabRect = TQRect(0, 0, maskWidth, maskHeight);
     dstRect = TQRect(destX, destY, dabRect.width(), dabRect.height());
 
     KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
index 0fcbca02..e8780100 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
@@ -85,7 +85,7 @@ void KisPenOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     }
 
     m_painter->setPressure(info.pressure);
-    TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(info), brush->tqmaskHeight(info));
+    TQRect dabRect = TQRect(0, 0, brush->maskWidth(info), brush->maskHeight(info));
     TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
 
     KisImage * image = device->image();
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
index 2e50bebb..a493f132 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
@@ -263,8 +263,8 @@ void KisSmudgeOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     
     m_painter->setPressure(adjustedInfo.pressure);
 
-    TQRect dabRect = TQRect(0, 0, brush->tqmaskWidth(adjustedInfo),
-                          brush->tqmaskHeight(adjustedInfo));
+    TQRect dabRect = TQRect(0, 0, brush->maskWidth(adjustedInfo),
+                          brush->maskHeight(adjustedInfo));
     TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
 
     KisImage * image = device->image();
diff --git a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
index a2b9d7d3..7675b875 100644
--- a/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
+++ b/chalk/plugins/tools/defaulttools/wdgcolorpicker.ui
@@ -163,5 +163,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
index b7b123d7..343cee9f 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
@@ -88,7 +88,7 @@ private:
         m_layer->setX(pos.x());
         m_layer->setY(pos.y());
 
-        m_layer->tqparentPaintDevice()->setDirty();
+        m_layer->parentPaintDevice()->setDirty();
 
         if (m_layer->undoAdapter()) {
             m_layer->undoAdapter()->setUndo(true);
diff --git a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
index 4f857cf9..8d3bf1d8 100644
--- a/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
+++ b/chalk/plugins/tools/tool_crop/wdg_tool_crop.ui
@@ -204,7 +204,7 @@
     <tabstop>cmbType</tabstop>
     <tabstop>bnCrop</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui
index eac06e2b..035eff3b 100644
--- a/chalk/plugins/tools/tool_curves/wdg_tool_example.ui
+++ b/chalk/plugins/tools/tool_curves/wdg_tool_example.ui
@@ -120,7 +120,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/tools/tool_filter/kis_filterop.cc b/chalk/plugins/tools/tool_filter/kis_filterop.cc
index 1f2200b3..2296965c 100644
--- a/chalk/plugins/tools/tool_filter/kis_filterop.cc
+++ b/chalk/plugins/tools/tool_filter/kis_filterop.cc
@@ -88,8 +88,8 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
 
     m_painter->setPressure(info.pressure);
 
-    TQ_INT32 tqmaskWidth = tqmask->width();
-    TQ_INT32 tqmaskHeight = tqmask->height();
+    TQ_INT32 maskWidth = tqmask->width();
+    TQ_INT32 maskHeight = tqmask->height();
 
     // Create a temporary paint device
     KisPaintDeviceSP tmpDev = new KisPaintDevice(colorSpace, "filterop tmpdev");
@@ -98,17 +98,17 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     // Copy the layer data onto the new paint device
 
     KisPainter p( tmpDev );
-    p.bitBlt( 0,  0,  COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, tqmaskWidth, tqmaskHeight );
+    p.bitBlt( 0,  0,  COMPOSITE_COPY, m_source, OPACITY_OPAQUE, x, y, maskWidth, maskHeight );
 
     // Filter the paint device
     filter->disableProgress();
-    filter->process( tmpDev,  tmpDev, m_filterConfiguration, TQRect( 0, 0, tqmaskWidth, tqmaskHeight ));
+    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)
-    for (int y = 0; y < tqmaskHeight; y++)
+    for (int y = 0; y < maskHeight; y++)
     {
-        KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, tqmaskWidth, false);
+        KisHLineIterator hiter = tmpDev->createHLineIterator(0, y, maskWidth, false);
         int x=0;
         while(! hiter.isDone())
         {
@@ -120,7 +120,7 @@ void KisFilterOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
     }
 
     // Blit the paint device onto the layer
-    TQRect dabRect = TQRect(0, 0, tqmaskWidth, tqmaskHeight);
+    TQRect dabRect = TQRect(0, 0, maskWidth, maskHeight);
     TQRect dstRect = TQRect(x, y, dabRect.width(), dabRect.height());
 
     KisImage * image = m_painter->device()->image();
diff --git a/chalk/plugins/tools/tool_star/wdg_tool_star.ui b/chalk/plugins/tools/tool_star/wdg_tool_star.ui
index b342a927..3f4f30f5 100644
--- a/chalk/plugins/tools/tool_star/wdg_tool_star.ui
+++ b/chalk/plugins/tools/tool_star/wdg_tool_star.ui
@@ -120,7 +120,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
index 2f41e1b3..2cf6806e 100644
--- a/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
+++ b/chalk/plugins/tools/tool_transform/wdg_tool_transform.ui
@@ -235,7 +235,7 @@
     <tabstop>intEndX</tabstop>
     <tabstop>intEndY</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>kis_cmb_idlist.h</includehint>
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
index 43f98a53..22a82e55 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
@@ -239,7 +239,7 @@ void DlgColorRange::updatePreview()
 
     TQ_INT32 x, y, w, h;
     m_dev->exactBounds(x, y, w, h);
-    TQPixmap pix = TQPixmap(m_selection->tqmaskImage().smoothScale(350, 350, TQ_ScaleMin));
+    TQPixmap pix = TQPixmap(m_selection->maskImage().smoothScale(350, 350, TQ_ScaleMin));
     m_subject->canvasController()->updateCanvas();
     m_page->pixSelection->setPixmap(pix);
 }
diff --git a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
index 3eafd180..67c6028b 100644
--- a/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
+++ b/chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui
@@ -248,5 +248,5 @@
 </images>
 <tabstops>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui b/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui
index ae183206..cd71eef5 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui
+++ b/chalk/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui
@@ -214,5 +214,5 @@ colors (Pantone, TruMatch, logo colors, ...)</string>
         <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
index 4bd2f38c..69aae624 100644
--- a/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
+++ b/chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui
@@ -228,7 +228,7 @@
     <tabstop>opacitySpinBox</tabstop>
     <tabstop>allowResizingCheckBox</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
index 488c9564..4b812770 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui
@@ -115,7 +115,7 @@
         <data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kis_previewwidget.h</includehint>
     <includehint>kis_filters_listview.h</includehint>
diff --git a/chalk/plugins/viewplugins/histogram/wdghistogram.ui b/chalk/plugins/viewplugins/histogram/wdghistogram.ui
index 77c418ed..320b7d7a 100644
--- a/chalk/plugins/viewplugins/histogram/wdghistogram.ui
+++ b/chalk/plugins/viewplugins/histogram/wdghistogram.ui
@@ -222,7 +222,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kis_histogram_view.h</includehint>
 </includehints>
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
index 4cdd5c95..1686fe97 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui
@@ -358,7 +358,7 @@
     <tabstop>chkConstrain</tabstop>
     <tabstop>radioScale</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
index fb7547d2..13cd72a8 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_layersize.ui
@@ -227,7 +227,7 @@
     <tabstop>intHeightPercent</tabstop>
     <tabstop>chkConstrain</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
index df0e010d..d3a8326a 100644
--- a/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
+++ b/chalk/plugins/viewplugins/imagesize/wdg_resolution.ui
@@ -138,7 +138,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui b/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui
index 06d01e9f..6df7cddd 100644
--- a/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui
+++ b/chalk/plugins/viewplugins/modify_selection/wdg_border_selection.ui
@@ -53,5 +53,5 @@
 <tabstops>
     <tabstop>radiusSpinBox</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui b/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui
index d1180803..59827625 100644
--- a/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui
+++ b/chalk/plugins/viewplugins/modify_selection/wdg_grow_selection.ui
@@ -53,5 +53,5 @@
 <tabstops>
     <tabstop>radiusSpinBox</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui b/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui
index 28429d72..f4d747ab 100644
--- a/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui
+++ b/chalk/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui
@@ -64,5 +64,5 @@
 <tabstops>
     <tabstop>radiusSpinBox</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
index 7dc14f17..20f66825 100644
--- a/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
+++ b/chalk/plugins/viewplugins/performancetest/wdg_perftest.ui
@@ -275,7 +275,7 @@
 <tabstops>
     <tabstop>intTestCount</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
index d58c458d..884776f1 100644
--- a/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
+++ b/chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui
@@ -238,7 +238,7 @@
         <data format="PNG" length="363">89504e470d0a1a0a0000000d494844520000002c0000002e0806000000534cfb0a00000132494441545885ed994b12032108449b54ee7f65b3cd5440f92a56a5f7326f5a11451a63608b8806c6a0689857068b5a446177f6020361e8fdc04008fa0c30e086a6b4a4f3ba664cc418704212013041fb80b340bfa5847e9b825680022687f549d70016d03aac815d7d988be1a87c6be015acb7dc3ac7cd8167b091734160acbc861bc2029e4a77101690f661c9dd840f46a577b8012cc00157edb749d239dcc45de0e4f1d2a927705235aad4e50e5fa03f70b56c0778ab227bba90ec7d1d167eb62f30c0423f81b9696856aa7b3bcc487fa7f3543ccb18e54cfe3adca914332ce7aff9c6d83cb0e47205b4f176634fba4c68472c1978b69633a09db7f2753330bb91128ca7eb5e56b5aaac316069b756573ce54cf5b8e65fd3d0769870e6c920305bfb1e659296541ef0265d77bcbc0ef803779f9c39421cd9b50000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index f9887821..dad0ee01 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -413,15 +413,15 @@ void KSnapshot::performGrab()
                     contents += TQRegion( w - border, 0, border, h );
                 }
                 
-                //Get the tqmasked away area.
-                TQRegion tqmaskedAway = bbox - contents;
-                TQMemArray<TQRect> tqmaskedAwayRects = tqmaskedAway.rects();
+                //Get the masked away area.
+                TQRegion maskedAway = bbox - contents;
+                TQMemArray<TQRect> maskedAwayRects = maskedAway.rects();
 
                 //Construct a bitmap tqmask from the rectangles
                 TQPainter p(&tqmask);
                 p.fillRect(0, 0, w, h, TQt::color1);
-                for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++)
-                    p.fillRect(tqmaskedAwayRects[pos], TQt::color0);
+                for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
+                    p.fillRect(maskedAwayRects[pos], TQt::color0);
                 p.end();
 
                 snapshot.setMask(tqmask);
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
index 0672215e..34643902 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
@@ -330,6 +330,6 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
     <function specifier="non virtual" returnType="TQPixmap">preview()</function>
 </functions>
 <pixmapfunction>SmallIconSet</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
index 2e17ed98..b01ba0a8 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
@@ -39,7 +39,7 @@ namespace ChalkCore {
 //<beurk> stupid TQt which doesn't support templated TQObject
 class IteratorMemoryManaged {
     public:
-        virtual void tqinvalidateIterator() = 0;
+        virtual void invalidateIterator() = 0;
 };
     
 class IteratorMemoryManager : public TQObject {
@@ -49,13 +49,13 @@ class IteratorMemoryManager : public TQObject {
         IteratorMemoryManager(IteratorMemoryManaged* it) : m_it(it)
         {
             // Connect the Monitor to know when the invalidating of iterator is needed
-            connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(tqinvalidateIterator()));
+            connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(invalidateIterator()));
 
         }
     public slots:
-        void tqinvalidateIterator()
+        void invalidateIterator()
         {
-            m_it->tqinvalidateIterator();
+            m_it->invalidateIterator();
         }
     private:
         IteratorMemoryManaged* m_it;
@@ -147,7 +147,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
     
         ~Iterator()
         {
-            tqinvalidateIterator();
+            invalidateIterator();
             delete m_itmm;
         }
         virtual const TQString getClassName() const {
@@ -282,7 +282,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
             return 0;
         }
     private:
-        virtual void tqinvalidateIterator()
+        virtual void invalidateIterator()
         {
             kdDebug(41011) << "invalidating iterator" << endl;
             if(m_it)
diff --git a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
index 0593258b..f1eeeaa2 100644
--- a/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
+++ b/chalk/plugins/viewplugins/separate_channels/wdg_separations.ui
@@ -178,5 +178,5 @@
     <tabstop>chkDownscale</tabstop>
     <tabstop>chkColors</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
index d63b58f5..848eb328 100644
--- a/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
+++ b/chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui
@@ -92,7 +92,7 @@
 <tabstops>
     <tabstop>shearAngleX</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
index be0713ed..3382fe1f 100644
--- a/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
+++ b/chalk/plugins/viewplugins/substrate/wdgsubstrate.ui
@@ -214,7 +214,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/chalk/plugins/viewplugins/variations/wdg_variations.ui b/chalk/plugins/viewplugins/variations/wdg_variations.ui
index 191b84bb..65f20e23 100644
--- a/chalk/plugins/viewplugins/variations/wdg_variations.ui
+++ b/chalk/plugins/viewplugins/variations/wdg_variations.ui
@@ -893,5 +893,5 @@
         <data format="XPM.GZ" length="55092">789cccbd47b7eb38b2ef397f9fa2d6e5ecae5e7cf266d0035266cb6da7ed77af1ed07b2f1aa9bf7c83883f704c56d5cd7c75bb5f95d6c9ca5f8a22114044202200f0fccffffcdbe7d3fddffef37ffe8fea625c02eb6f966f947ffb4fbb4e92ebfff57fff9fffcffff88fe160f0b7fecf68389bfe6df41fffc7fff80febf96fd6df9401ff5fcff64232ffde36244f7a762ac953fefd56f29cf35cf2a267f3072ff9f733c906e7836493f35eb2c59fd74ab6797b1f243bfcfb46b2cb7fef0a1e72799c5af2907f7f94cce5732cc963fefd483297cf3a8387d43f992999ffde0c25f3dfb79a64de5f662099dfcfe924cf386f24f3fe4a44ff0fd17e5b327f9e772799dfcfb8078fa87d662499cbebbb9249de6fc9bcbd9d2f99dab795ccc7b31a48e6e3b71a4ae6e315ed25f3f1b04f82a93f0dc1636a9ff32999daf32599f757a54ae6fde17e48e6fae23892b97e78a2bd63ea1f438cef849e97e892f9f7652b99b76f3d91cce53763f0947e6f08fd9c1137b664de5e43c83fc7f53bf0022cf475499c8be719c4f113d824de5cc01671fd0eb6895dbaff50d8ab174ae6f2ad3ac9a47f63c924df4832d73f732a99f777f324998fb73993ccfb5f7f96ccc7df3a49e6e3514592b9bd3aa664ae1fd6bd646eaf9a2b98f4ddf52573fdb58e60d89f6d49e6df9b13c97c3c1d45326fbf634826ffb2934cfee40086fdf88164de7ff65232d9eb9b646e1fa607867e9bbe641a8f816092cf14f2423f4d070c7d8b9f25f3e7bbaf60e89fb791ccfb3b15df43ffe22f30f42f13f240ffea1b18fab716bf877ee967b043dc92bf1f0ea16fdd9af3a8f740bc3dbe64f2f70bc9bcbfcd2fc9bcbfbd4432f90b4730f5cff55e3297bfc9c0187f732899f4772099c6e35b321f7f6b0fc6f8daa6649aff7692f9f3724d32d7f7cb4932ef6ffb4e32e9b302c6f86723c9dcdefc50326f9ff32e99f7975382a10fd75c32d7e795906742fdd3bd49e6df67a2bdd09ff20886beb89164fefcd54932ef9ffa2c98fca72bda0b7d6a9f25f3feb0c4f842bf9a07b0d02fd13fd0afe2090cffd6c660e85b24ae87be05a40f63e1df8277c9bc7debab643e5e575732efef6e2799cb1bfcf89ecbdbed2573fd5cfd781e1fcf952d98fa3b91cf277f74cd24f3fe0f3ec08807ba8d64ae9fc54232e98f27993faff9f13df787ae680ff4d57995cce57103c95c7fac3bc97c7c7c5f308d67b8028bf9f72299cbd3dc49e6f2981f92797fd69664de5f7e2499dbb33b92ccdb6f2dc1d067772099fca72e99b7ff6a49a6f946f437f4b9bd48267934b0d0ef77c9bc7dad68df9cee9fee25f3fe69447fcc31df88f1843eaf6e92f9f3da89649a0fee25f3f1cb85be41ff0331bed07f5f8ca7f0a7d43f13a1df9d2a99f777f32899dfffea80111faeae92b93cee41f090f7effa0c463ce77f48a6f9ee51321fafeb4930f547bb01433fecb164fe7cff5b321f2f2f92ccfb3f93d793bd745b30f421ae2593bfd94be6fd1b2692b93cde4e32b79fda164ced8ddec1d017e74332f9dbb564de5e772899e299140c7dcaa692b93db8df92797fe61d18fe3117e303fd59b792e979b164de3f8918ff05f5cf46f40ff4c715e301fdb9bd80e13f57f792797fad4a30fce906bf17f3f51ae331c4fc19a13d43f89780e693a9f0a7ed028cebfd4e321fafe6198c7cc00b2473f9bc77c95cdf4a4ff0908fc75a5c8f78bfb52553fcf02999ebbfdf08a6f10e5ec1c2bfdc49a6f97c2b99e6ff27c9642f3fbee7fab416f2407fc299643efe912f99ec692099cbd3b492b9bc9ab8ff94c63711fd0bfdb2a792c93e2ac9140f689229df5125f3feed5660e85ffd2a99fce34432efdfee00867e5e14c9941f8ec0d0bfcc904cf9572a99b7a76e25f3fe73c760a1afaa646ebf99e85fe86f2ec61bfaea0b79e11f0ba12f2eda8bfb4b7d267b98897c64dd81a1cfeb503297afbd934cf1d45e30fc93f81ef363b896ccefbf3a4a26793dc1149fae7d30f247ff2a99ea1d3fbee7fed68b05a31eb1924cf9c2083ca5f6076bc9542fd948e6fa900e2473fdbbbc09463d630246be1a6692f9f84481643edef95532b73f5df01cfd7993ccdb7be92453beb5924cf3c14432efbf5cfc7e01fffa2999e6bfb1646e5f9b022ce2cba364de3e37114cfec132c0d047f74d32f9e37b30f26b2f05431f5763c9bc7f42c1d04797e6cf99d0c71be41fc21fa52a18fe24207d9f0bfd5a1d04d3f8570fe009d573dca3642e7fbb054f697ca237c1246f3a944cf53a5b32c5a72f60f81bd796ccaf4f2bc994af2d2593be6f2453bea682e7345eed4e32d5ff14c9bcbf2f57c95cff7dd15ef8a35097ccdb93cd25537e2bfa6b3124fffd055ec2bfcc24537c548045fe518331decda7647ebd2eda6ba37fc478c01f6d44ffb8d43e1ded17e3af3960cc97f5022cf481e257a6dd149fd96bf08cc6ffe64aa6f92604c35eec4032b7efab2799e2375b30e94b2aae5f50ff58aa642e6fe148a67ce1065e927fb80d2553bd2494cc9fdf3e49a6fc45c863c07e1dc97cfcd3a3606a5f7d05633e887682497faf4bb08df8e2030cfb2bc9de17a2ff4bf49f886762f4cf10f666bd80618f3e8dff92f5177f5e914be6ed2f36e005c91b5f24533cf22598ecafeec04be467ae64f28757b041bfaf5f040f29fe68c0268d9726da63917e14a2bdd0c7f424998f5f44fdb314fd91bf83a18f8105467fdc4660e86783e789fee94a30e215e3118c78a3a0f9dc60fd45fa34072f491fc329d8a0f685a964aae7dfc0265d5f2f05537f568f60d86bb091ccfbe36248e6fad988dfbba85f8e24533e48f66f88fe892b30fa67634ba6f97508467f6d1cb0a827435ed11f35fa6388f9c9a7f8c814f157fd065e92fe5f6e6083e42f5cb0897ac417d8227dca3fc036f55fb305431fba77c1747f3b02bba4df3ad9ab29e42f669229df46fb647fe460d8d3aa0243fecd2758d4bbefc0a21eb403a33f2a8a772c263f6fff35055ba827d1f85aa2bf2f1a58f4f70a8cfb252a18febdf1c0f02701f58f2dda7f5d48a6fe9b8071fff21d2cfc83603caf51c1b87fb106433f4b1a1f87fd17eebf1b17ec903efbd43e46b0f71a0c79cb2d58c4e72d18cf2f1bb078be0dc6f3339abf5cd11f8906c6f5de1a8cf846e3f6c1cbe724df068cf6548964ae3f1b130c7f9096608c7f7603a3bde90e8ce7bb2f60b4d77e00c39f075c9f98f639e47fa34832d7e7f84c2c9eb7ba80216ffb08c6f3cc042cd64f1a30e42f9760d88fe382d19e1ced19c11e42aebf0cf17cd306435ecb04a33d610e16f20b16f1470a16ed3981457cf9443c82bdae2660e19f79bc341c8be7d70e18cfd71ec022df8ac178feaa05e379d72bf108e3df70ff369cc8fe1d8345bc9c81d1fe60452cfaeb7a03c3be74ba7e2adbd382f1fbcb3b18e3910dc1689f4df24e657fd4603cafb2c168bffb0cc6f32b1ebf0c67e2fe01e9d34cdcef1283e12faa6f30ee67f860e1ffe660a1efdc7f0ee7e2fed58c58b6e70cc6ef8d002cd6173db0a83f2dc0d0b78edbf77021e5bd078bf6aec1f87d41fabd14f2155bb0f8fd108cdfeb2330da93de83f1fc8ac6d310f2ac1a309ed772ff3734c5fdb48d64ee0fb72e58d4e75ec0f87d7202a33f0d713df4a5237bb7e4782a60b11ee681d15eed112cee1782a1cf158f4f86b6b8bf6581c5fa2af5a733823f762d30eed7d2efdd11f2efcd1d18d76bdc5e468311f2a3c007e379f5082cea75f760e8fbfa8d782cf49dfba3d150fcbebc030b7bdc83a17f099faf472371ffe64c2ceed73460e883cefb6b3416f7ab4fc463e10f2c30e46b8927e279b94b2cee6f6cc1d087ec092cec4930c6f342f24f85fc46442caef75660e8cf85fb93d18cfd9ec783f1162ceaa37cfe19cdc5fd3ceabfb990d79d80d13eeb152cd64fe9fa85f8de7c05a33df9188cf66cbec0d0c7f50d0c7df3b8ff1f2d85bcce002ce227078ceb1d0f2cfca54e3c41fb6f74bd21ef5780f17c5d058bf53beeaf46e618ebd77a2299c77f5bba9f25c6b7f4c1c2bfbd80d19eeb07f104fda1933cb678de2603e37eba01c6ef6f57b0a8ff71ff3d72c6a8b7e8d47faee88fb507c6effd188cdf3bdc1ec67d38c739e2e3c5a63393e21723269e60fde4f22c99d677b93e307577285eb7b8fd8f27ecfe9cf50e0c7d8a79ff8ca7ec7bfefb6b412cc627db81c57e823730ead9eb1158d43fb8bce399b8fe7a0716eb5d7330c663c3fb733c67eda1fa484d2cc6c39a83a11fed193ca57a651282b13e16f3f96ebc9860bdc8d880c5fe810c2cf21bae8fe3e544d4cb23c93c5ed30a30ea071b170cff92d0f81813d443d71730eaed9a07c6f53eb7b7b1c9bee7fa117c49a6f5024b30c5b3760cb6b19ec9e3adb13331e8face93ccfbaf3883f13c23013ba8a72e05d3fd0d1b8c7c734df23b53d8df86facf9da03e7e1b80f1fc82f7e76430813e6d63e229fa3be5e333194e4cd40b52b04ded31b8fe4e4653110ff2fa0a73a736f28d9a788afd67fa180cfd6a1db0588fe3fe7f32610accfb77c3f59721f2c77c493cc5fe0aaf00e37eb731788afa4e059ed1f8361f60d48f6dde1f93d914ebc7460a46bd2fe4fd37994fc7940f6cbec1e89f98cf5f93a578def5013c433d86da6f4c51bf09b9bd4dcce982f2b39cebcbc49a22fff6b83e4dec29ea15d95932adb704c433acffebf43c776ad1fd039d7886f5d315bf3f5356f09acf77d3d1d4a5fa65734f3cc3fe035d134cf7372c30ec355b824dc413dc3fb0e9906574dcdf79c4e2f74501c6fa5b74104cdfb73c3e9d4ea6d6887f7fdb10b3e791bef1f9940ddf1ceb078fe005f5b7c5e7e3e96c86f58f8d0246fd3a76c1f311f9b377b043e31bf07c693a9fa1de19df816dec07f804bb584fa3fe5accc47a86069e517b82002cd6f775b043f39bc6e3dde9923d8eeb7332035bd47f3705ec60ff824d3cc7fecf84ebefd498c19e2faf609bfa2be6f9f0d49c2d51cff5c016e5fb2b176c8f78fb8b15d8a5fa99c9e7d7a93543fdab1b831dfafde6287844f5d10e8cf1af49bfac39c63bff024f499e98ee6fb3fb937f7d023bd4fed407bb435aafb124d37e2d5d30b53f03cf87d43eeb0d8cf5dd7803c67cb7e1f63d75587f707df1e9fece7c30a2fd5d7b30f6b3469f9269fdc792cce5594dc1587fba52ffb84c1edebecd5e326f7f41faebceb19f2cda8271bfa6133ca2e727e0118d4fb2164cfa9c2892f978af4c30eca1f1c19321d7bf2bff7e3660e34ff5e53bb043cfaf5dc174bf6c0076a97fdb929805acfcfb6d0446bdbee4ed9f0d857eddd660f89b6e2298da5f05c4ac3f687e6bc0c311ad87e07a263f9f0fda77f094da537f8067245fc5f569369a1963d29f2b31eb5fdabfe20ba6e7a777e0d188ff3eb9815906c29fa78227d04f053ca3f6b65c3f6663260fd553a93d2cfca4fec91bc95cfeea041e517f5fb8fece2662fcdd023c86ff33c1d31167cd06cf21cf5c308d679d8017d41f0df72fb3e9cc1ef3ebab14ec8c69bfc05432ed47d38885fe5d4cc9b4fe37028fc8fecb37c9649f25784cf6ebbf82e7f47dbc042fe87e05f5cf4ce8936b82e7f4fb36113ca6f17a002fe8f986b8de80fe8bef4dd28fc292cce52fa68269fc4d1effb0db2f49decd0c0c7fdc92fe2ce6131a3f6d2d98fcb7bf02cf49bf370330d68fea5a30fdde38831dfabea3fe59b2fea178b0009bd41e4f03db23aeff37713decb5f00593fc2df5a7c1ee47eb6f2330eadd17156c8ea87ff7609bfc45590b267f78d5c02e714bfa6ab2f1207ff80136c87ef22918f34dfe06c67cd186c48b018dafcee3cd99c5ee47faa48217647f99609bf4c7a0f1b2160392afa3f6da6cfc68bcd69279ff949f6093daef4ec1f067f5817831a4e76de8f70ebb9ece177c806d6abfb3235ec0dfba2bc9b4df9bc6d7ed1376ae5f5c3fe703263f6f4f520a1e53fc99102f66d4be8cf7cf7cc8e4e3d7673e784c7cdd82a7d4de5a03c3fe751e9f3265c2fca09be009d94fc2e397394b87c99f186bf08cfa4fe3fd3b9fb0e7717dacc792e97c0b8f5f58f8bb20d6793d613e5f2cc7b49fc5005bd49e35b56fb1c4fcecf1fe9e2fd9f7743dfdde582ca83f8267b049ed59f3f9686eb2eb69fd782699d62fa83de67244f67de1fa3eb79643b237ef2698f4ab9e8347d4feb0008fc99e1c6a8fbd70d05f4762261e6f9f46e3e730a6f3160618fdbbe6f9c6dc5d0ea8bd0df5bf6b88f89aebdfa25f00a5f8ff4e32edd749c0636aff66019ee17939780e7de2f92a73f643e8bb031e537b7c133c237bf5dec073ba7f44f71f1a225ea3e78f447f79dfe011ddcfe3f22dc68c29feff06e379ba0e9ed2ef0b1effb1747d44f3b1fd0d5ed2f78d0236c65cdf367c7e5fb0009858bf07cfd15f7bf082f4a3492473f96f19d8257b6df8f82e66cb05f55fbe223630ff6f797cbc98b3f67079527afe82319d17e1f6b7581a03fafdc693ccc7d7a0fb194b97da7bbb111b63f2af1bae9f0bd31810eb7cbd61612d1dd2bf94da671943c8cfe7af856d8c69be6e0563be594f2573fdd7b8bd2c1c763ded0f53c01392c7bb4ae6fdd3717d5db8c684fa4bbb134cdfa767f094e28180fba3e5c080fff15fc0b309f5ef9764d24ff13dfc43cae7a3e5d0807d6cf8782d47acbdfcfeed0b783ea1fad50ebca0ef6f3ed82079a32f30f2c5644f6c627f5acce7df655fd0e1e3930460a662dc3f1cc14beaaf40133ca178a8069bf47cdf90ccc74ff3c10e8de78dfa676c8afd09b564daff5982b1ff36a6f64c58ffd2fed40b7836a1fac504bc9c50fd6101c6fc97abc426e2b3700fc67911f3018cf33ac99d643e1edd198cf3176e07463da4fa0063bf8826be47bd53e7fe773965e345fded806db217eb1d8c78f29612b3f6923ea9603cbffb0663bf4949d7b38083c663b3022f68fceb7bb043f6118682a9ff8c02ec92bfcbe9fe7dba49f5c30d18fb636c9e2f2ce7ecf7144f2a6097e4bbe5c4ecf7140fcdc0b0b734018bfde03a784af3c53504cfb15f47dc0ffb0bbb8160ecbffc002fa95e58edc1d8bf1a4dc1163d2f36c1a8575495609c5f1a4aa6f3a134febd83e2ed2f376093faafa3e72fcc01f1f50b3c217ddd5660ac37ad63f00cfe5407cf69beef5230ea35c6026c60bfe55532e55b39d8a4eb6f73b0d8df20ee6f637fe04a32cdff03b043fd757b904cf9d9168c7ae7ed2299ce7b3692697fc898d8c2f99ddb128cf3b317f49f85fa6348f75f1a06d9afb604c37ff817b04dfa1c0ec10ee9bb4ef22ecd015d7fdd8047345eb5079e907e598e60d2d7b40363ffe3762598e2d5750e16e703d692297ffc128cf35768af897afb36108cfaee5c32d56b0f9269fe2e24f3f61731d880ff5125d37ed80558ac974c25d37ec09d64de7fe64132f73fea27d8a2f15732c9b4bea008a6f655a23fb1dfb28c24d3fe470d8c7ae1ed5132e95b2099cf8fa6e82fd4e3c32fc9b4bee3125b38ef7723ff641816d99b7d03dbe48fc22bd8a1f9f95a825d9adf4af28706eb1ede5eaf060fe97aaf133ca1fc5605237e6d8ee009e5bbd5198cf58b4efc1efb6fb71730f67bae66e025c5df8a09c6fecae020998fafd248a6f3ba909fd93b6f4f71025bb0af52329ddf9849e6cf533fc036e993924ba6f96726993f2fcec00ef57ff12e99e2c34a32ed7f0cc1f017d5bb649aef7cc9bc3f22f13c97fa4fc3f859388f5a6d25f3f69443c1d86f3b06e37c4be54ae6edd354c9bc7dd791643aefdc4aa67acf2b18e7f134f13dced325a4ef26d3379affc95f9826e2cb952a99c6f7153ca57835fd0463ff691108267fb579028b78c2001b34dee14532bf7f62814df88b4832d52f2ab085f59d0118eba3752899ecff2699eae307c9b43fb405431f9454329d2fbb97ccdb938cc02ee95b2adaebd2f8b590dfc279e448974ce3f12998e67b4d30ce074713c934ff403e0be72d2dba9fc5e607defeca014fc85f5413f094e2313b954cfea0114cfe467901233fd41792a99e6a49a6f527c198afd71bc9549fb9822dea8fba944cf9502799dad782b17e6d7592c9be6782495fea42321fdff8c7f77cbcb477b043fa1deb9229ff4904e37cc697641a7f0decd27828aa647abfc45032ade7b982495f13b25fcbc2fb0c944032d9cb93606abf5949a6f314cf60bc4fc00a24f3f6b79960d29f5a914cf11dfa53d87bf82999d6df303e16ceb755a4cf369b3fc8ff7660ec3f57de04933ff0f760ac5f665bc114df2b67c1a44f57156c507f5f1cc9b49ff3198cfdc69bab60aac7ac4f601be7fd22c1781fc95132ddaf95ccdbabd492b93e794f60e883229e87fd9ef959326fbf3a964cf9e00318fe5d9d4be6fda192fed916ce83a92f92a93dbe64ca8fd11f229e4c6f92f9f3938164ca1f4f82b1fe994ae6df871f60acf79a6bc9bc7f62f49785f3b1b75230d95775914cf30bfacfc279b22df90f47c413a621995f9f7be011f99b6d2b98e2136d021e4f683d63059e4cb83e7ae2fa19dd4f3b83e734df943118f581f22099cba33c8397549f592dc026d69b8f9279fb6f9f60e453d6156c537f5a63c9644f8160aa47695330fc8dee0aa6e7c5b964f28791648a6fe692297e580aa6fa6628da8bf8c3bc974cf9642118fa38954cf58f89649acf1692e93c27e9936361ffbdd149e6df2b9e609c1f7d96ccf549ad24d37974e887d0676721998f8fba924cf1fa9364b247713df687754f92e9fc672399ea45a23d581f35af92f9f7b9f81eef13885ac1181f4b32d5dfa10f16f6a3044bc974dee9158cfd3f892399fcbb2d993fff26fa6786fd3ba23f711ef146d7bbcc7e283f7b944ce7995ec0639aafab25784af671db0a9e52feb200cfc9fe320f2cec650f5e52beae7d49a6f319e2fe4bd457766083f453bf80b11fa878154cf6b2adc1585f37c4fde0af235530f251717fc45b9e90d7c17ca848a67add5530ad1f74a160aa8f76e279c8e7c34630f97f3b174cf2379a645abf247fe35a781f90ff2818f3c1443297571d49a67cfd4930cd87da1b58e8ff5630ece74b32cd1fa564aaef7982697dc87900633f73694ae6faa0be4aa6fd789a648aa724637fd25a32ed3f79924ceb3d3330f6f325ad64de1fd98364927f2598facbd42553fd3594ccafcf311e16cecbdf22c95c5e652a99de7f267e8ff3c9e1bb641a6f4732bf3efb008bfd812f92297eb32473794b31bec87fa30a2ccea3ee0493ff30f79269bfe23718f53e6b2099ea0377609c7f34be2453fc7b914cf91c1f2f63c0e6478a0fb6e019d58be207c1538aff8fe039e503712b99e6eb5c3297a750c04b1afff22618fb1922c1347fc73bc9b47f4630f2f9eda360b2efab2e98fcd1ea158cfd83452598f47f6b48e6cf8feec1a8b7a40bc1f05f3bc9bcffb61918f596f85d32d5e3447fbaa48ff94030f6ffdc24737bf267c416f6a7ac3f2453fe580bc67e99122cceeb9c24533d6b2299f4ad108cfce30773fd500cc9341f7792a9fe6b0ba6f5da6b2399ce372ec1d85f1d9d25f3efd59b60f89f3bc9bc3fd4a364f22f6f60ec97543792797fa8a960d8c74d32f9932918f61ed49269ff832d99e44d24f3f61a23c1d43f96fc1ef1fe1c8cf763448e645a3f16cfc3fe3d632899e2955832cdafd01f0be7d5ad4a32ad9f3792b9fcc64030ced3d792b93e9723c9b41feb02c6fe67732b99f68b7c4aa6faa3180f9c17f6499ffa032dc46bf098ec5d8f24d3fe08133ca1f530ed049e527eb7f50593ffb83c48a6fd570a7846f7d36b30e6fff25b32d5ab73c1145f28ef82299ed1e660d473b64f92a9def92698fcdd5a3cdf46fd24914cfbcd74c9b43e21e445fda611f7437cb1fe124cf65edcc02edd3f7225d3fb001e05d3fc5ebd108b7879bb93ccfbc72f05937e66a9605abf538e92493f56e021d99f6249a6fa5b2b98fc9f72914cedc3785a789f52f12698e42943c964ef17c9e40fe792697e1849e6f2648e60ac470660bc9f243b4aa6fd3fa1647ebda20826f9d24c32ef0ff55e32d5d7447f60fe2f9f25933f5a4aa6f8e62c18f9502299f40ffa61e1fd4b4a2899f6279492495ed19e29e297028cf795048d64dedef05530e29137c9e47fe4efb19f740cc6fed152134ced0f55c9fcfb488c17dedf74b9934cf64dfa3c326754ffab0cc1643f510ac67a78ba04633e77466083ecb309c026cdffa921998f476582b19fa7ba0aa6f93e5e0ba6fca6188051bf4b447bb1bf4aff00237ff60f92e9fd41f792e9bc7d2599e6f717c1d8cf247e8f7a5d160ba6fecf23c1b4bf21a0f86264e13c72f82499f2fd57c1f06727c954bfcec098df755b30d9ef7a2e98ecdf78974cf54cb447d47b3d5330e2cb0fc9b4df47dc0ffbd12ea9647a9fec1e2cde07f92e99f60b1c05239e3e4ba6f9df974cf9d74932ed9ffff17b2e5f70014f90ef288261df8664b25f5332bd6f0ae36be1fc4ef92499f22d4b3297ff593c0fefb7525dc9e4df3c30de5fa53a9229feb12553bc2ec66f46f2565f92c97f37609ca7b4df25d37e825a32adff89fba39eaafb92293fea24f3ebb7627cb13ebbfd944cfbadbf2453fe37154cf287a664d257d15e715e80fa6fcce673f2af117846f94076075e503d2188c1d88f9a9b82c91f2457c954cf38832df2279ba9647adfe70a8cfaecf62098e2ef6e2699ce27ed04533cb2d5c0d8efaa3c09a6fa46f12199ec5d3c0feba51dcd9f63517f5dbd0886bd3f4be6d76f7f30d59b62c164afde5432d5271f2453bdf0118c7abd77124ced4f1ac914afae2553bd5edc0ff3b9f32498ec6d1308a6f66c55c9341fdd83313f9ba23da8ef46a564dabf664aa6fd21f27b8a37e291643abfe249a6f9ce174cfb13a2028cf78b25b9647a1fd4a364f20fdf92c97f0c25d37a512599d607a03f22bf375ac994ffa49229ff78944cf94a2618fe48fe1ef59e4632bd3f270163becf2ac994bf8beb71fe4b0d2453bd27964cf552d13fa807da2f9269ff612499e627d13ed40f424330b55f13d763bfc6ed4332c50f37c1f0f78a64daff3d964cfb43c578637daf7a138cfd39429f719e6745fa30314df21f590ec6fedd32134cfbb10c5d30f98bcb8b64da2f3c01dbd87fbc174cf5c92001e37c4d25eee760fff1b7605a0fc8b792e9fc81b8bf43f149740263ff68fe2a989eb722fb9c8878201849a6f75f9e25d3f37cc974fee15532bdaf752898ecdd0904d37a475080512faf7e30e9432e18e7f56e82914f5482c91e0bf13ce4ff7e2698c627fb924cebcfe2f7d8ff1b3e80719eaa934cfaee3992491e717ff80f6f2699f22ff13dcecfa753c9e4bf0e92293f394aa6fd139660b2cfc8904cf9df4230e68b4a32add78bf1c0feda740ec6fbebcab3648a8f2792c95fd492299e1848a67ccd164cf25b2d58f887ab64f2379d64de3fea4132bd6f4efc7e8e7827944cfb7f1e2553bd4f134cfa6c799269ffb6781eea8df14432b57f2718ebe591645a2f8b05231f15bfc77e0f652699e229f13cbc7faa9a4ba6f361427fb03f5013fa8cf5e2c495ccbfd73dc924af180fec0fd33e24737922f17c9c6f6cc91ea626f69b5e13f082fccfe64d32d547bfc0385f565ec0886fba1cecd07a663394ccfb237b05633d627b144cf6779949a6f75fd682c93f06349f4dc5fa433d154cfaace982697d721b4aa6f3c11918f585742299fce5bd64aa67958229be5ac560ac27ac12c178bfd79b64da0ff1e37b7adf95fc3dcef70592a95ebb174cfe3a10cf47fda01c08c67e1b5f32bdcfb0134cfde12a92493ed17f585fc81f25d378dc49a6f8e253308d57249e3f417c7a904cfbcd7e30c5d382b11e982592797f24df82b1de954ba67aa6907f4af69baec138af6c8d24533d692f99ea733bc1e4ff3c0b2cde37be944cfe712499f2b1b964b2675732c52bd0670bfb45d54832e58fba64da0fb301e3fd8d4a2499d67f857ee0fc72f82d99be5f81713e3e194aa6fd49e27e588fb89ec1884fae13c9d4ffa27fb0bff0229e67537fae481f66e612fb2d776083ec3debc026eaa53618f18a3b0323fe580f04d3f5c98b64da7f63825df217852e99ce77907c33113f6c4dc134df6f1f24d37c9982b17ee04f05537b9a77c9148f88dfa3deb07a92ccfb7f73168cf365778229be48bf25537d19f28bf501e55e309d4fc94f92c97fcec158cf2b12c1e41fbb4fc9b43e3d104cf3f7f6158cf87ebb170cffe448267942c1e47fba05187f1f455049a6f5614330f4ff0d8cf3b88ab83fde3770d94ba6fafc12bca0f6a557c1c80f6dc9644fb964aa7f1492a99eb1934cf3f718bc44fd632199f2ab67c914bfd782518f16e389f78346a23dd8bfa58c25d379ba4030c95b5f2453fc5c824deacfec2299f6eb6c25d37ae74630e2b94632ad170bf9b13fb87b964cf514713df61bd4aa643a9f0f7bb31cecbf10fa28f6e3f89269bd83e2adb9399f52bd33032fa6fcfef9086cd07e8d95f81eeb1b97a964b2bf0dd8a2f958ff02dbb41fbbbb825d9a3f2eb5608a3fe28560caafb6141fcd45fdb11a83b11e180f05d37e5c5f114cfe669d8051ef6f3dc1a40fab108cf3d9e55a30ce3b1a60d4d78bab649a5fe5f7645f978364dededbb360f247452899ea616730d6e7d6779269fdfb4330f9bbd4148cf8e7058cf5b8e44932bdffe25e30f6835c24d3f9d1b964b27f713decdd16ed9b937fd2f792a99ed2082679a247b0380f33964cf3ab18af05c52f57d1df381f5baf2453bcff0046fcacfe60daaf6a4aa6f9ed4b30ce7fce25d3fedd1918f65f8af1c37e6d4f954cf9cf5a32c927fa17fbede254326faf22aec77c1bd582a9fd971d58ecef3524d3fe5ea1bfd84f97d1f82ec47a83be124cf5c8ca07dba4efbab8de9df2dffba44f0b51afeb5cc1747d32154cf61eecc043ccf74f9269ffd3098cf7495c1e25d3f9c14a30ad9f281f92693de2001ee3bcf34430e94f71114cfe259883f17ef6b52599de2f36144cfaa23c4aa6fafd188cfa79d60a267de832c1345f1786649a3f7e30cd97a2bdc86ff55232c54fb9648a6fc4f367e44fbaa1649a5f669269ffb7f87e4ef6915f2453beaf4ba6f9443c1feb655a2c99e47b944cfb532493ff6bef25d3f86ec1e2bc532318ef1712fa82f3cdc55e32b5ff1b0c7b5acd25d3df9fa04ba67ac25e32bd0f44b4cfc0f95ad13f787f759c08c6fb8f34c9141f6e2453fee80b46fe22fac7c2fbafef24933f17fa8efdf9590dc6fb8d4a8a079626ceb3d513b04bfa5a527cb664f645eb65067848f359fd8369bfec063cc27ae45532d5e31f25f3f15c3d83315f5d12c9544f740553fe1e6592a93f3dc158bfb88127145ffb9560b2873a96cce5d75f25537ce90ba6fa62f283a95e2ae49bd2f82b0f82c93ef385645a6f17ed453d39984aa6fac04c32fdfd5607c1a42ff14a30cdb7b74232e5a76f60e483fe5132cdafb960c4fb5f60c4aba52218ebaf7b30d69fb6e27b9c1f0ceec1d82f962b92c95f1d24537da7148cf93d05239f534f92e9bc8bb81fcefb1547c9544fabc1383fe68af1c67e92f807d3fe43213ff6af7662fcb19fdaa37cc410f5ebfc5e30cd1f6b07ecd2f85a347e06332faa8f1cc0d0efdb17784cf6e91a82499ff44ff004eb318f92693fdebd649adf5f05937efa67c1347fe91618e7bb6e7782112faa60ac8736a1601a8fac00a31ee98c05e37d155bc1347ff8aa647a1fc009bca0f1f21682c99f9ae2fe0b6acf360763fd62bb168cfcb0148cf7790879f1be9ad4954cf53cd17fd8bfe49f24533db1164cfdbd7d07e33cd346fc1efb17b789643a4f300423bf303760bcdfec42f669b27885ee47f38169e1bc977e124cf18d3706e3fd11fa163c22fdda9482a7b43e7805c3ff058660ba9f2b9e87f364d14632d5fb4792e9ef37fe02e33cd926028bf364efe039c9b712f747fdd9ad24d3f58231fee58b601affdb9b648a6f7230dedfe12d25d3fa760a467d3817f218145fd99f9269bda1924cefdf93df23fe7e009b349f98623c2c1a5ffb2298ee97d8609c3f32e6609c3f8b2cc9646f0bc914cf3f4aa6786607c6fe958ee20f8bcdafb43f81e20b165e93fe5c3e25d37e30f13dea3ddd093cc27ede2d18f5983804e3fd1d9a25989ed7168269ff61fa089e223f9e8167d47f862699d6f39e25d3fe68152ce2b70318e7c9ec67c9f4fe12138cf70f252918f1932b9e67507caf08f9f1be9938069b648fc15e308dbf32108cf7df88e7637f627c150cff7a0163ff42f000c6f99c88ec9b4d37a867d1fc62b3f1a3fd3c743f5b8c5ff102463cb2da82117fb4df9269bde12498ec510f25d3fef01c8cfcb8b425d37eaa5232bd5f2506235ed85a9269bda4154ce31d89f6cef17ea8037841f76b447b17d84fb6012fa9fd6b211fea49978b608a4f0c156c423f3bc9b49f3602c31e6f7bc1d0bf4a32c50fe44f6c1bfb3be22918e7e93a6287d907adb70ec063eacfd51b784afdb3d1c0c85f8a5232cd97afe0398ddf652d99fcf75130e5879d09c67c961482c97eae7bb049f74b3ac9349e86649a4f2692b93cb978be8df749b88229be509660eca7f39f24d3f922713dd6afaedf8269bcd690c7c6f9d755001e52bc5b533ceb5a63d29fab2199ce63edc1139a9f82083c25f9f5068cf745dd2cf082c6238d25d3fb1d378229bf503ec178dfce6a0946fce9bd0aa6fe5ccf04e37d0af27aca77ac1bd8a2e747df9229fe2dc136f98ffc4530e9f34a934cf9f10fa6e78be739387f48fde9daa8f7273c3e310716f67b260f9269ffde1318efefb91e24537dcd06e3fd79f6156ca0deb1904cf6a080d1fe6a2199e67b5f303d4fbb801dd8fb0a8cf8f9a611db78ff5dac8211df745f60d413133e7e2c389be17ccc183c27ff97459279ffac4b30de27947e0826f94c4532bd7f5d032fa9fd6d2a784af58e21d8a0f9e1aa48a6f53f5b30d58ffd6730de5f94ad89ed01d9ef86eb2b0b2eb0feac6fc04b92af7525d3fbcd8f6093fccde64532d9cb4d30c57fe1128cfd33eb77c1a41feb028cf7355a1f82e9f9ee1cec62ffea9b60f227892918e785f0bd8dfdafe9b3601a4f270463fda81980f17ea59adbbf3966fd41ef472dc14bf2075b1b6c60fdec4132d50f0bc9944f1cc126c693dad7bf5e9ff2075c6f63bd6b45fd33b1e6549fb8adc0580fdc7682c97fdd5ab035a5f74309c67961e50bec523c1de2f736eaf7f11c3ca4feaba8bfa6d664467fffdc080c7f53b492a97e6f08a6f686776013fab4964cf69982717ed224ff30b5b15fe81608c6fbd3ce60c48b2d8dd78cdd8ff2eb5430c5839b5730f2dff60086be74a4af33d6ff148fdd8391ff6a74bf390b30693de808b6917f64c436ce8fdf1230f6bfb7345e0b6b3a27fbe9c0f319bdaf8bfcc782a5f7e43f0f60cc4705f99f256b3fedf71c826d92ef3625b627349f68dcdf9b2c9f9b927f237d3458ffd1fc5b8327f007241f530f1aaf6b00467cad51ffb2f8674efd41fed5b6711ed0e4fac192cf39b57733022fe97ecf977feda32abf7d8c9f3e26ffa7827fa74fcf0afb9da5daaac3fe58ff6a0be8f3df21cb2f72b9ecf3bb5c0afe9b90afff77f7df5116d62247f5d81ffad87ddba87590cbfd87bfb3f1f9779605f20899fa6be8cfffb79fff167b71e9f393743ffadc1663f4e33aa96fbdedf8eccf3f18b9ffff65e16dfbc90e6009240d1fa9bf2b3bc9439ee0df4d1661eb3f64f9313a3f24f3e4e717cbfa7791e5379fecfefa91d758f05a8e94457a8a7f2b590235542335561335553335570b364ea55aa917b5669f86e951ab76ec7365b2de544dd5d99f15ff9dc67eb1fe379365a3aed827652391a85bf6b963d2ecd43dfbec982c07464726dd91fdfb4e3da9f74cce7bf5817d0c76e53ff4daff5b6479e43dfdc446e699fddb597d515fb94ebda9efea87faa906ec9a9449f8c524f85607ea501da96375a24ed5993a67d2fc1bc9c25a7a5637ec9f91ba607f02d8fd92c9f2cafe6929aafaa4284cc7be15431d2ba662b18fad380af31a8aa7f8ff3d92fcf7cc954aa0844aa4c44aa2a44aa6e44ccf5ca63d2dfbf4b6622a059b45064aa954ca45a9954669954eb92a3745537465a5acffe8b5ff37cab251b6ca9db253cf8aa2ec95036bf1513929f7ca83f2a83c29cfca5979515e9537e55df9503e952ff6dfbf9581325446ca589928d37f23596c65a6cc9505d3b393b26413cd83f261288661b044c0b00dc7700dcff08dc0088dc8888dc4488dccc88dc2288dcab8a87746fddf23c99f9345b58ca6ff23a390df6677a3353ae36adc0ccdd08d95b13636c6d6b83376c69efd391847e364dcb3cf897d8e8c1fd8e7d178329e8db3f162bc1a6fc6bbf1c1b4b0cf02685e757f9b797f9aadfe999ff8af6561527c1a5feccfb7313086c6c818315fd4186363624c8d194b9916c6b2370ad3304dd3326de3683aa68b8fc73ebe19b04f684666c465eaa53a9a31936a6726666a66666e16666956e6c5accdc66ccdcebc9a375333757365aecdcd2f33b1f2eb1cfcd764311a736bde3169becd9db9e7b21ccc8379344fe6bdf9603e9a4fe6b379365fcc57f3cd7c373fcc4ff38b7dbecd8139c467648ed967c23e63736aceccb9b960992a3334e3de322cd3b22cdb722cd7f22cdf0aacd08aacd84aacd4caacdc2aac12b9dc2f91c5ffaa2c56655dac4b3f2e566d0cad5a3d5b8dd55a9d75b56e9666e9d6ca5a5b1bd6d3f7ccd96ead3bd6522689b5b3f61677bfd6019f2393666a9dac7beb817d1ead27ebd93ab351da592fd6abf566bd5b1fd6274b98bf5884b0601e3d61b3e9c0faeea3cf1fd1d1bfa2634cb31a8bfe82f001fff74a89aca135b2c6d6c49a5a336b6e2d7acdb196cc74fa4a9ed18f85b5b34d48f2439643bf4c614e6ddb766cd77ab03ddbb7033bb42326cfc178b4633bb1533bb37336abda766197ea935dd997de92fecce74fc932307756cdc6646055aa67d77663b776675fed9badd9ba71303fec95bdb6376c249ef9676fed9924625414662bcc5e602bf766681bf6d6beb377f6de3eb0cfde3eda27fb9e8debde7eb01fed27fbd93eb319d7b35fec57656fbfb1d1b07efffcafc9f27cb16a66274cb78cc6f8b4df992c1ff6a7fd657fdb037bc8faf3c47a7864bbe6dc1edb137b6a2db924bb7e64fab161ff9cb1f6ce85fd9b91bdb0972c485698ddcc1dc3311d662c8eed384cd2bde33a9ee33b8113b218f5dd89545df17fcdecfe155954d7183ab113333bb1edda499cd4c9ec2f27778a5e0ea7640ff0ed3d6b55653d3b17361acf4cc706cc6216dc6ed8ff3b356b6be3b44ca6b9d3998173756e8e66f7938feeac9cb5b3b1b7ecf78eb365d21c8d9d73e7ec9cbd73708ecec9b9771e7ec9107ecb7a7eb6a03f234b2f09f3c683fe7ecea3f3e43c3b67e7c58cadb33db1ced6b33d6656cc3ece2b6b5dc5dab5c0a7f765ec63cfe9e374f8bc39efbd24f6d20e9d0f66fd47e7d3f9ea7fe954ce379366dffff5f6cec8e9ff5acca933b3eb9fe4f8576599ab9db3b05f9c25fba1e21a6ce2b08c23f34accd3bab6ebb8aebd702a73e17ab66b1f5d9ff9a8931b981fccdacfaca5f76ec86c2ae673e6d18ddcd84d98bde0e3746e6a7acc73b02b594fbcd93336be67377373b7704bb7722f6e6d176e63356e6b358ae67656f3afe8987a70afaaeddeecd6d55cdd5db96b3626cfeec6dd9a43f7ceddb97b3622dbde86dd837bb4576e6031ed331df7e4debb0feea3fbe43e1b817b765fdc472195fbeabeb9efec5707f7c3f9703fdd2ff7db1db84377c474f1c0fe7dec4edca93b73e7eec25daabd2f6091b8a7aa81f70fbdda9f91c533d8f46d79b6e778ae937b9e71b2179eef055ec8e4601fdbf0222ff612e6030eb6d1eb8c977a99977b85577a9577f16aaff15aaff3aedecdd33cdd5b796b36e7c7c6c9db785befce7a70471ebb0b1b5d9dfd3ff36fde8e59cec1db7b07efe89dbc7bb5f01e58467af31ebcc71f5af5bb1ff853b23c79cfded97bf15ebd37a730637362dbde3bd32f2e099368cbe6f229b39ae7de76bd0fefd3fbf2bebd8137f446ded89b78536fe6cdbd85b76441d7a3aff8866ffa966ffb8e71f45ddfb31e7c9ff9e8ad6df8811ff663e547ee8069e4831ffb899ffa198bd6be51bffd523c9189fe75599e2f7eee177ee957fec5af0d6603e6d46f7a49fc967d3aff6acead27ffd6cf77bee6ebfeca5ffb1b7febdff93b7fef1ffca37f62f966a2bef8f78aea3ff88ffe93ffec9ffd17ffd57ff3df8da3bdf03ffc4fff8bf9f485bd30c74ee57ffb037fe88f8cbd3ff627fed49ff9737fa1382c27fd6679f70f597ea97dfc99d8d25f066aa004060b112da65f6aff97c0f7fae5b7811d38fe3570cd0fe31478811f04411844411c24411a64411e14411954c14509839a7d1afb3d68838ee59af3e06a3f07b7400bf460c5fc48ef0d9560ddeb99ad30d906f6c27a0e36ecaedbe02ed8057ba50e0e4a191c8353708f0af54f35ab3f2d8b1d3c048fc153f01c9ccdd829ad73f012bcf6da15bc05ef81137c049fccf38c83afe03b1804c360148c8309fb330d66c19c49b47016c1325443253442d3188416fbc39c71e8865ee88741188651c86cc73a8709f3cb4698f29881c50f61d6fbfc300f8bb00cabf012d661e32fd421d3b41fb2387f94e5e77af6cf63d25f1db661175ec39b19875aa8b3bbafac636f27e13a5c33795e8c7b2f0d37e136bc0b77e13e3c84c7f014de870fe163f8143e8767f52d7c095fc337ab08dfc38ff033fc62d2982c22f6d97ff90e07e1301c8563e3184ed82cb40dd6e1943d63e6ee99fd7c9b53f6dfe7e1225c466aa428456444e68fcacdaf5a46b288ff862c28f1d4c8525fd5d7c88e1c7f19b9e673e41987c8376751c02375a61351c8e2f7cf88e524511c25511a65c62dca8347ab65f369cafe3c4645f01895aa1255d125aaa3266a5910d345d7e8166966678ccc75d4467ab48ad6d126da4677c629da452c82f0039ef778d68ecdb40bf6bc7d74888ed129ba77d2e8217aecefcdabed866af4d1eeaff6f2932c068fb043b77516ca2e7a8a9ea373f4629ea357f6a437e6750d16a79ca37773c2e6e8aad7eae823fa8cbea2ef68a0ce153f1a2aea8f2a2c7f9e1b8da27134096d2b8ca6d1cc8aa379b48896b11a2b56111b319bac629b85166eccbc3d9f73962c7f93b29843e33ef6e3200ea3fb388ae3f081f554cadbcafc5a1f25fe2c0b7ff68f7131d4f8f9e22cd4f73889d3388bf3b888cbb86277bcb0f87111d7d6dedd5b4f7c2639b959dcc46ddcc557ff515dfdb4f662cb3bbaca5875e25bacc5ba3f8b57f13adec4dbf82edec57ba5890fea323ec6a7f83e7e881fe327e3143fb3d866c9bc7380b86e689de373fc120ce2d76011bfc5effd88736b3055a38fdeff992c0ad34726cb6b9cb8adba8a3f4c23fe649db7641ec6b09ee3da665ed3fc0c33f6dcaff83b1ec4c378a456eaca7e51ee94713c862c3c1eecff9dfdb7493c55f57816cfe345bc4c54e3c17e4894c448ccc44aecc449dcc44bfc24484263efde9b3e8bd8d887e7a42c3b65f3d6d17c4da2244e92244db2a84872b1baf07765b1c886f8155b36bbb2fe65914fa2b8499194e69b71f26fd69e8dc9d9b998dff6c13ad953e39054c925a99326d6d5f7beea9db4ccca52f40d55c1d97d95bb385332bb4abae49adc12cd38252ceb4956c93ad924dbe42eba26bb641f1c9243724cd82c657a8ec272014364d94c9b4b2f4dee9387e4d158264f09b34ab146d2e722ff4c96e499f5e198e50e2bf6efe7e4257935dfad3e3f3f276f56ff8afa7df26ece8dfb709c7c249fc957f29d0c143d192a8b64c4abe3bdc7b4fbac8dc9c264b2df93713231de9269324be6c63159d8c76469c6a99a2aa9919aa995daa9e3dfa76eeaa5bef1603a2cbfe1b2f45910cb54b769601cd3308dd2384dd294cbc2d76dfa7cc4180aaff6932c96b0fe3453466e6b97cc8e9d344f8bb4343fd22a4c98f75a5afdfe8687f4621becee75daa46ddaa5d7d451f4a04b6fa996ea91c9fd3f978549c3644957e93adda4dbf42eddb15fedd3837d4c8fe9c9d8a7f7e943fa18fae953642b7a344c9fd373fa92bed2c8902c2ca7db4681719fbea5efe947fa997ef5feb197a56f7f9f5bfd2acb8f91e17a78607dbb5412ff2139a7dfce9069eb673ae86da5f7c54ee5fa696f8f553a4ac7e9249da6b3a4b50b65c3f42c5177fe23ef31361a7d0edad724d379ba4897999a29c63163f971b4efb3e3ccecb3e2649559999d39ea57ea0475e6665ee66781e9fa81a3a06ab0eb675096e1c5599845599c25ce23b3172e8b6af5b9d52fb2889a9add3f99d14efd4a064ccf952c553eb2cc74cc2fe61b077dcecbf477613d982316e37efaeb2ccf8aaccc2a61e7e45b98b34db24b56678d5dc763f53b6bb32ebb662c62f343d6df6ff6c2fd66de9c652c99661ce3a74ccf56d93adb306bd3b36d76e74efa5999c53363a603cf76bfcd8445369691edb23d93e5901db313d31d85db7491ddff268bf28b2ca67a973d3032b24743c99eb82ccc37f67d642ebcc4661146f69c9db397ec357bcbde852c1855577d4bdaec23fb8c9e93419a655fd97736c8d8e866a36cec8eb24936355da7cc66d9bcf7ebacbf17d93257734509552b377233b7723b77d8377d3d6dc29edad74398b7cedddccbfdec900779a828ff4496be024a7dabf8bd36f63edacc23c330ee982cbd97efed70c024619219f7799c27fe364ff32c3c30597eac4172bf95e779919779a556f925aff3266f8d63dee5d75eb7dc613f1ef9cdfdeeb3e25cb316f153aee7ab7cad9eed32dfe4dbfcced67396c1b09879c8729a4bafd9feb7719f29f93e3fe4c73cc88e4c9b1392c52afe812cbd0f559209d332db2ed5263f1926f32baed05ca6678eed5877ecbfbce6f7fe5dfe104cf347a3fd690d92d97afe943f671725cecff94bfe9abfe5ef7dd4937ff49909af719cddaf6cca73628dcd8871fe997fe5dff9404d9cc833f3613ecac7f1579ff1997dbc4c51b4cfee30c9a7f92cc9988e1d59a699f47e377c0bdffe200bb75792259fab7b854d65ea77be302c63cfd2fb1dd5bc481673943bf9b2500b8545f5b3e8814547b6dcabc0575793b1fa919f0ba33059b7d9ac557d2cbfe8f312ebaeb7e4c2e96b1785cb62ad53e1157e111461112923d52ee22229d22233f67d5ec365611ac6aecdd98cb92f8aa22caa3c2459faf6b398f5f597f9e5375958c6b34f6fcc62be8b0b7be4ce74a97227646177ae8ba6688b2e288a6b714bf25f7684303d53fc645268855eac8ab5710835e7b597a5d8b06cabaf6a7ef4d5be60cd243916dbe2aed815fbe2a0d8c5317b284ec57df1503c16cc3efa1a279764614e0b268f7128cec54bf15abcfd248b1aaa7f57164fcab22bde59fe742a3ed894b5efa33c5420875c9645f1597c15dfc5a01806398ba2c90bffd8555114a3625c4c8a692f4931ebd72c989ea8c5bc8f467b5b6677e03163b12cd5ecbb544287c540d7d250c2d22cadd22e9dd2354ebc22c2ae36c7f6a1f498cdc6a55f06e1ae64290dd731f7efc822d654c40cf3adb665c472b053191b2ecbef852cfb5e16f3cb3a9749999659996749745f163f564a7824669465599597b22e9b5e92b2cd34661b565f3b6371dc985bb4e10ffaaca7ecca6b79b3be4acd0a4a9d8d67c4a45995eb72536e992cbabdeda326368e5bebbecf64cabb7257ee7b591425cd7a6d28b552fb45961fd13ef773ea8dcd103b75c56439183e1bebc81c5b7d3d2cb0674e63cfcb63792aefcb87f2b17c6271ce86e527a398c594ca9d5d97cfe5b97c295fcbb7f29d79d12eef32adafee9bb3bebec13f337b5f7eb079bc2c3fcbaff2bb1c985d392c47e5b89c94d3c42d67e5bc5c944be3c45c7d156a7c4c0f665f1939564a655466d06746a7e0d4ef2ab2aadf62fedefb3059d8b7663f36c8d834bbaa2c26cbbd19b2deec97483a264b6b06c6a1b22bc79bc5e3a00996e5c4dc562e538ba86236cfa29545e5574115329fca66bb3ea736471513d73a313946fd9a4515dbdb2aa9d22aabf2aaa84a2bacaaea52d55553b5556745c1b1ba062b362e5ba7a355b57ebda3aff254b74aabf42467b21c83a36ad9f51f641151a5cf6571d488e9e246bd315559556b264bc4662c268b193269f64c96a37bf65a6fae2e2387e9eb5bb5a9b6d55db5abf6cab53a54c7ea54f575e17be6c717d681c5d5233e26a3fe2ebd3d570f4c96c7eaa97af646d5b97ab1aaead5dc556fd57bf5517d565ff128afabef5e966ac07ac2e5f5cf678bddb11a56a36a9ce4ce23c6c5339adf627e4bca6270efba60d1ee539ac5a36a524db98e912c51af654c965335f33a8f656bca3c34ccae9a87af9eaac6ac3f17d5f2a26637f7f5a25cb81fb615f38349d17f26b406c3ee7570377d7e75312fd6c5be38e1cbc5bd78179f8d897f092e6134b8449798c9d2b91fccbadefb159cde673059946a7449823e47f6d9c7fea32ca859283c96225912f549bdbfa4ec9e593fc6fdfa9c6df523d4af3d18a774e75d2fb9925e8ad0c8eefbbcfd525eaacbe5525f9a4b6b9c2edde56a6fcdd1e5165f98bd93244764f10773e445d68e5da55df4cbeab2b6c2cbe6b2bddc5d7655a7b697fde57039ba2fbd2c173633b1d8cde27fd5d684fde2fef27079e4b2a0adfd5add3f95256071f24d29c2faf27479eeb585d61bfb95a07ecd81e9d8a377f35545b3df7975c88ca6feec72bebc5c5ecdc4383afae58daf136d8235f75dbd7e8db92c7c3d96f5f196c5dd5333bebc5f3e2e9f97afcb777cbcf06a13d388e16578195dc66c869ddb6c66cd466c967db5ee7adbbf4c2ed3cb8ccba2f0bcc2fe5d16392f4096545373b5cdcf97f9657159f6eb90bdcdb2d8b85fd50accc08d8c83a7298f8a1fb4c620fca8d55a49b6b5519bc98ac9f9565bb56def1cc38bfaf99ecd8d336ef74cc7b8341e9b3146e6dcdef82cdeac9ddaadbddaaf83484b46e9ad0eeba88eeb84e5ca9fcce3796c6e9db008f4c9dd32590e755a67756e325990875bfd0aeaeff9cbcfb2287eaa2b6e5dd4a5f25557c68149c0bc0fb3dfa8978569716cc69eee2b6aa9cc422bfc8caa9a4590ec7f0d6b5beb7eb84347cdaf2c63af9cd73063f67faa22f6ebdeaff7d27875c746f9cbfc626d5cd6d7fa566bb55eafea35d36ca77c8af27a536fcdd8b9b23cdceb6318d6239bdec2eabb7a57efcb3d932515759e3fe695d8112074cc55efd44370523ae5b13e184cb3597e7f6fdbbc12cfda581f599b4ff57dfde0b6a1556d13b77eac9fea67e3549feb17a65b8bfab59f159cd728b02d1691ceeb37bfb1b7fe376fd994b220ca89acbdfb5abfd71ff56738a8bfeaef7a500fcba01e992ed3c27db17077aec3f29881cb324b63578feb493de5b2507ef20f7264f6a797a59ffb13f6ff0d9bfda7f5ac9ed70b9657b2fc8bc52e5b7b592f9d779bcdc98dda288de13f5a35f3ca1f8dd958c64363db47f6d9374e3f438693be6ed3fbb2c665ff34a2d0def09a9af1cb1ae0d074eb5be3357e1334a1f3d4444ddc244dcafae291e54977eeaec9ac2dfb158b429bbc299ab2a9b8bdd09ca8f42b763fcb42732397c5e4b364aa8cd2cc99c77a7369eaa6316377c3eefb7039352d0b8359d6e186c6aee99a6b738badd0b48a466b74fbc18c9b557aecc7c57c6fd64cdfc76c2c3efa5cbdd9345bebdcdcb9dbbe8283d53fac9c9b5ebfb3a4d935fbe6604d9a63736aee9b0726c363f3d43c3799bbeb6be64c2fe3e6dcbc34afcd9b948559c51f65a1d95ecaa2f1959bb5faa138cd7bf3c1a22ac7ff609e89d973bfa6686f9b4fe3e0dbcd57f31dbae167ad3483669828d60b7bde283359ae356bc66c961b46611f41369366dacc9ab971b296eeb6e1e3815566167d9b9ed3354b63efad5bb5555aa3355bcbe8ebd581396efb15c45d9f2b87ba71689dd66dbdd6ef63181e7719aadfaf09ff365752a5cfa4bdc2fdfa937a8bc76de03dc65d1b1afd4afdb658703fbbed6dba8d8c531bb7499b865ef5de666d9e9fdaa22ddbcad8370fed85595585fce4beaddba66ddbaebd5e5876dfded8bcf3ddd70ee4eabfefed5aaddf1de36baddeaeda755bb35f6dda6df0dede056f5ec89eb7734a63d7eedb437b6c4f52163f38fd41161bd97abff39945bc2c951e313ddbe5b9a2b7f7ed43fbc8b4f7686ffa9d05b5d53ef55adf326fdf9edb97f6d518861f4e5c44ed5bb269df59ccb3cf3b7bc9645ef5f949fbd17eb65fed773b6887eda865b3068b697aed123b19f67e906bf6b69db0acf8d44edb593b6751cb397875ed76d12e3bb59fdbeace38754a67746667c571922779af472c8e39fe4116e75759d84c99a94967770e93e6dab99d67192cd770d89cb063be56ef7c7b5b9f7d3753baa00bbba8da767197746997b1b0b8e8ca7e6dc8db75157bfea5abbbc6df756dd775d7eed6699ddeadfaac8e723b5ec95b326b687b8fe2fb4e65dce75db7ee36eeaedb76776c02d875fbe6397aef0eddb13b75f7dd43f7f8ab2cbfc563b40fdae2fbb87b59fabdb76ef7d43de7cfddb97be95e6bc738b9ae7de8ff1a4166c38eb3eddeba77964f9cba8feeb3fbeabe9d85fad80dba6137eac6d19d195b0b33f6b56ed24dbb5937ef16ddf2aa5e95ab71358d9dfbca7763f9bd1ce6d00ffa99fd6ad97bc7bada4cbe73b7bb322bb18ee1cadd5d5deffdea3109dfaffe35b886d7280fa302b66ffe1d1d13eb0b72bf196a7fdcef5de36b52b2d65d53ebe19ab119ef6c9dddcf7eb5f79ab3ff5a5ccb6bc5e29897ebe55a5bfeb5b9b6d7ee7acd27d7db55bb321d5533b30bdf8da69c5c57d7f57573dde6937efe655aa8f4750ce623a2be06c6f7638dd87c74ecfd38d515ade7de5aaa8171bcde5d77d7bdda3847b5edab2c5993353c07367f9c07f8afd7f89ca7ebe17a8cd953afa7eb3d3dddbf998b6641d1eef5e1fa787dba3e5fcfd797eb6bad3069deaeefd78febe7f5ebfa5d75d74139bc0eafa3eb987d26d7e975769d7b6bd60b8bcccccceb92dba2f5f327f2dd7d73c7fc1c27ebcc52c3a79b7263f955348c4c36f3b9aa6dbf33591cbebef31764b99937eb66df1cd6379ecb66877edf8bad140b2fb9b139d0b8f7b51b0b346f8152ddc25b748bd5db2db9a5b7ec96df8a68d025e15755df4a7377ab6e97f0e3c626c65b5bac6e9db1ef772df0fd16d6af1f5eafb0d86cc4246aee7236b3dcaeb7db4d4bc6d133cb2d44fefb87ddf3ffb52ce6e34dbfad6eeb86c5860d1b0d663515f3f8ecff6d8fc5eecc9fe593dbe6b6bdddd5a5fa62d7cae2b65386b7fdeda0d4ea58dd869f55773bde4eb7fbcbddede1f6787bba3ddfce51623f180fb71733643e7af24759983454afa4fbbfdede54f7f67efb48068a226ac97f7d7d3f2a6e9fb7afdbf76dc02b565f2cb35c58776c86d89a73162f6d6e43e3741bddc6b7c96d9abab759eadce6f1241ef77bf56f8bc80a5fa2eab6d4d4a8d394a85202f5ac199aa9599aadb1b16e5acdedade4e78fbbef3396c82759cc58f3345f0bb4508bf242d1d20ce3f287d3597fc25e1eb5584bb454cbfad981dd7b617e7a119385f624cdedad96f733a75668a5566917ad564325615ed0b65fe289b25322add15aadd3aedacdf84c1dd573979aa6e9da4a5b6b1b7ba16da99af0ebc8b03f2a8bb1ad7667dada9db653bba0b9bddbef2c7f37642dcfa1f8f22fc8926a7beda01db59376af3db008efce9cfa1f2c3bda71eb6451633568f92e43ed517bd29eb5b3f6a2bd46b935d2de8c85f61e4fb40f36269f2c216e94246ccb2767e999da97f6ad0d3436a6edeeefd98bf5dcee2c35f2b59136d6260a8bd955d72eed525db37111f562ef2fcbf2a84db59936d716da52578d7da8318f79673d9993b86e6fecb363518056b6bac26c79a71bbad92a9dab5bc64db77527327457c97596ee844e7fe622ce597e32d4033dd4233dd6133dedc7e0d74f98f5b2447e2f95bbd7333dcfebb2d20bf6fbfe0c84266b797c86ff2b3a16157aa957fa45aff5466ff5aedf11c3f2de39af8f322fa45ffb798faffbfaa6ebbe66817ed3355dd757fa5adfe85bfdcef850bff59dbe77c6d5413fe847fda4dfeb0ffaa3fe14bd07aece722db28dde4ef86e0bf3e78fe9e8e764adbfe8af4aa36ead86cdca34abf4f6eff075c43fbd8724c9f537fdbdb8ea1ffaa7fea57febcc07588affed6ed3ca56a3f7beea637afd3a561f4733895c33d687fa888dd0589fe8537da6cff585be5ca92b6565accc95e5eddd3c7ded778d38d5ca5e39b6e1eec90f0b0ff68b2cae7170dc95bbf2567e3c535f56415f310a4e2cdeea57df6a5a7bfb73b2048fab701505b355bc4a56e92a5be5ed78555807166b6efa5ccb3afe248bc9b28265dee5ceed8565b4b755b9aa5697555dcd568d3e5ab5b1c7f7c23129dcddaaeb76abab395e752c5bbbe3f66e626ef955166f7533e3b261f9d270a5b1f178e335567efeafaf2afd9571311f57fa6ab55a6bb362b8daacb6abbbcbc76ad75767d2a05f79b0b67d0ecf64796372ec983c0adfc570cff7819ef85efea3d8cf6bdcbbdf76e87ff8cd6abf3aac8ead1d7cb84edffa7e9e679aa6b63b6627bfcae2af4eab7b9643ad570fcdfbea919fce727f3a052c4f69fca971795a3dafceab176db67ad5ebd5dbea7df5b1fa8cbff26ef595f615a31fbbddf98749f7c177bc0f9d57f6795b7daf06d17e35147b2cfbbdbccd9339ee7739b58bd5a8d72e173b9358e3acdf65b1ceab717d67ec5693d574355bcd51c3b7708ec1fdf3314c92af16abe55a5d2b6b439badcdb5b5b6d7ceda5d7bc69e45cffb1f7bdefb489eaffb32097a7b62b3105fc7e3fba9f9beea7e36627e6318266b7f1dacc3c0091cbecb91452c6431bd17f85d967e7473dbd8d7efeb681dab77e20c2d9745f9b16be9cff8b1f03198af933c5d5bc1789daeb375be2ed6e5ba5a5fd6b5b5b437741601fbf7fbd5b30fbe57a25f6bb15a16fc34ceba757416dfb3e83e9ce9d77ecd807df6ebceefd6cc62bc50c8d2eeb411f366bfd90bd7d26374b7beadb53573e4b2fee5fed5793f628aba5eaf37ebedfa6ebd5befd787f5717d5adfaf1fd68feba790c5fdd69eef5ac1b8b04fbf9ef76a7e704b3e584bbedb9f5950bffba8f7e2eb7e97fcb1df83b63eaf5f02d736cc28effa73246c8e1feb193f73d2e7373edfafe4b23c69bb7e5dbf35cafa7dfdc1e617c8f2f7f78ffdf38ff3283f69566595d196e7f5e7fa6bfdbd1eac87eb11d335bea38c568b980e4db0afbf8fa6c6acc7cffc04c6b2dfadd7cbe90f7a7bea77569a43967505d5e0a69a713e6171d79d36d1f3f5b8f776eb49bfa3b61f93cb389f38de7aba9eade7eabdd8d32b674be7afc8f2d3d9621ecf798f6a11dcaf179774bdcc5f36ea46d9181bb37faead164ebf368979c230a77db5439cb4602336661ab91436d3dc39174ba1fd0a2caa7f6511e4ae0f0b36569fdfacc6cce59f8ce3c6c9271b77e36dfc4d607da94f56f35b9bfed2b8fc7eb6381a2a9ee2da55972acd26dc449b78936cd24db6c9f9aa0bcb6eac27ffdbf68bbc782effdf76ae6549552488eee733a6f615fdba7dbb6356a899203e5a6db51f3b4444f0c14b1489987f9faa8202a4bd37b457331113b9d010943a661645669d93b6d9e37b5a6207f5ce54d90a7b630ee6244ed8f3c2d4532060d9afca32ad349d280e4d481246103617866ae8b10a11c3b2b36c86248e1fe983506f36cb7bd7f59cde1344592e9dd23decc91c0e90c0115250a0014d680104cf80a691efb672cf7c667bc1191af13a6a6c8d2ed758790ea8a041fba8a546ca6681e23a2c67047dffd9b4a1130fb9e20cbad0833e2ce34747a706bc2c0e85fef98baee722bfd4f4404187dc51957668dcd0c2d0b660004318c12b8c61025378f3347fb13bb0acbe5df0f8ab3a31cdd0e01d3ee0136ee036e9c2ddb1ed7437f7e95459c13d7169c0bcfd003fe0117eb2bb700a4ff08c94def1b9eef5e9337dca1557dfc052a8ea8aefae6ed98c216b9d45ef4ffa485524aebeeaa181333471eeaa5edbb7f71bff47100423b4421517519a70a1686ff7106f632dbe471b97ebe0a027b3a4874ec8a276354cdffc603e255ca59dee228325a4b8c2354b719e8d29bbca113774bcb961e319c8f15c1f6327bd3884873ca043ee1bdcda7dce35430f7d0c30740718e10e636fed2f7ddd7f0cc2861b3aa1161991827b3cecfa8d66ec6112bce2115354f693204dfadb96d559cd6ccab25f967cd21655d61b3627a2d61336b0892d72a03dc20e53978ef868d8fa229f5faee75a7fe935c07eb745b764495b08ec7d0311d5f514356ca3bffd70224ff774bfb3f1822818bb5ad8461d3bd8c5de6e837df6fe0507fb088787258ef015c7d68bd0fa1a7cc79ef3f0a8623d21573237714a0f6bb636061dba66de58d0211dac1b76bfe293ef6039b59ad281736c393795d713791dceebf80ee712f96e3009ddd07544a5d179e13613e6e4967d435ca3ec245389a0cad56bfd58aad7bf7aee9fc122ff178e852391e3f3ba9c7d9399eff23a234758aeb7d96b869def6fe7fb0f468e60216ac18678a2378b9890bd31a42ee18c42f1d27b720dcf09969c1fb0909d7904e76ec356026184f0baafc89d66956e3da5fecbf6f6f369d67545d6b5c5d924df135a7ec542cb5e26e49a7cbfc201afa191da8093df3604f79408ae9ab0ad576031ca9ca3caca1635c83935653d22cfb448ce3bcf6adc752c32e62a9eb9443352aa19aaaae7e288acea1ab4729f2cb50e052bf5d4871cf952b02732ae47d9db635ea9689b453c57bc2062244752ad5f5e84c592fcc3e1ee4c949995795bc152fdbea830d827ffc84c20e9088f91d2fb395e4b665b520152c3422492ebf27dce3a1163b10a2cc60916c11710bad85b6ed69a7320cdc09db863ceee0a1533e20c1ccef6c814cd995eb334f9fc9ecf4b7ebda988b5c23b67b1108e04dff03d63da7fc32f8b9a5f4caeec2fc7c9c7e6f5bc5e154b795ce2e596e3679fca7dd222b624e3bc58134fe3a1e0bbcd199677fcb81c4b3d6a7ea7d6aeb0fb7e71ceb9a3f5738b7cbeda2ba7de3ba79caf57e52fff15fb1fcbbfd3fefcfbaf3ffe0193cc32fd</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/sdk/kis_global.h b/chalk/sdk/kis_global.h
index 249d312e..19acb216 100644
--- a/chalk/sdk/kis_global.h
+++ b/chalk/sdk/kis_global.h
@@ -57,7 +57,7 @@ enum enumResourceTypes {
 /*
  * Most wacom pads have 512 levels of pressure; TQt only supports 256, and even
  * this is downscaled to 127 levels because the line would be too jittery, and
- * the amount of tqmasks take too much memory otherwise.
+ * the amount of masks take too much memory otherwise.
  */
 const TQ_INT32 PRESSURE_LEVELS= 127;
 const double PRESSURE_MIN = 0.0;
diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cc
index 01ca372e..8ad09df3 100644
--- a/chalk/ui/kis_canvas.cc
+++ b/chalk/ui/kis_canvas.cc
@@ -304,23 +304,23 @@ void KisCanvasWidget::initX11Support()
 
     Display *x11Display = TQApplication::desktop()->x11Display();
 
-    // Look at the modifier mapping and get the correct tqmasks for alt/meta
+    // Look at the modifier mapping and get the correct masks for alt/meta
     XModifierKeymap *map = XGetModifierMapping(x11Display);
 
     if (map) {
         int mapIndex = 0;
 
-        for (int tqmaskIndex = 0; tqmaskIndex < 8; tqmaskIndex++) {
+        for (int maskIndex = 0; maskIndex < 8; maskIndex++) {
             for (int i = 0; i < map->max_keypermod; i++) {
                 if (map->modifiermap[mapIndex]) {
 
                     KeySym sym = XKeycodeToKeysym(x11Display, map->modifiermap[mapIndex], 0);
 
                     if (X11AltMask == 0 && (sym == XK_Alt_L || sym == XK_Alt_R)) {
-                        X11AltMask = 1 << tqmaskIndex;
+                        X11AltMask = 1 << maskIndex;
                     }
                     if (X11MetaMask == 0 && (sym == XK_Meta_L || sym == XK_Meta_R)) {
-                        X11MetaMask = 1 << tqmaskIndex;
+                        X11MetaMask = 1 << maskIndex;
                     }
                 }
 
diff --git a/chalk/ui/kis_canvas.h b/chalk/ui/kis_canvas.h
index ea36f8a9..be698ae2 100644
--- a/chalk/ui/kis_canvas.h
+++ b/chalk/ui/kis_canvas.h
@@ -140,7 +140,7 @@ protected:
 
     static bool X11SupportInitialised;
 
-    // Modifier tqmasks for alt/meta - detected at run-time
+    // Modifier masks for alt/meta - detected at run-time
     static long X11AltMask;
     static long X11MetaMask;
 
diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cc
index 33c6ae04..ca899da8 100644
--- a/chalk/ui/kis_cursor.cc
+++ b/chalk/ui/kis_cursor.cc
@@ -344,7 +344,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
     TQBitmap tqmask(cursorImage.width(), cursorImage.height());
 
     TQPainter bitmapPainter(&bitmap);
-    TQPainter tqmaskPainter(&tqmask);
+    TQPainter maskPainter(&tqmask);
 
     for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) {
         for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) {
@@ -353,9 +353,9 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
             
             if (tqAlpha(pixel) < 128) {
                 bitmapPainter.setPen(TQt::color0);
-                tqmaskPainter.setPen(TQt::color0);
+                maskPainter.setPen(TQt::color0);
             } else {
-                tqmaskPainter.setPen(TQt::color1);
+                maskPainter.setPen(TQt::color1);
 
                 if (tqGray(pixel) < 128) {
                     bitmapPainter.setPen(TQt::color1);
@@ -365,7 +365,7 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
             }
 
             bitmapPainter.drawPoint(x, y);
-            tqmaskPainter.drawPoint(x, y);
+            maskPainter.drawPoint(x, y);
         }
     }
 
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index e60e6524..1fc1c9c9 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -137,8 +137,8 @@ namespace {
 
 }
 
-KisDoc::KisDoc(TQWidget *tqparentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) :
-    super(tqparentWidget, widgetName, tqparent, name, singleViewMode)
+KisDoc::KisDoc(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, bool singleViewMode) :
+    super(parentWidget, widgetName, tqparent, name, singleViewMode)
 {
 
     m_undo = false;
@@ -182,7 +182,7 @@ DCOPObject *KisDoc::dcopObject()
     return m_dcop;
 }
 
-bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KisDoc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
     if (!init())
         return false;
@@ -203,7 +203,7 @@ bool KisDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
                         file,
                         dlgtype,
                         "chalk_template",
-                        tqparentWidget);
+                        parentWidget);
     setUndo(false);
 
     if (ret == KoTemplateChooseDia::Template) {
diff --git a/chalk/ui/kis_doc.h b/chalk/ui/kis_doc.h
index 47eeaa0f..222e9da6 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 *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false);
+    KisDoc(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false);
     virtual ~KisDoc();
 
 public:
@@ -62,7 +62,7 @@ public:
     virtual bool completeLoading(KoStore *store);
     virtual bool completeSaving(KoStore*);
     virtual DCOPObject* dcopObject();
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
     virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, const TQDomDocument&, KoStore* );
     virtual bool saveOasis( KoStore*, KoXmlWriter* );
     virtual bool loadChildren( KoStore* store);
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc
index 0924420d..aa84aa61 100644
--- a/chalk/ui/kis_factory.cc
+++ b/chalk/ui/kis_factory.cc
@@ -78,13 +78,13 @@ KisFactory::~KisFactory()
 /**
  * Create the document
  */
-KParts::Part* KisFactory::createPartObject( TQWidget *tqparentWidget,
+KParts::Part* KisFactory::createPartObject( TQWidget *parentWidget,
                         const char *widgetName, TQObject* tqparent,
                         const char* name, const char* classname, const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KisDoc *doc = new KisDoc( tqparentWidget,
+    KisDoc *doc = new KisDoc( parentWidget,
                   widgetName, tqparent, name, !bWantKoDocument );
     Q_CHECK_PTR(doc);
 
diff --git a/chalk/ui/kis_factory.h b/chalk/ui/kis_factory.h
index d20070c5..da9d3e40 100644
--- a/chalk/ui/kis_factory.h
+++ b/chalk/ui/kis_factory.h
@@ -41,7 +41,7 @@ public:
     KisFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KisFactory();
 
-    virtual KParts::Part *createPartObject(TQWidget *tqparentWidget = 0,
+    virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0,
                            const char *widgetName = 0,
                            TQObject *tqparent = 0,
                            const char *name = 0,
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index a21f49aa..a5b145da 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -289,7 +289,7 @@ bool KisFilterManager::apply()
         return false;
 
     } else {
-        if (dev->tqparentLayer()) dev->tqparentLayer()->setDirty(rect);
+        if (dev->parentLayer()) dev->parentLayer()->setDirty(rect);
         m_doc->setModified(true);
         if (img->undo() && cmd) img->undoAdapter()->addCommand(cmd);
         return true;
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 703fd3be..e257e2b0 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -229,15 +229,15 @@ void KisLayerBox::slotLayerRemoved(KisLayerSP layer, KisGroupLayerSP wasParent,
 
 void KisLayerBox::slotLayerMoved(KisLayerSP layer, KisGroupLayerSP wasParent, KisLayerSP)
 {
-    int tqparentID = layer->tqparent()->id();
+    int parentID = layer->tqparent()->id();
     if (layer->tqparent() == m_image->rootLayer())
-        tqparentID = -1;
+        parentID = -1;
 
     int siblingID = -1;
     if (layer->prevSibling())
         siblingID = layer->prevSibling()->id();
 
-    list()->moveLayer(layer->id(), tqparentID, siblingID);
+    list()->moveLayer(layer->id(), parentID, siblingID);
 
     markModified(layer->tqparent());
     markModified(wasParent);
diff --git a/chalk/ui/kis_layerlist.h b/chalk/ui/kis_layerlist.h
index f0c587dd..5b74acea 100644
--- a/chalk/ui/kis_layerlist.h
+++ b/chalk/ui/kis_layerlist.h
@@ -35,9 +35,9 @@ class KisLayerList: public LayerList
 
 signals:
     void requestNewObjectLayer( LayerItem *tqparent, LayerItem *after, const KoDocumentEntry &entry );
-    void requestNewObjectLayer( int tqparentID, int afterID, const KoDocumentEntry &entry );
+    void requestNewObjectLayer( int parentID, int afterID, const KoDocumentEntry &entry );
     void requestNewAdjustmentLayer( LayerItem *tqparent, LayerItem *after );
-    void requestNewAdjustmentLayer( int tqparentID, int afterID );
+    void requestNewAdjustmentLayer( int parentID, int afterID );
 
 public:
     KisLayerList( TQWidget *tqparent = 0, const char *name = 0 );
diff --git a/chalk/ui/kis_matrix_widget.ui b/chalk/ui/kis_matrix_widget.ui
index b989df12..ca238b60 100644
--- a/chalk/ui/kis_matrix_widget.ui
+++ b/chalk/ui/kis_matrix_widget.ui
@@ -206,5 +206,5 @@
 <Q_SLOTS>
     <slot access="private">spinboxValueChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/kis_opengl_image_context.h b/chalk/ui/kis_opengl_image_context.h
index 03833cd2..2798f0f8 100644
--- a/chalk/ui/kis_opengl_image_context.h
+++ b/chalk/ui/kis_opengl_image_context.h
@@ -141,7 +141,7 @@ private:
     int m_numImageTextureTileColumns;
 
     // We create a single OpenGL context and share it between all views
-    // in the process. Aptqparently with some OpenGL implementations, only
+    // in the process. Apparently with some OpenGL implementations, only
     // one context will be hardware accelerated.
     static TQGLWidget *SharedContextWidget;
     static int SharedContextWidgetRefCount;
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index 401721b5..459770d1 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cc
@@ -83,7 +83,7 @@ void KisPartLayerImpl::childActivated(KoDocumentChild* child)
         TQRect rect = extent();
         m_activated = true;
         setDirty(rect);
-        TQPtrList<KoView> views = child->tqparentDocument()->views();
+        TQPtrList<KoView> views = child->parentDocument()->views();
         Q_ASSERT(views.count());
         // XXX iterate over views
         connect(views.at(0), TQT_SIGNAL(activated(bool)),
@@ -97,7 +97,7 @@ void KisPartLayerImpl::childDeactivated(bool activated)
     // We probably changed, notify the image that it needs to tqrepaint where we currently updated
     // We use the original tqgeometry
     if (m_activated && !activated /* no clue, but debugging suggests it is false here */) {
-        TQPtrList<KoView> views = m_doc->tqparentDocument()->views();
+        TQPtrList<KoView> views = m_doc->parentDocument()->views();
         Q_ASSERT(views.count());
         views.at(0)->disconnect(TQT_SIGNAL(activated(bool)));
         m_activated = false;
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cc
index c9c2a766..c534384a 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cc
@@ -333,8 +333,8 @@ void KisPreviewWidget::runFilterHelper() {
     if (m_origDevice->image())
     {
         m_scaledImage = new KisImage(*m_origDevice->image());
-        if(!m_origDevice->tqparentLayer()) return;
-        TQString layerName = m_origDevice->tqparentLayer()->name();
+        if(!m_origDevice->parentLayer()) return;
+        TQString layerName = m_origDevice->parentLayer()->name();
         KisPaintLayerSP pl = ::tqqt_cast<KisPaintLayer*>(m_scaledImage->findLayer(layerName));
         if(!pl) return;
         scaledDevice = pl->paintDevice();
@@ -356,7 +356,7 @@ void KisPreviewWidget::runFilterHelper() {
                                   0.0, 0.0, 0.0, 0, 0, NULL, &strategy);
             tw.run();
             scaledDevice->setSelection(select);
-            select->setParentLayer(scaledDevice->tqparentLayer());
+            select->setParentLayer(scaledDevice->parentLayer());
         }
         
         // Crop by the zoom value instead of cropping by rectangle. It gives better results
diff --git a/chalk/ui/kis_previewwidgetbase.ui b/chalk/ui/kis_previewwidgetbase.ui
index 6ee64019..f1b52244 100644
--- a/chalk/ui/kis_previewwidgetbase.ui
+++ b/chalk/ui/kis_previewwidgetbase.ui
@@ -260,7 +260,7 @@
         <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>imageviewer.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index fe30eb50..5885c433 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -255,9 +255,9 @@ void KisToolFreehand::endPaint()
                                m_dirtyRect.width(), m_dirtyRect.height());
 
                 KisLayerSupportsIndirectPainting* layer =
-                    dynamic_cast<KisLayerSupportsIndirectPainting*>(m_source->tqparentLayer());
+                    dynamic_cast<KisLayerSupportsIndirectPainting*>(m_source->parentLayer());
                 layer->setTemporaryTarget(0);
-                m_source->tqparentLayer()->setDirty(m_dirtyRect);
+                m_source->parentLayer()->setDirty(m_dirtyRect);
 
                 if (m_currentImage->undo()) {
                     m_currentImage->undoAdapter()->addCommand(painter.endTransaction());
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 61966928..e3500f97 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -646,11 +646,11 @@ void KisView::setupActions()
 
     m_createMask = new KAction(i18n("Create Mask"), 0, TQT_TQOBJECT(this),
                                TQT_SLOT(slotCreateMask()), actionCollection(), "create_tqmask");
-    m_tqmaskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
+    m_maskFromSelection = new KAction(i18n("Mask From Selection"), 0, TQT_TQOBJECT(this),
                                       TQT_SLOT(slotMaskFromSelection()), actionCollection(),
-                                      "tqmask_fromsel");
-    m_tqmaskToSelection = new KAction(i18n("Mask to Selection"), 0, TQT_TQOBJECT(this),
-                               TQT_SLOT(slotMaskToSelection()), actionCollection(), "tqmask_tosel");
+                                      "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");
     m_removeMask = new KAction(i18n("Remove Mask"), 0, TQT_TQOBJECT(this),
@@ -3185,7 +3185,7 @@ void KisView::connectCurrentImg()
         connect(m_image, TQT_SIGNAL(sigProfileChanged(KisProfile * )), TQT_SLOT(profileChanged(KisProfile * )));
 
         connect(m_image, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), TQT_SLOT(layersUpdated()));
-        connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(tqmaskUpdated()));
+        connect(m_image, TQT_SIGNAL(sigMaskInfoChanged()), TQT_SLOT(maskUpdated()));
         connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), TQT_SLOT(layersUpdated()));
         connect(m_image, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated()));
         connect(m_image, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), TQT_SLOT(layersUpdated()));
@@ -3198,7 +3198,7 @@ void KisView::connectCurrentImg()
         connect(m_image, TQT_SIGNAL(sigLayerAdded(KisLayerSP)),
                 TQT_SLOT(handlePartLayerAdded(KisLayerSP)));
 
-        tqmaskUpdated();
+        maskUpdated();
 #ifdef HAVE_GL
         if (m_OpenGLImageContext != 0) {
             connect(m_OpenGLImageContext, TQT_SIGNAL(sigImageUpdated(TQRect)), TQT_SLOT(slotOpenGLImageUpdated(TQRect)));
@@ -3933,7 +3933,7 @@ void KisView::slotMaskFromSelection() {
     if (!layer)
         return;
 
-    KNamedCommand *cmd = layer->tqmaskFromSelectionCommand();
+    KNamedCommand *cmd = layer->maskFromSelectionCommand();
     cmd->execute();
     if (undoAdapter() && undoAdapter()->undo()) {
         undoAdapter()->addCommand(cmd);
@@ -3945,7 +3945,7 @@ void KisView::slotMaskToSelection() {
     if (!layer)
         return;
 
-    KNamedCommand *cmd = layer->tqmaskToSelectionCommand();
+    KNamedCommand *cmd = layer->maskToSelectionCommand();
     cmd->execute();
     if (undoAdapter() && undoAdapter()->undo()) {
         undoAdapter()->addCommand(cmd);
@@ -3992,7 +3992,7 @@ void KisView::slotShowMask() {
     layer->setRenderMask(m_showMask->isChecked());
 }
 
-void KisView::tqmaskUpdated() {
+void KisView::maskUpdated() {
     KisPaintLayer* layer = dynamic_cast<KisPaintLayer*>(currentImg()->activeLayer().data());
     if (!layer) {
         m_createMask->setEnabled(false);
@@ -4003,8 +4003,8 @@ void KisView::tqmaskUpdated() {
         return;
     }
     m_createMask->setEnabled(!layer->hasMask());
-    m_tqmaskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection?
-    m_tqmaskToSelection->setEnabled(layer->hasMask());
+    m_maskFromSelection->setEnabled(true); // Perhaps also update this to false when no selection?
+    m_maskToSelection->setEnabled(layer->hasMask());
     m_applyMask->setEnabled(layer->hasMask());
     m_removeMask->setEnabled(layer->hasMask());
 
diff --git a/chalk/ui/kis_view.h b/chalk/ui/kis_view.h
index 1f197f87..71bb9065 100644
--- a/chalk/ui/kis_view.h
+++ b/chalk/ui/kis_view.h
@@ -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 tqmaskUpdated(); // To update the enabled or disabled status of the tqmask entries
+    void maskUpdated(); // To update the enabled or disabled status of the tqmask entries
 
     void slotSetFGQColor(const TQColor & c);
     void slotSetBGQColor(const TQColor & c);
@@ -560,8 +560,8 @@ private:
     KAction *m_layerTop;
 
     KAction *m_createMask;
-    KAction *m_tqmaskFromSelection;
-    KAction *m_tqmaskToSelection;
+    KAction *m_maskFromSelection;
+    KAction *m_maskToSelection;
     KAction *m_applyMask;
     KAction *m_removeMask;
     KToggleAction *m_editMask;
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 886b27e4..059d4e35 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -128,7 +128,7 @@ public:
         m_pos = pos;
         LayerItem *prev = m_item;
         m_item = static_cast<LayerItem*>(m_list->itemAt( m_pos ));
-        if( TQToolTip::tqparentWidget() && m_list->showToolTips() && m_item )
+        if( TQToolTip::parentWidget() && m_list->showToolTips() && m_item )
         {
             if( m_item != prev )
                 hideTip();
@@ -216,7 +216,7 @@ public:
 
     void position()
     {
-        const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::tqparentWidget() );
+        const TQRect drect = TQApplication::desktop()->availableGeometry( TQToolTip::parentWidget() );
         const TQSize size = tqsizeHint();
         const int width = size.width(), height = size.height();
         const TQRect tmp = m_item->rect();
@@ -228,7 +228,7 @@ public:
         else
             y = kMax( drect.top(), irect.top() - height );
 
-        int x = kMax( drect.x(), TQToolTip::tqparentWidget()->mapToGlobal( m_pos ).x() - width/2 );
+        int x = kMax( drect.x(), TQToolTip::parentWidget()->mapToGlobal( m_pos ).x() - width/2 );
         if( x + width > drect.right() )
             x = drect.right() - width;
 
@@ -617,9 +617,9 @@ LayerItem *LayerList::addLayerToParent( const TQString &displayName, LayerItem *
         return 0;
 }
 
-LayerItem *LayerList::addLayerToParent( const TQString &displayName, int tqparentID, int afterID, int id ) //SLOT
+LayerItem *LayerList::addLayerToParent( const TQString &displayName, int parentID, int afterID, int id ) //SLOT
 {
-    return addLayerToParent( displayName, folder( tqparentID ), layer( afterID ), id );
+    return addLayerToParent( displayName, folder( parentID ), layer( afterID ), id );
 }
 
 void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *after ) //SLOT
@@ -643,9 +643,9 @@ void LayerList::moveLayer( LayerItem *layer, LayerItem *tqparent, LayerItem *aft
     setCurrentItem( current ); //HACK, sometimes TQt changes this under us
 }
 
-void LayerList::moveLayer( int id, int tqparentID, int afterID ) //SLOT
+void LayerList::moveLayer( int id, int parentID, int afterID ) //SLOT
 {
-    moveLayer( layer( id ), folder( tqparentID ), layer( afterID ) );
+    moveLayer( layer( id ), folder( parentID ), layer( afterID ) );
 }
 
 void LayerList::removeLayer( LayerItem *layer ) //SLOT
@@ -723,7 +723,7 @@ void LayerList::hideTip()
 
 void LayerList::maybeTip()
 {
-    d->tooltip->maybeTip( d->tooltip->TQToolTip::tqparentWidget()->mapFromGlobal( TQCursor::pos() ) );
+    d->tooltip->maybeTip( d->tooltip->TQToolTip::parentWidget()->mapFromGlobal( TQCursor::pos() ) );
 }
 
 void LayerList::constructMenu( LayerItem *layer )
diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h
index 129baa7c..58c2a4bb 100644
--- a/chalk/ui/layerlist.h
+++ b/chalk/ui/layerlist.h
@@ -98,10 +98,10 @@ public slots:
     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, int tqparentID, int afterID = -1, 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( int id, int tqparentID, int afterID );
+    void moveLayer( int id, int parentID, int afterID );
 
     void removeLayer( LayerItem *layer );
     void removeLayer( int id );
@@ -117,13 +117,13 @@ signals:
     void propertyChanged( int id, const TQString &name, bool on );
 
     void layerMoved( LayerItem *layer, LayerItem *tqparent, LayerItem *after );
-    void layerMoved( int id, int tqparentID, int afterID );
+    void layerMoved( int id, int parentID, int afterID );
 
     void requestNewLayer( LayerItem *tqparent, LayerItem *after );
-    void requestNewLayer( int tqparentID, int afterID );
+    void requestNewLayer( int parentID, int afterID );
 
     void requestNewFolder( LayerItem *tqparent, LayerItem *after );
-    void requestNewFolder( int tqparentID, int afterID );
+    void requestNewFolder( int parentID, int afterID );
 
     void requestRemoveLayer( LayerItem *layer );
     void requestRemoveLayer( int id );
diff --git a/chalk/ui/wdgapplyprofile.ui b/chalk/ui/wdgapplyprofile.ui
index 35674162..5227d7fb 100644
--- a/chalk/ui/wdgapplyprofile.ui
+++ b/chalk/ui/wdgapplyprofile.ui
@@ -168,5 +168,5 @@
 <tabstops>
     <tabstop>cmbProfile</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgautobrush.ui b/chalk/ui/wdgautobrush.ui
index a8aa02e0..00683ca9 100644
--- a/chalk/ui/wdgautobrush.ui
+++ b/chalk/ui/wdgautobrush.ui
@@ -351,5 +351,5 @@
         <data format="PNG" length="242">89504e470d0a1a0a0000000d49484452000000190000001a0806000000427df7cd000000b9494441544889dd95410ec4200845b1e9ba78ff538a176056260c5181569bccfca590ff2a204da510ecd601008078ed8778953372cec8db20d23c0a72417aa611900999997941a795500a256d2acf7a434354bf212d4927ebc488a417518d4dd75d0dcbb5f2ed983d59f101af94eb7f20d39e3c1963136299f7e2b361f89d9e8c6ed16efc4ee3892a205ecb9adc24fdcc176ffd4b9839e9b896592eb9d623b1106464e605b821da340200086e61afb91ea2a377e89577e57f00357f504513c00b590000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgautogradient.ui b/chalk/ui/wdgautogradient.ui
index 59875f87..94a8a137 100644
--- a/chalk/ui/wdgautogradient.ui
+++ b/chalk/ui/wdgautogradient.ui
@@ -392,7 +392,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui
index 77f03131..2b2b7910 100644
--- a/chalk/ui/wdgbirdeye.ui
+++ b/chalk/ui/wdgbirdeye.ui
@@ -23,9 +23,9 @@
     <property name="caption">
         <string>Overview</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -296,7 +296,7 @@
     <slot>zoomPlus()</slot>
 </Q_SLOTS>
 <pixmapfunction>BarIcon</pixmapfunction>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktoolbar.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/ui/wdgcolorsettings.ui b/chalk/ui/wdgcolorsettings.ui
index 3d2def86..6f9e41e6 100644
--- a/chalk/ui/wdgcolorsettings.ui
+++ b/chalk/ui/wdgcolorsettings.ui
@@ -346,7 +346,7 @@ The different rendering intent methods will affect only what is shown on screen,
         <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kis_cmb_idlist.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/chalk/ui/wdgcustombrush.ui b/chalk/ui/wdgcustombrush.ui
index 78c77be3..6dca8768 100644
--- a/chalk/ui/wdgcustombrush.ui
+++ b/chalk/ui/wdgcustombrush.ui
@@ -195,5 +195,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgcustompalette.ui b/chalk/ui/wdgcustompalette.ui
index c5cbe9dc..ec0881bc 100644
--- a/chalk/ui/wdgcustompalette.ui
+++ b/chalk/ui/wdgcustompalette.ui
@@ -81,7 +81,7 @@
         <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kis_palette_view.h</includehint>
 </includehints>
diff --git a/chalk/ui/wdgcustompattern.ui b/chalk/ui/wdgcustompattern.ui
index d195f670..7936f20b 100644
--- a/chalk/ui/wdgcustompattern.ui
+++ b/chalk/ui/wdgcustompattern.ui
@@ -152,5 +152,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgdisplaysettings.ui b/chalk/ui/wdgdisplaysettings.ui
index 990f316b..64b33f16 100644
--- a/chalk/ui/wdgdisplaysettings.ui
+++ b/chalk/ui/wdgdisplaysettings.ui
@@ -86,5 +86,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdggeneralsettings.ui b/chalk/ui/wdggeneralsettings.ui
index 051cf795..53f3ef90 100644
--- a/chalk/ui/wdggeneralsettings.ui
+++ b/chalk/ui/wdggeneralsettings.ui
@@ -176,7 +176,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/chalk/ui/wdggridsettings.ui b/chalk/ui/wdggridsettings.ui
index a89574d1..18c1f528 100644
--- a/chalk/ui/wdggridsettings.ui
+++ b/chalk/ui/wdggridsettings.ui
@@ -448,7 +448,7 @@
         <data format="PNG" length="242">89504e470d0a1a0a0000000d49484452000000190000001a0806000000427df7cd000000b9494441544889dd95410ec4200845b1e9ba78ff538a176056260c5181569bccfca590ff2a204da510ecd601008078ed8778953372cec8db20d23c0a72417aa611900999997941a795500a256d2acf7a434354bf212d4927ebc488a417518d4dd75d0dcbb5f2ed983d59f101af94eb7f20d39e3c1963136299f7e2b361f89d9e8c6ed16efc4ee3892a205ecb9adc24fdcc176ffd4b9839e9b896592eb9d623b1106464e605b821da340200086e61afb91ea2a377e89577e57f00357f504513c00b590000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/chalk/ui/wdglayerbox.ui b/chalk/ui/wdglayerbox.ui
index 9bfe5760..d977802e 100644
--- a/chalk/ui/wdglayerbox.ui
+++ b/chalk/ui/wdglayerbox.ui
@@ -295,5 +295,5 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdglayerproperties.ui b/chalk/ui/wdglayerproperties.ui
index 35eb01ad..bfbcc0ce 100644
--- a/chalk/ui/wdglayerproperties.ui
+++ b/chalk/ui/wdglayerproperties.ui
@@ -166,5 +166,5 @@
       <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data>
   </image>    
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgnewimage.ui b/chalk/ui/wdgnewimage.ui
index 5e3b89a6..dd310483 100644
--- a/chalk/ui/wdgnewimage.ui
+++ b/chalk/ui/wdgnewimage.ui
@@ -421,7 +421,7 @@
     <tabstop>sliderOpacity</tabstop>
     <tabstop>txtDescription</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/ui/wdgpalettechooser.ui b/chalk/ui/wdgpalettechooser.ui
index 553cd62b..3654031b 100644
--- a/chalk/ui/wdgpalettechooser.ui
+++ b/chalk/ui/wdgpalettechooser.ui
@@ -101,5 +101,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgperformancesettings.ui b/chalk/ui/wdgperformancesettings.ui
index 0bce88e9..c8e4404b 100644
--- a/chalk/ui/wdgperformancesettings.ui
+++ b/chalk/ui/wdgperformancesettings.ui
@@ -138,7 +138,7 @@ Note that this number is only a guideline for Chalk, and is not guaranteed to be
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/chalk/ui/wdgpressuresettings.ui b/chalk/ui/wdgpressuresettings.ui
index 41ead6a9..90f59a33 100644
--- a/chalk/ui/wdgpressuresettings.ui
+++ b/chalk/ui/wdgpressuresettings.ui
@@ -62,5 +62,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgselectionoptions.ui b/chalk/ui/wdgselectionoptions.ui
index 39846fa3..ca71ee01 100644
--- a/chalk/ui/wdgselectionoptions.ui
+++ b/chalk/ui/wdgselectionoptions.ui
@@ -60,5 +60,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgshapeoptions.ui b/chalk/ui/wdgshapeoptions.ui
index c0e6338b..563c7dbc 100644
--- a/chalk/ui/wdgshapeoptions.ui
+++ b/chalk/ui/wdgshapeoptions.ui
@@ -94,5 +94,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgtabletdevicesettings.ui b/chalk/ui/wdgtabletdevicesettings.ui
index 59cad307..f9dfaac6 100644
--- a/chalk/ui/wdgtabletdevicesettings.ui
+++ b/chalk/ui/wdgtabletdevicesettings.ui
@@ -189,5 +189,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgtabletsettings.ui b/chalk/ui/wdgtabletsettings.ui
index ad4dc7bf..29ff9dbb 100644
--- a/chalk/ui/wdgtabletsettings.ui
+++ b/chalk/ui/wdgtabletsettings.ui
@@ -100,5 +100,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/chalk/ui/wdgtextbrush.ui b/chalk/ui/wdgtextbrush.ui
index 562a62f9..5e5d5dac 100644
--- a/chalk/ui/wdgtextbrush.ui
+++ b/chalk/ui/wdgtextbrush.ui
@@ -151,7 +151,7 @@
 <Q_SLOTS>
     <slot access="private">boldButtonClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/example/example_factory.cc b/example/example_factory.cc
index eaba7ee4..ebba090d 100644
--- a/example/example_factory.cc
+++ b/example/example_factory.cc
@@ -44,14 +44,14 @@ ExampleFactory::~ExampleFactory()
     s_global = 0L;
 }
 
-KParts::Part* ExampleFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* ExampleFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, 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 );
 
-    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    ExamplePart *part = new ExamplePart( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    ExamplePart *part = new ExamplePart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       part->setReadWrite( false );
diff --git a/example/example_factory.h b/example/example_factory.h
index d7fa0e72..4ecc8b3a 100644
--- a/example/example_factory.h
+++ b/example/example_factory.h
@@ -33,7 +33,7 @@ public:
     ExampleFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~ExampleFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 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 *tqparent = 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 7d695a9b..f71ff4f4 100644
--- a/example/example_part.cc
+++ b/example/example_part.cc
@@ -23,13 +23,13 @@
 
 #include <tqpainter.h>
 
-ExamplePart::ExamplePart( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+ExamplePart::ExamplePart( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
 {
     setInstance( ExampleFactory::global(), false );
 }
 
-bool ExamplePart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool ExamplePart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
     // If nothing is loaded, do initialize here
     // Most KOffice applications use the template dialog here, with code like:
diff --git a/example/example_part.h b/example/example_part.h
index 4b28e71a..4f551982 100644
--- a/example/example_part.h
+++ b/example/example_part.h
@@ -27,11 +27,11 @@ class ExamplePart : public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    ExamplePart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    ExamplePart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 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 );
 
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
     virtual bool loadXML( TQIODevice *, const TQDomDocument & );
     virtual TQDomDocument saveXML();
diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
index 06c39edc..cb405324 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -145,5 +145,5 @@ Enabling progressive will cause the image to be displayed by the browser even wh
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui
index 19da5d15..697a3e30 100644
--- a/filters/chalk/pdf/pdfimportwidgetbase.ui
+++ b/filters/chalk/pdf/pdfimportwidgetbase.ui
@@ -308,7 +308,7 @@
     <tabstop>intWidth</tabstop>
     <tabstop>intHeight</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui
index 405db2fe..ec5e0ba8 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -179,5 +179,5 @@ You can uncheck the box if you are not using transparency and you want to make t
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui
index d6080a01..26115762 100644
--- a/filters/chalk/raw/wdgrawimport.ui
+++ b/filters/chalk/raw/wdgrawimport.ui
@@ -492,5 +492,5 @@
     <tabstop>bnPreview</tabstop>
     <tabstop>radioAutomatic</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index 3ffc1bd4..d840dc8d 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -732,7 +732,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
     <tabstop>kComboBoxFaxMode</tabstop>
     <tabstop>compressionLevelPixarLog</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index 07b6a145..cf1152c6 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cc
@@ -756,11 +756,11 @@ xcf_load_channel_props (XcfInfo * info,
 
 	case PROP_SHOW_MASKED:
         {
-	    bool show_tqmasked;
+	    bool show_masked;
 
 	    info->cp +=
-                xcf_read_int32 (info->fp, (TQ_INT32 *) & show_tqmasked, 1);
-	    gimp_channel_set_show_tqmasked (*channel, show_tqmasked);
+                xcf_read_int32 (info->fp, (TQ_INT32 *) & show_masked, 1);
+	    gimp_channel_set_show_masked (*channel, show_masked);
         }
         break;
 
@@ -833,7 +833,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
     KisLayer *layer;
     GimpLayerMask *layer_tqmask;
     TQ_INT32 hierarchy_offset;
-    TQ_INT32 layer_tqmask_offset;
+    TQ_INT32 layer_mask_offset;
     bool apply_tqmask = TRUE;
     bool edit_tqmask = FALSE;
     bool show_tqmask = FALSE;
@@ -887,7 +887,7 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
 
     /* read the hierarchy and layer tqmask offsets */
     info->cp += xcf_read_int32 (info->fp, &hierarchy_offset, 1);
-    info->cp += xcf_read_int32 (info->fp, &layer_tqmask_offset, 1);
+    info->cp += xcf_read_int32 (info->fp, &layer_mask_offset, 1);
 
     /* read in the hierarchy */
     if (!xcf_seek_pos (info, hierarchy_offset, NULL))
@@ -897,9 +897,9 @@ xcf_load_layer (XcfInfo * info, KisImage * gimage)
         goto error;
 
     /* read in the layer tqmask */
-    if (layer_tqmask_offset != 0)
+    if (layer_mask_offset != 0)
     {
-        if (!xcf_seek_pos (info, layer_tqmask_offset, NULL))
+        if (!xcf_seek_pos (info, layer_mask_offset, NULL))
             goto error;
 
         layer_tqmask = xcf_load_layer_tqmask (info, gimage);
@@ -998,7 +998,7 @@ xcf_load_layer_tqmask (XcfInfo * info, KisImage * gimage)
     info->cp += xcf_read_string (info->fp, &name, 1);
 
     /* create a new layer tqmask */
-    layer_tqmask = gimp_layer_tqmask_new (gimage, width, height, name, &color);
+    layer_tqmask = gimp_layer_mask_new (gimage, width, height, name, &color);
     g_free (name);
     if (!layer_tqmask)
         return NULL;
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc
index 50e5fb17..c9043738 100644
--- a/filters/chalk/xcf/xcf/xcf-save.cc
+++ b/filters/chalk/xcf/xcf/xcf-save.cc
@@ -585,7 +585,7 @@ xcf_save_channel_props (XcfInfo     *info,
     xcf_check_error (xcf_save_prop (info, gimage, PROP_LINKED, error,
                                     gimp_item_get_linked (GIMP_ITEM (channel))));
     xcf_check_error (xcf_save_prop (info, gimage, PROP_SHOW_MASKED, error,
-                                    channel->show_tqmasked));
+                                    channel->show_masked));
 
     gimp_rgb_get_uchar (&channel->color, &col[0], &col[1], &col[2]);
     xcf_check_error (xcf_save_prop (info, gimage, PROP_COLOR, error, col));
@@ -774,14 +774,14 @@ xcf_save_prop (XcfInfo   *info,
 
     case PROP_SHOW_MASKED:
     {
-	TQ_INT32 show_tqmasked;
+	TQ_INT32 show_masked;
 
-	show_tqmasked = va_arg (args, TQ_INT32);
+	show_masked = 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_tqmasked, 1);
+	xcf_write_int32_check_error (info, &show_masked, 1);
     }
     break;
 
diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc
index a31d80a4..d571762b 100644
--- a/filters/karbon/oodraw/oodrawimport.cc
+++ b/filters/karbon/oodraw/oodrawimport.cc
@@ -229,10 +229,10 @@ KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename
 }
 
 void
-OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& tqparentobject )
+OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject )
 {
 	// parse all objects
-	for( TQDomNode object = tqparentobject.firstChild(); !object.isNull(); object = object.nextSibling() )
+	for( TQDomNode object = parentobject.firstChild(); !object.isNull(); object = object.nextSibling() )
 	{
 		TQDomElement o = object.toElement();
 		if( o.namespaceURI() != ooNS::draw ) continue;
@@ -636,7 +636,7 @@ OoDrawImport::fillStyleStack( const TQDomElement& object )
 void
 OoDrawImport::addStyles( const TQDomElement* style )
 {
-    // this function is necessary as tqparent styles can have tqparents themself
+    // 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() )] );
 
diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc
index 09dda268..228024f3 100644
--- a/filters/karbon/xaml/xamlexport.cc
+++ b/filters/karbon/xaml/xamlexport.cc
@@ -220,7 +220,7 @@ XAMLExport::getColorStops( const TQPtrVector<VColorStop> &colorStops )
 		*m_defs << "<GradientStop Color=\"";
 		getHexColor( m_defs, colorStops.at( i )->color );
 		*m_defs << "\" Offset=\"" << TQString().setNum( colorStops.at( i )->rampPoint );
-		//  XAML uses ARGB values and other methods such as tqmasks for Transparency/Opacity    #  aa  rrggbb  
+		//  XAML uses ARGB values and other methods such as masks for Transparency/Opacity    #  aa  rrggbb  
 		// *m_defs << "\" stop-opacity=\"" << colorStops.at( i )->color.opacity() << "\"" << " />" << endl;
 		// Maybe this only applies to gradients, need to check.  
 	}
diff --git a/filters/kivio/imageexport/kivio_imageexportwidget.ui b/filters/kivio/imageexport/kivio_imageexportwidget.ui
index 86fef7a7..41d73a4c 100644
--- a/filters/kivio/imageexport/kivio_imageexportwidget.ui
+++ b/filters/kivio/imageexport/kivio_imageexportwidget.ui
@@ -194,8 +194,8 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc
index 75042fc3..d40cd608 100644
--- a/filters/kpresenter/kword/kprkword.cc
+++ b/filters/kpresenter/kword/kprkword.cc
@@ -413,10 +413,10 @@ void KprKword::convert()
             if ( !outFormatsElem.firstChild().isNull() ) // Do we have formats to save ?
                 parag.appendChild( outFormatsElem );
 
-            TQDomElement tqlayoutElem = outdoc.createElement( "LAYOUT" );
-            parag.appendChild( tqlayoutElem );
+            TQDomElement layoutElem = outdoc.createElement( "LAYOUT" );
+            parag.appendChild( layoutElem );
             TQDomElement nameElem = outdoc.createElement( "NAME" );
-            tqlayoutElem.appendChild( nameElem );
+            layoutElem.appendChild( nameElem );
             nameElem.setAttribute( "value", isTitle ? titleStyleName : TQString("Standard") );
             TQDomElement align=outdoc.createElement("FLOW");
             if(p.hasAttribute("align"))
@@ -438,25 +438,25 @@ void KprKword::convert()
                 }
             }
             if(!counter.isNull() )
-                tqlayoutElem.appendChild( counter );
+                layoutElem.appendChild( counter );
             if(!indent.isNull())
-                tqlayoutElem.appendChild( indent );
+                layoutElem.appendChild( indent );
             if(!lineSpacing.isNull())
-                tqlayoutElem.appendChild( lineSpacing );
+                layoutElem.appendChild( lineSpacing );
             if(!offset.isNull())
-                tqlayoutElem.appendChild( offset);
+                layoutElem.appendChild( offset);
             if(!leftBorder.isNull())
-                tqlayoutElem.appendChild(leftBorder);
+                layoutElem.appendChild(leftBorder);
             if(!rightBorder.isNull())
-                tqlayoutElem.appendChild(rightBorder);
+                layoutElem.appendChild(rightBorder);
             if(!topBorder.isNull())
-                tqlayoutElem.appendChild(topBorder);
+                layoutElem.appendChild(topBorder);
             if(!bottomBorder.isNull())
-                tqlayoutElem.appendChild(bottomBorder);
+                layoutElem.appendChild(bottomBorder);
             if(!align.isNull())
-                tqlayoutElem.appendChild(align);
+                layoutElem.appendChild(align);
             if(!shadow.isNull())
-                tqlayoutElem.appendChild(shadow);
+                layoutElem.appendChild(shadow);
             // Only the first parag of the top text object is set to the 'title' style
             isTitle = false;
         }
diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp
index 9e933380..b87b8635 100644
--- a/filters/kpresenter/libimageexport/imageexport.cpp
+++ b/filters/kpresenter/libimageexport/imageexport.cpp
@@ -70,9 +70,9 @@ ImageExport::convert(const TQCString& from, const TQCString& to)
         kdWarning() << "Invalid document mimetype " << kpresenterdoc->mimeType() << endl;
         return KoFilter::NotImplemented;
     }
-    KoPageLayout tqlayoutPage= kpresenterdoc->pageLayout();
-    width =  int( tqlayoutPage.ptWidth );
-    height = int( tqlayoutPage.ptHeight );
+    KoPageLayout layoutPage= kpresenterdoc->pageLayout();
+    width =  int( layoutPage.ptWidth );
+    height = int( layoutPage.ptHeight );
     if (extraImageAttribute())
     {
         KPrView* view = static_cast<KPrView*>( kpresenterdoc->views().getFirst());
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cc
index 8ca41b2a..0c286fb5 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cc
@@ -2029,7 +2029,7 @@ 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 tqparents themself
+    // this function is necessary as tqparent styles can have parents themself
     if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) )
     {
         //kdDebug(30518)<<"m_styles[style->attribute( style:tqparent-style-name )] :"<<m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )]<<endl;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
index eceb3411..04fb4a40 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.cpp
@@ -3537,15 +3537,15 @@ const unsigned int SlideAtom::id = 1007;
 class SlideAtom::Private
 {
 public:
-  int tqlayoutGeom;
-  int tqlayoutPlaceholderId1; 
-  int tqlayoutPlaceholderId2; 
-  int tqlayoutPlaceholderId3; 
-  int tqlayoutPlaceholderId4; 
-  int tqlayoutPlaceholderId5; 
-  int tqlayoutPlaceholderId6; 
-  int tqlayoutPlaceholderId7; 
-  int tqlayoutPlaceholderId8; 
+  int layoutGeom;
+  int layoutPlaceholderId1; 
+  int layoutPlaceholderId2; 
+  int layoutPlaceholderId3; 
+  int layoutPlaceholderId4; 
+  int layoutPlaceholderId5; 
+  int layoutPlaceholderId6; 
+  int layoutPlaceholderId7; 
+  int layoutPlaceholderId8; 
   int masterId; 
   int notesId;
   int flags; 
@@ -3554,15 +3554,15 @@ public:
 SlideAtom::SlideAtom()
 {
   d = new Private;
-  d->tqlayoutGeom = 0;
-  d->tqlayoutPlaceholderId1 = 0; 
-  d->tqlayoutPlaceholderId2 = 0; 
-  d->tqlayoutPlaceholderId3 = 0; 
-  d->tqlayoutPlaceholderId4 = 0; 
-  d->tqlayoutPlaceholderId5 = 0; 
-  d->tqlayoutPlaceholderId6 = 0; 
-  d->tqlayoutPlaceholderId7 = 0; 
-  d->tqlayoutPlaceholderId8 = 0;       
+  d->layoutGeom = 0;
+  d->layoutPlaceholderId1 = 0; 
+  d->layoutPlaceholderId2 = 0; 
+  d->layoutPlaceholderId3 = 0; 
+  d->layoutPlaceholderId4 = 0; 
+  d->layoutPlaceholderId5 = 0; 
+  d->layoutPlaceholderId6 = 0; 
+  d->layoutPlaceholderId7 = 0; 
+  d->layoutPlaceholderId8 = 0;       
   d->masterId = 0;
   d->notesId = 0;
   d->flags = 0;
@@ -3573,39 +3573,39 @@ SlideAtom::~SlideAtom()
   delete d;
 }
 
-int SlideAtom::tqlayoutGeom() const
+int SlideAtom::layoutGeom() const
 {
-  return d->tqlayoutGeom;
+  return d->layoutGeom;
 }
 
-void SlideAtom::setLayoutGeom(int tqlayoutGeom )
+void SlideAtom::setLayoutGeom(int layoutGeom )
 {
-  d->tqlayoutGeom = tqlayoutGeom;
+  d->layoutGeom = layoutGeom;
 }
 
 
-int SlideAtom::tqlayoutPlaceholderId() const
+int SlideAtom::layoutPlaceholderId() const
 {
-   return d->tqlayoutPlaceholderId1;
-   return d->tqlayoutPlaceholderId2;
-   return d->tqlayoutPlaceholderId3;
-   return d->tqlayoutPlaceholderId4;
-   return d->tqlayoutPlaceholderId5;
-   return d->tqlayoutPlaceholderId6;
-   return d->tqlayoutPlaceholderId7;
-   return d->tqlayoutPlaceholderId8;
+   return d->layoutPlaceholderId1;
+   return d->layoutPlaceholderId2;
+   return d->layoutPlaceholderId3;
+   return d->layoutPlaceholderId4;
+   return d->layoutPlaceholderId5;
+   return d->layoutPlaceholderId6;
+   return d->layoutPlaceholderId7;
+   return d->layoutPlaceholderId8;
 }
 
-void SlideAtom::setLayoutPlaceholderId(int tqlayoutPlaceholderId1, int tqlayoutPlaceholderId2,int tqlayoutPlaceholderId3,int tqlayoutPlaceholderId4,int tqlayoutPlaceholderId5,int tqlayoutPlaceholderId6,int tqlayoutPlaceholderId7,int tqlayoutPlaceholderId8)
+void SlideAtom::setLayoutPlaceholderId(int layoutPlaceholderId1, int layoutPlaceholderId2,int layoutPlaceholderId3,int layoutPlaceholderId4,int layoutPlaceholderId5,int layoutPlaceholderId6,int layoutPlaceholderId7,int layoutPlaceholderId8)
 {
-     d->tqlayoutPlaceholderId1 = tqlayoutPlaceholderId1;
-     d->tqlayoutPlaceholderId2 = tqlayoutPlaceholderId2;
-     d->tqlayoutPlaceholderId3 = tqlayoutPlaceholderId3;
-     d->tqlayoutPlaceholderId4 = tqlayoutPlaceholderId4;
-     d->tqlayoutPlaceholderId5 = tqlayoutPlaceholderId5;
-     d->tqlayoutPlaceholderId6 = tqlayoutPlaceholderId6;
-     d->tqlayoutPlaceholderId7 = tqlayoutPlaceholderId7;
-     d->tqlayoutPlaceholderId8 = tqlayoutPlaceholderId8;
+     d->layoutPlaceholderId1 = layoutPlaceholderId1;
+     d->layoutPlaceholderId2 = layoutPlaceholderId2;
+     d->layoutPlaceholderId3 = layoutPlaceholderId3;
+     d->layoutPlaceholderId4 = layoutPlaceholderId4;
+     d->layoutPlaceholderId5 = layoutPlaceholderId5;
+     d->layoutPlaceholderId6 = layoutPlaceholderId6;
+     d->layoutPlaceholderId7 = layoutPlaceholderId7;
+     d->layoutPlaceholderId8 = layoutPlaceholderId8;
 }
 
 int SlideAtom::masterId() const
@@ -3650,16 +3650,16 @@ void SlideAtom::setData( unsigned , const unsigned char* data )
 void SlideAtom::dump( std::ostream& out ) const
 {
   out << "SlideAtom" << std::endl;
-  out << "tqlayoutGeom " << tqlayoutGeom() << std::endl;
-  // out << "tqlayoutPlaceholderId " << tqlayoutPlaceholderId() <<std::endl;
-  out << "tqlayoutPlaceholderId1 " << d->tqlayoutPlaceholderId1 <<std::endl;
-  out << "tqlayoutPlaceholderId2 " << d->tqlayoutPlaceholderId2 <<std::endl;
-  out << "tqlayoutPlaceholderId3 " << d->tqlayoutPlaceholderId3 <<std::endl;
-  out << "tqlayoutPlaceholderId4 " << d->tqlayoutPlaceholderId4 <<std::endl;
-  out << "tqlayoutPlaceholderId5 " << d->tqlayoutPlaceholderId5 <<std::endl;
-  out << "tqlayoutPlaceholderId6 " << d->tqlayoutPlaceholderId6 <<std::endl;
-  out << "tqlayoutPlaceholderId7 " << d->tqlayoutPlaceholderId7 <<std::endl;
-  out << "tqlayoutPlaceholderId8 " << d->tqlayoutPlaceholderId8 <<std::endl;
+  out << "layoutGeom " << layoutGeom() << std::endl;
+  // out << "layoutPlaceholderId " << layoutPlaceholderId() <<std::endl;
+  out << "layoutPlaceholderId1 " << d->layoutPlaceholderId1 <<std::endl;
+  out << "layoutPlaceholderId2 " << d->layoutPlaceholderId2 <<std::endl;
+  out << "layoutPlaceholderId3 " << d->layoutPlaceholderId3 <<std::endl;
+  out << "layoutPlaceholderId4 " << d->layoutPlaceholderId4 <<std::endl;
+  out << "layoutPlaceholderId5 " << d->layoutPlaceholderId5 <<std::endl;
+  out << "layoutPlaceholderId6 " << d->layoutPlaceholderId6 <<std::endl;
+  out << "layoutPlaceholderId7 " << d->layoutPlaceholderId7 <<std::endl;
+  out << "layoutPlaceholderId8 " << d->layoutPlaceholderId8 <<std::endl;
   out << "masterId " << masterId() << std::endl;
   out << "notesId " << notesId() << std::endl;
   out << "flags " << flags() << std::endl;
diff --git a/filters/kpresenter/powerpoint/libppt/powerpoint.h b/filters/kpresenter/powerpoint/libppt/powerpoint.h
index ea293ae5..66143a52 100644
--- a/filters/kpresenter/powerpoint/libppt/powerpoint.h
+++ b/filters/kpresenter/powerpoint/libppt/powerpoint.h
@@ -1262,12 +1262,12 @@ public:
   SlideAtom();
   ~SlideAtom();
 
-  int tqlayoutGeom() const; 
-  void setLayoutGeom( int tqlayoutGeom );
+  int layoutGeom() const; 
+  void setLayoutGeom( int layoutGeom );
  // see OEPlaceHolderAtom 
-  int tqlayoutPlaceholderId() const; 
- // void setLayoutPlaceholderId(int tqlayoutPlaceholderId);
-  void setLayoutPlaceholderId(int tqlayoutPlaceholderId1, int tqlayoutPlaceholderId2,int tqlayoutPlaceholderId3,int tqlayoutPlaceholderId4,int tqlayoutPlaceholderId5,int tqlayoutPlaceholderId6,int tqlayoutPlaceholderId7,int tqlayoutPlaceholderId8); 
+  int layoutPlaceholderId() const; 
+ // void setLayoutPlaceholderId(int layoutPlaceholderId);
+  void setLayoutPlaceholderId(int layoutPlaceholderId1, int layoutPlaceholderId2,int layoutPlaceholderId3,int layoutPlaceholderId4,int layoutPlaceholderId5,int layoutPlaceholderId6,int layoutPlaceholderId7,int layoutPlaceholderId8); 
   int masterId() const; 
   void setMasterId( int masterId );
   int notesId() const; 
diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc
index 20cff46d..990d12cd 100644
--- a/filters/kpresenter/svg/svgexport.cc
+++ b/filters/kpresenter/svg/svgexport.cc
@@ -76,9 +76,9 @@ SvgExport::convert(const TQCString& from, const TQCString& to)
         kdWarning() << "Invalid document mimetype " << kpresenterdoc->mimeType() << endl;
         return KoFilter::NotImplemented;
     }
-    KoPageLayout tqlayoutPage= kpresenterdoc->pageLayout();
-    int width =  int( tqlayoutPage.ptWidth );
-    int height = int( tqlayoutPage.ptHeight );
+    KoPageLayout layoutPage= kpresenterdoc->pageLayout();
+    int width =  int( layoutPage.ptWidth );
+    int height = int( layoutPage.ptHeight );
     
     TQPicture  picture;
     TQPainter  painter(&picture);
diff --git a/filters/kspread/csv/dialogui.ui b/filters/kspread/csv/dialogui.ui
index 7cf0d28c..8c3a72cf 100644
--- a/filters/kspread/csv/dialogui.ui
+++ b/filters/kspread/csv/dialogui.ui
@@ -545,7 +545,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/filters/kspread/csv/exportdialogui.ui b/filters/kspread/csv/exportdialogui.ui
index 9b38a41f..45eb6914 100644
--- a/filters/kspread/csv/exportdialogui.ui
+++ b/filters/kspread/csv/exportdialogui.ui
@@ -502,7 +502,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index 99ac0eaa..7d128a5b 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -4175,7 +4175,7 @@ public:
   unsigned formatIndex;
   bool locked;
   bool formulaHidden;
-  unsigned tqparentStyle;
+  unsigned parentStyle;
   unsigned horizontalAlignment;
   unsigned verticalAlignment;
   bool textWrap;
@@ -4207,7 +4207,7 @@ XFRecord::XFRecord():  Record()
   d->formatIndex         = 0;
   d->locked              = false;
   d->formulaHidden       = false;
-  d->tqparentStyle         = 0;
+  d->parentStyle         = 0;
   d->horizontalAlignment = Left;
   d->verticalAlignment   = VCentered;
   d->textWrap            = false;
@@ -4249,7 +4249,7 @@ XFRecord& XFRecord::operator=( const XFRecord& xf )
   d->formatIndex         = xf.formatIndex();
   d->locked              = xf.locked();
   d->formulaHidden       = xf.formulaHidden();
-  d->tqparentStyle         = xf.tqparentStyle();
+  d->parentStyle         = xf.parentStyle();
   d->horizontalAlignment = xf.horizontalAlignment();
   d->verticalAlignment   = xf.verticalAlignment();
   d->textWrap            = xf.textWrap();
@@ -4315,14 +4315,14 @@ void XFRecord::setFormulaHidden( bool f )
   d->formulaHidden = f;
 }
 
-unsigned XFRecord::tqparentStyle() const
+unsigned XFRecord::parentStyle() const
 {
-  return d->tqparentStyle;
+  return d->parentStyle;
 }
 
 void XFRecord::setParentStyle( unsigned p )
 {
-  d->tqparentStyle = p;
+  d->parentStyle = p;
 }
 
 unsigned XFRecord::horizontalAlignment() const
@@ -4657,7 +4657,7 @@ void XFRecord::setData( unsigned size, const unsigned char* data )
 void XFRecord::dump( std::ostream& out ) const
 {
   out << "XF" << std::endl;
-  out << "       Parent Style : " << tqparentStyle() << std::endl;
+  out << "       Parent Style : " << parentStyle() << std::endl;
   out << "         Font Index : " << fontIndex() << std::endl;
   out << "       Format Index : " << formatIndex() << std::endl;
   out << "             Locked : " << (locked()?"Yes":"No") << std::endl;
diff --git a/filters/kspread/excel/sidewinder/excel.h b/filters/kspread/excel/sidewinder/excel.h
index 51c9efcd..8450d643 100644
--- a/filters/kspread/excel/sidewinder/excel.h
+++ b/filters/kspread/excel/sidewinder/excel.h
@@ -2783,14 +2783,14 @@ public:
    *
    * \sa setParentStyle
    */  
-  unsigned tqparentStyle() const;
+  unsigned parentStyle() const;
   
   /**
    * Sets the index of the tqparent stlye of this format.
    * This refers to the index of the XFormat table which is constructed 
    * from a series of XFormat records.
    *
-   * \sa tqparentStyle
+   * \sa parentStyle
    */  
   void setParentStyle( unsigned ps );
 
diff --git a/filters/kspread/gnumeric/gnumeric.xsd b/filters/kspread/gnumeric/gnumeric.xsd
index d9ab545b..04949083 100644
--- a/filters/kspread/gnumeric/gnumeric.xsd
+++ b/filters/kspread/gnumeric/gnumeric.xsd
@@ -801,7 +801,7 @@
                    <xsd:attribute name="ExprID"      type="xsd:positiveInteger" use="optional"/>
                    <!-- ValueType is not used if the cell contains an expression -->
                    <xsd:attribute name="ValueType"   type="gmr:cell_type"           use="optional"/>
-                   <!-- ValueFormat is aptqparently used only for cell-by-cell format
+                   <!-- ValueFormat is apparently used only for cell-by-cell format
                         overrides
                    -->
                    <xsd:attribute name="ValueFormat" type="xsd:string"          use="optional"/>
diff --git a/filters/kspread/gnumeric/status.html b/filters/kspread/gnumeric/status.html
index 5089efa1..7bd198cc 100644
--- a/filters/kspread/gnumeric/status.html
+++ b/filters/kspread/gnumeric/status.html
@@ -128,7 +128,7 @@ support it.)
 <br>Jul 15, 2001 - Preliminary support for background patterns.
 <br>Aug 21, 2002 - text/number formats, border, patters, page/print info, comments
 <br>Aug 21, 2002 - font family, wrap text, number formating, precisions
-<br>Sep 05, 2002 - bugfixes, default sizes, row and column tqlayouts
+<br>Sep 05, 2002 - bugfixes, default sizes, row and column layouts
 <br>Sep 07, 2002 - bugfixes, preliminery date/time support
 <br>Feb 03, 2005 - export area name
 <br>Feb 06, 2005 - cells merged
diff --git a/filters/kspread/html/exportwidget.ui b/filters/kspread/html/exportwidget.ui
index 0c92ae60..df5dcc90 100644
--- a/filters/kspread/html/exportwidget.ui
+++ b/filters/kspread/html/exportwidget.ui
@@ -301,7 +301,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
index 043e3ce6..d9d28d55 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
+++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui
@@ -237,7 +237,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui
index 677329da..8c3835ed 100644
--- a/filters/kspread/latex/export/latexexportdia.ui
+++ b/filters/kspread/latex/export/latexexportdia.ui
@@ -659,7 +659,7 @@
     <slot>addLanguage()</slot>
     <slot>removeLanguage()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 1f8e6b50..5316749e 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -972,7 +972,7 @@ bool OpenCalcImport::readRowsAndCells( TQDomElement & content, Sheet * table )
 
       /*
        * TODO: Test: do we need to copy the cells, too?
-       *       if so we will probably also need to copy them for repeated col tqlayouts.
+       *       if so we will probably also need to copy them for repeated col layouts.
       for ( j = 1; j <= columns; ++j )
       {
         Cell* cell = table->cellAt( j, backupRow );
diff --git a/filters/kspread/opencalc/status.html b/filters/kspread/opencalc/status.html
index e2d667ad..dfaed8a4 100644
--- a/filters/kspread/opencalc/status.html
+++ b/filters/kspread/opencalc/status.html
@@ -47,10 +47,10 @@ KOffice filters status:&nbsp;&nbsp; OpenOffice.org Calc</h1></center>
     Links (e-mail, files, web)<br>
     cell content<br>
     Datatypes: float, percentage, (date), times, booleans (miss some kspread support) <br>
-    Formating: indents, bold, italic, tqalignments, colors...<br>
+    Formating: indents, bold, italic, alignments, colors...<br>
     Borders, background colors<br>
     column width, row width<br>
-    column tqlayouts, row tqlayouts<br>
+    column layouts, row layouts<br>
     page tqlayout (size, border)<br>
     OpenCalc style import, default style<br>
     format string translating (not supported by KSpread yet, but this filter produces these strings => needs enhancements in KSpread)<br>
diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cc
index 14a059eb..1687e958 100644
--- a/filters/kword/abiword/ImportFormatting.cc
+++ b/filters/kword/abiword/ImportFormatting.cc
@@ -186,14 +186,14 @@ void AddFormat(TQDomElement& formatElementOut, StackItem* stackItem, TQDomDocume
     }
 }
 
-void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
+void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement,
     StackItem* stackItem, TQDomDocument& mainDocument,
     const AbiPropsMap& abiPropsMap, const int level, const bool isStyle)
 {
     TQDomElement element;
     element=mainDocument.createElement("NAME");
     element.setAttribute("value",strStyleName);
-    tqlayoutElement.appendChild(element);
+    layoutElement.appendChild(element);
 
     TQString strFollowing=abiPropsMap["followedby"].getValue();
     TQDomElement followingElement=mainDocument.createElement("FOLLOWING");
@@ -206,7 +206,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
         {
             // We are a style, so we need a default
             followingElement.setAttribute("name","Normal");
-            tqlayoutElement.appendChild(followingElement);
+            layoutElement.appendChild(followingElement);
         }
         // Else: we are a tqlayout, so we leave the work to KWord (from the style)
     }
@@ -214,7 +214,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
     {
         // Following style is defined
         // TODO: we should be sure that this style is defined!
-        tqlayoutElement.appendChild(followingElement);
+        layoutElement.appendChild(followingElement);
     }
 
     TQString strFlow=abiPropsMap["text-align"].getValue();
@@ -227,7 +227,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
     {
         element.setAttribute("align","left");
     }
-    tqlayoutElement.appendChild(element);
+    layoutElement.appendChild(element);
 
     int kwordDepth;
     int kwordNumberingType;
@@ -258,7 +258,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
     element.setAttribute("bullet",64);
     element.setAttribute("bulletfont","Symbol");
     element.setAttribute("customdef","");
-    tqlayoutElement.appendChild(element);
+    layoutElement.appendChild(element);
 
     TQString strLeftMargin=abiPropsMap["margin-left"].getValue();
     TQString strRightMargin=abiPropsMap["margin-right"].getValue();
@@ -275,7 +275,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
             element.setAttribute("right",ValueWithLengthUnit(strRightMargin));
         if (!strTextIndent.isEmpty())
             element.setAttribute("first",ValueWithLengthUnit(strTextIndent));
-        tqlayoutElement.appendChild(element);
+        layoutElement.appendChild(element);
     }
 
     TQString strTopMargin=abiPropsMap["margin-top"].getValue();
@@ -290,7 +290,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
             element.setAttribute("after",margin_bottom);
         if (!strTopMargin.isEmpty())
             element.setAttribute("before",margin_top);
-        tqlayoutElement.appendChild(element);
+        layoutElement.appendChild(element);
     }
 
     TQString strLineHeight=abiPropsMap["line-height"].getValue();
@@ -351,7 +351,7 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
                 element.setAttribute( "spacingvalue", lineHeight );
             }
         }
-        tqlayoutElement.appendChild(element);
+        layoutElement.appendChild(element);
     }
 
     TQString strTab=abiPropsMap["tabstops"].getValue();
@@ -397,12 +397,12 @@ void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
             element.setAttribute("type",type);
             element.setAttribute("filling",filling);
             element.setAttribute("width",width);
-            tqlayoutElement.appendChild(element);
+            layoutElement.appendChild(element);
         }
     }
 
     TQDomElement formatElementOut=mainDocument.createElement("FORMAT");
-    tqlayoutElement.appendChild(formatElementOut);
+    layoutElement.appendChild(formatElementOut);
 
     AddFormat(formatElementOut, stackItem, mainDocument);
 }
diff --git a/filters/kword/abiword/ImportFormatting.h b/filters/kword/abiword/ImportFormatting.h
index 31b26b3f..f26f5f01 100644
--- a/filters/kword/abiword/ImportFormatting.h
+++ b/filters/kword/abiword/ImportFormatting.h
@@ -103,7 +103,7 @@ public:
                            */
     /**
      * for tables (\<table\>, \<cell\>): defines the widths of the columns.
-     * Be careful: we are using the shallow copy mechanism of TQt. Use TQMemArray::detach when needed to avoid modifying the tqparents
+     * Be careful: we are using the shallow copy mechanism of TQt. Use TQMemArray::detach when needed to avoid modifying the parents
      */
     TQMemArray<double> m_doubleArray;
 };
@@ -122,7 +122,7 @@ void PopulateProperties(StackItem* stackItem, const TQString& strStyleProps,
     const bool allowInit);
 void AddFormat(TQDomElement& formatElementOut, StackItem* stackItem,
     TQDomDocument& mainDocument);
-void AddLayout(const TQString& strStyleName, TQDomElement& tqlayoutElement,
+void AddLayout(const TQString& strStyleName, TQDomElement& layoutElement,
     StackItem* stackItem, TQDomDocument& mainDocument,
     const AbiPropsMap& abiPropsMap, const int level, const bool isStyle);
 void AddStyle(TQDomElement& styleElement, const TQString& strStyleName,
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cc
index 281f5d7e..c48b3c27 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cc
@@ -115,7 +115,7 @@ private:
         const FormatData& formatData);
     TQString textFormatToAbiProps(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force) const;
-    TQString tqlayoutToCss(const LayoutData& tqlayoutOrigin,
+    TQString layoutToCss(const LayoutData& layoutOrigin,
         const LayoutData& tqlayout, const bool force) const;
     TQString escapeAbiWordText(const TQString& strText) const;
     bool makeTable(const FrameAnchor& anchor);
@@ -718,12 +718,12 @@ void AbiWordWorker::processParagraphData ( const TQString &paraText,
     }
 }
 
-TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
+TQString AbiWordWorker::layoutToCss(const LayoutData& layoutOrigin,
     const LayoutData& tqlayout, const bool force) const
 {
     TQString props;
 
-    if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
         // Check if the current tqalignment is a valid one for AbiWord.
         if ((tqlayout.tqalignment == "left") || (tqlayout.tqalignment == "right")
@@ -748,7 +748,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
 #if 0
     // DEPRECATED!
     if (!tqlayout.tabulator.isEmpty()
-        && (force || (tqlayoutOrigin.tabulator!=tqlayout.tabulator)))
+        && (force || (layoutOrigin.tabulator!=tqlayout.tabulator)))
     {
         props += "tabstops:";
         props += tqlayout.tabulator;
@@ -756,7 +756,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     }
 #endif
     if (!tqlayout.tabulatorList.isEmpty()
-        && (force || (tqlayoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         props += "tabstops:";
         bool first=true;
@@ -790,18 +790,18 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     }
 
     if ((tqlayout.indentLeft>=0.0)
-        && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)))
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
         props += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
     }
 
     if ((tqlayout.indentRight>=0.0)
-        && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight)))
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
         props += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
     }
 
-    if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         props += "text-indent: ";
         props += TQString::number(tqlayout.indentFirst);
@@ -809,20 +809,20 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     }
 
     if ((tqlayout.marginBottom>=0.0)
-        && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
        props += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
     }
 
     if ((tqlayout.marginTop>=0.0)
-        && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) )
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
        props += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
     }
 
     if (force
-        || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
         switch ( tqlayout.lineSpacingType )
         {
@@ -881,7 +881,7 @@ TQString AbiWordWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     }
 
     // Add all AbiWord properties collected in the <FORMAT> element
-    props += textFormatToAbiProps(tqlayoutOrigin.formatData.text,tqlayout.formatData.text,force);
+    props += textFormatToAbiProps(layoutOrigin.formatData.text,tqlayout.formatData.text,force);
 
     return props;
 }
@@ -893,7 +893,7 @@ bool AbiWordWorker::doFullParagraph(const TQString& paraText, const LayoutData&
 
     const LayoutData& styleLayout=m_styleMap[style];
 
-    TQString props=tqlayoutToCss(styleLayout,tqlayout,false);
+    TQString props=layoutToCss(styleLayout,tqlayout,false);
 
     *m_streamOut << "<p";
     if (!style.isEmpty())
@@ -954,7 +954,7 @@ bool AbiWordWorker::doFullDefineStyle(LayoutData& tqlayout)
         *m_streamOut << "\"";
     }
 
-    TQString abiprops=tqlayoutToCss(tqlayout,tqlayout,true);
+    TQString abiprops=layoutToCss(tqlayout,tqlayout,true);
 
     const int result=abiprops.tqfindRev(";");
     if (result>=0)
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index 9533d5df..2d0697ba 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -364,10 +364,10 @@ bool StartElementP(StackItem* stackItem, StackItem* stackCurrent,
     stackItem->pos=0; // No text characters yet
 
     // Now we populate the tqlayout
-    TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT");
-    paragraphElementOut.appendChild(tqlayoutElement);
+    TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
+    paragraphElementOut.appendChild(layoutElement);
 
-    AddLayout(strStyle,tqlayoutElement, stackItem, mainDocument, abiPropsMap, level, false);
+    AddLayout(strStyle,layoutElement, stackItem, mainDocument, abiPropsMap, level, false);
 
     return true;
 }
@@ -1114,7 +1114,7 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
     TQStringList widthList;
     widthList.split('/', attributes.value("table-column-props"), false);
     const uint columns = widthList.size();
-    stackItem->m_doubleArray.detach(); // Be sure not to modify tqparents
+    stackItem->m_doubleArray.detach(); // Be sure not to modify parents
     stackItem->m_doubleArray.resize(columns+1); // All left positions but the last right one
     stackItem->m_doubleArray[0] = 0.0;
     TQStringList::ConstIterator it;
@@ -1160,12 +1160,12 @@ bool StructureParser::StartElementTable(StackItem* stackItem, StackItem* stackCu
     stackItem->pos=1; // Just #
 
     // Now we populate the tqlayout
-    TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT");
-    paragraphElementOut.appendChild(tqlayoutElement);
+    TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
+    paragraphElementOut.appendChild(layoutElement);
 
     AbiPropsMap abiPropsMap;
     styleDataMap.useOrCreateStyle("Normal"); // We might have to create the "Normal" style.
-    AddLayout("Normal", tqlayoutElement, stackItem, mainDocument, abiPropsMap, 0, false);
+    AddLayout("Normal", layoutElement, stackItem, mainDocument, abiPropsMap, 0, false);
 #else
     stackItem->elementType=ElementTypeIgnore;
 #endif
diff --git a/filters/kword/ascii/ExportDialogUI.ui b/filters/kword/ascii/ExportDialogUI.ui
index 2cef87d5..8f66942c 100644
--- a/filters/kword/ascii/ExportDialogUI.ui
+++ b/filters/kword/ascii/ExportDialogUI.ui
@@ -152,7 +152,7 @@
     <tabstop>radioEndOfLineCRLF</tabstop>
     <tabstop>radioEndOfLineCR</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/filters/kword/ascii/ImportDialogUI.ui b/filters/kword/ascii/ImportDialogUI.ui
index a67a43c2..fd124062 100644
--- a/filters/kword/ascii/ImportDialogUI.ui
+++ b/filters/kword/ascii/ImportDialogUI.ui
@@ -141,7 +141,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index ceb93582..a04da78f 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -370,7 +370,7 @@ void ASCIIImport::sentenceConvert(TQTextStream& stream, TQDomDocument& mainDocum
     TQDomElement& mainFramesetElement)
 // Strategy:
 // - end a paragraph when a line ends with a point or similar punctuation.
-// - search the punctuation at the end of the line, even if the sentence is quoted or in tqparentheses.
+// - search the punctuation at the end of the line, even if the sentence is quoted or in parentheses.
 // - an empty line also ends the paragraph
 // TODO/FIXME: we have a little problem with empty lines. Perhaps we should not allow empty paragraphs!
 {
@@ -471,13 +471,13 @@ void ASCIIImport::writeOutParagraph(TQDomDocument& mainDocument,
     paragraphElementOut.appendChild(textElement);
     //TQDomElement formatsPluralElementOut=mainDocument.createElement("FORMATS");
     //paragraphElementOut.appendChild(formatsPluralElementOut);
-    TQDomElement tqlayoutElement=mainDocument.createElement("LAYOUT");
-    paragraphElementOut.appendChild(tqlayoutElement);
+    TQDomElement layoutElement=mainDocument.createElement("LAYOUT");
+    paragraphElementOut.appendChild(layoutElement);
 
     TQDomElement element;
     element=mainDocument.createElement("NAME");
     element.setAttribute("value",name);
-    tqlayoutElement.appendChild(element);
+    layoutElement.appendChild(element);
 
     double size;
     element=mainDocument.createElement("INDENTS");
diff --git a/filters/kword/ascii/status.html b/filters/kword/ascii/status.html
index e8af7c5d..6b53717d 100644
--- a/filters/kword/ascii/status.html
+++ b/filters/kword/ascii/status.html
@@ -98,7 +98,7 @@
         (Recommended strategy)<br>
        <b>Sentence:</b><br>
         - a paragraph ends when a line ends with a point or similar punctuation.<br>
-        - the punctuation is searched at the end of the line, even if the sentence is quoted or in tqparentheses.<br>
+        - the punctuation is searched at the end of the line, even if the sentence is quoted or in parentheses.<br>
         - an empty line also ends the paragraph.<br>
        <b>Old Way: (similar to KOffice 1.1.x)</b><br>
        - a paragraph ends at an empty line.<br>
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index 51c4da91..057cdd86 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -308,12 +308,12 @@ TQString HtmlCssWorker::getStartOfListOpeningTag(const CounterData::Style typeLi
     return strResult;
 }
 
-TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
+TQString HtmlCssWorker::layoutToCss(const LayoutData& layoutOrigin,
     const LayoutData& tqlayout, const bool force) const
 {
     TQString strLayout;
 
-    if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
         if ( (tqlayout.tqalignment=="left") || (tqlayout.tqalignment== "right")
             || (tqlayout.tqalignment=="center") || (tqlayout.tqalignment=="justify"))
@@ -331,37 +331,37 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     }
 
     if ((tqlayout.indentLeft>=0.0)
-        && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)))
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
             strLayout += TQString("margin-left:%1pt; ").tqarg(tqlayout.indentLeft);
     }
 
     if ((tqlayout.indentRight>=0.0)
-        && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight)))
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
         strLayout += TQString("margin-right:%1pt; ").tqarg(tqlayout.indentRight);
     }
 
-    if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         strLayout += TQString("text-indent:%1pt; ").tqarg(tqlayout.indentFirst);
     }
 
     if ((tqlayout.marginBottom>=0.0)
-        && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
        strLayout += TQString("margin-bottom:%1pt; ").tqarg(tqlayout.marginBottom);
     }
 
     if ((tqlayout.marginTop>=0.0)
-        && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) )
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
        strLayout += TQString("margin-top:%1pt; ").tqarg(tqlayout.marginTop);
     }
 
     if (force
-        || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
         switch ( tqlayout.lineSpacingType )
         {
@@ -430,8 +430,8 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
 
     // TODO: Konqueror/KHTML does not support "text-shadow"
     if (!force
-        && ( tqlayoutOrigin.shadowDirection == tqlayout.shadowDirection )
-        && ( tqlayoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
+        && ( layoutOrigin.shadowDirection == tqlayout.shadowDirection )
+        && ( layoutOrigin.shadowDistance == tqlayout.shadowDistance ) )
     {
         // Do nothing!
     }
@@ -518,7 +518,7 @@ TQString HtmlCssWorker::tqlayoutToCss(const LayoutData& tqlayoutOrigin,
     // TODO: borders
 
     // This must remain last, as the last property does not have a semi-colon
-    strLayout+=textFormatToCss(tqlayoutOrigin.formatData.text,
+    strLayout+=textFormatToCss(layoutOrigin.formatData.text,
         tqlayout.formatData.text,force);
 
     return strLayout;
@@ -535,7 +535,7 @@ void HtmlCssWorker::openParagraph(const TQString& strTag,
     *m_streamOut << " class=\"" << escapeCssIdentifier(tqlayout.styleName);
     *m_streamOut << "\"";
 
-    TQString strStyle=tqlayoutToCss(styleLayout,tqlayout,false);
+    TQString strStyle=layoutToCss(styleLayout,tqlayout,false);
     if (!strStyle.isEmpty())
     {
         *m_streamOut << " style=\"" << strStyle;
@@ -689,7 +689,7 @@ bool HtmlCssWorker::doFullDefineStyle(LayoutData& tqlayout)
     //   the style could be forced on <p> by the tqlayout.
 
     *m_streamOut << "." << escapeCssIdentifier(tqlayout.styleName);
-    *m_streamOut << "\n{\n  " << tqlayoutToCss(tqlayout,tqlayout,true) << "\n}\n";
+    *m_streamOut << "\n{\n  " << layoutToCss(tqlayout,tqlayout,true) << "\n}\n";
 
     return true;
 }
diff --git a/filters/kword/html/export/ExportCss.h b/filters/kword/html/export/ExportCss.h
index acbf20cc..358ea688 100644
--- a/filters/kword/html/export/ExportCss.h
+++ b/filters/kword/html/export/ExportCss.h
@@ -54,7 +54,7 @@ protected:
     virtual void openSpan(const FormatData& formatOrigin, const FormatData& format);
     virtual void closeSpan(const FormatData& formatOrigin, const FormatData& format);
 private:
-    TQString tqlayoutToCss(const LayoutData& tqlayoutOrigin,const LayoutData& tqlayout,
+    TQString layoutToCss(const LayoutData& layoutOrigin,const LayoutData& tqlayout,
         const bool force) const;
     TQString escapeCssIdentifier(const TQString& strText) const;
     TQString textFormatToCss(const TextFormatting& formatOrigin,
diff --git a/filters/kword/html/export/ExportDialogUI.ui b/filters/kword/html/export/ExportDialogUI.ui
index 474d2912..cbdc4fc2 100644
--- a/filters/kword/html/export/ExportDialogUI.ui
+++ b/filters/kword/html/export/ExportDialogUI.ui
@@ -279,7 +279,7 @@
     <tabstop>radioModeLight</tabstop>
     <tabstop>radioModeEnhanced</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index 225a51ea..4a4cd64d 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -384,22 +384,22 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
 
     if ( tqlayout.counter.numbering == CounterData::NUM_LIST )
     {
-        const uint tqlayoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0!
+        const uint layoutDepth=tqlayout.counter.depth+1; // Word's depth starts at 0!
         const uint listDepth=m_listStack.size();
         // We are in a list, but has it the right depth?
-        if (tqlayoutDepth>listDepth)
+        if (layoutDepth>listDepth)
         {
             ListInfo newList;
             newList.m_typeList=tqlayout.counter.style;
-            for (uint i=listDepth; i<tqlayoutDepth; i++)
+            for (uint i=listDepth; i<layoutDepth; i++)
             {
                 *m_streamOut << getStartOfListOpeningTag(tqlayout.counter.style,newList.m_orderedList);
                 m_listStack.push(newList);
             }
         }
-        else if (tqlayoutDepth<listDepth)
+        else if (layoutDepth<listDepth)
         {
-            for (uint i=listDepth; i>tqlayoutDepth; i--)
+            for (uint i=listDepth; i>layoutDepth; i--)
             {
                 ListInfo oldList=m_listStack.pop();
                 if (oldList.m_orderedList)
diff --git a/filters/kword/html/import/khtmlreader.cpp b/filters/kword/html/import/khtmlreader.cpp
index 1df58edf..6e134e38 100644
--- a/filters/kword/html/import/khtmlreader.cpp
+++ b/filters/kword/html/import/khtmlreader.cpp
@@ -236,7 +236,7 @@ void KHTMLReader::parse_head(DOM::Element e)
 				state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);\
 				if (!(_writer->getText(state()->paragraph).isEmpty())) \
 					startNewParagraph(false,false); \
-				_writer->tqlayoutAttribute(state()->paragraph, #a,#b,#c); \
+				_writer->layoutAttribute(state()->paragraph, #a,#b,#c); \
 				return true; \
 			} \
 		}
@@ -317,11 +317,11 @@ void KHTMLReader::startNewParagraph(bool startnewformat, bool startnewtqlayout)
 	TQString ct=_writer->getLayoutAttribute(state()->paragraph,"COUNTER","type");
 	if ((!ct.isNull()) && (ct != "0")) 
         {
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","0");
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","");
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","type","0");
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","0");
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
 		int currdepth=(_writer->getLayoutAttribute(state()->paragraph,"COUNTER","depth")).toInt();
-		_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
+		_writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(currdepth+1));
 	}
 }
 
@@ -353,12 +353,12 @@ bool KHTMLReader::parse_CommonAttributes(DOM::Element e)
   // example: <p class="h1" style="text-align:left; ">
   {
     kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
-    _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
+    _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
   }
   if ( e.getAttribute("class").string()=="Standard" )
   {
     kdDebug(30503) << "laying out with " << e.getAttribute("class").string() << endl;
-    _writer->tqlayoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
+    _writer->layoutAttribute(state()->paragraph,"NAME","value",e.getAttribute("class").string());
   }  
   kdDebug(30503) << "leaving parse_CommonAttributes" << endl;
   return true;
@@ -509,7 +509,7 @@ void KHTMLReader::parseStyle(DOM::Element e)
     if ( s1.getPropertyValue("text-align").string() != TQString() && s1.getPropertyValue("text-align").string() != TQString("left") )
     {
       state()->tqlayout=_writer->setLayout(state()->paragraph,state()->tqlayout);
-      _writer->tqlayoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
+      _writer->layoutAttribute(state()->paragraph, "FLOW","align",s1.getPropertyValue("text-align").string());
     }
   // done
 
@@ -684,7 +684,7 @@ bool KHTMLReader::parse_ul(DOM::Element e)
   _list_depth++;
   if (e.firstChild().nodeName().string().lower() == "#text")  // e.g. <ul>this is indented<li>first listitem</li></ul>
   {
-    _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+    _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
     startNewLayout();
   }
   for (DOM::Node items=e.firstChild();!items.isNull();items=items.nextSibling()) 
@@ -692,21 +692,21 @@ bool KHTMLReader::parse_ul(DOM::Element e)
     if (items.nodeName().string().lower() == "li") 
     {
       if (!(_writer->getText(state()->paragraph).isEmpty())) startNewLayout();
-      _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
-      _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
       if (e.tagName().string().lower() == "ol")
       {
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","1");
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
-        _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext",".");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","type","1");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","1");
+        _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext",".");
       }
       else
       {
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","type","10");
-	_writer->tqlayoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
-        _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","righttext","");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","type","10");
+	_writer->layoutAttribute(state()->paragraph,"COUNTER","numberingtype","");
+        _writer->layoutAttribute(state()->paragraph,"COUNTER","righttext","");
       }
-      _writer->tqlayoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
+      _writer->layoutAttribute(state()->paragraph,"COUNTER","depth",TQString("%1").tqarg(_list_depth-1)); // indent
     }
     parseNode(items);
   }
diff --git a/filters/kword/html/import/kwdwriter.cpp b/filters/kword/html/import/kwdwriter.cpp
index d2e4c450..23211ecc 100644
--- a/filters/kword/html/import/kwdwriter.cpp
+++ b/filters/kword/html/import/kwdwriter.cpp
@@ -207,7 +207,7 @@ void KWDWriter::finishTable(int tableno) {
 
 
 void KWDWriter::createHR(TQDomElement paragraph, int width) {
-	tqlayoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width));
+	layoutAttribute(paragraph,"BOTTOMBORDER","width",TQString("%1").tqarg(width));
 }
 
 void KWDWriter::finishTable(int tableno,TQRect rect) {
@@ -353,16 +353,16 @@ TQRect getRect(TQDomElement frameset) {
 }
 
 
-TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayoutToClone) {
+TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement layoutToClone) {
 
 	TQDomElement paragraph=_doc->createElement("PARAGRAPH");
 	TQDomElement formats=_doc->createElement("FORMATS");
 	TQDomElement tqlayout;
-	if (tqlayoutToClone.isNull()) {
+	if (layoutToClone.isNull()) {
 		tqlayout=_doc->createElement("LAYOUT");
 	}
 	else {
-		tqlayout=tqlayoutToClone.cloneNode().toElement();
+		tqlayout=layoutToClone.cloneNode().toElement();
 	}
 	TQDomElement text=_doc->createElement("TEXT");
 	TQDomText t=_doc->createTextNode(TQString(""));
@@ -371,7 +371,7 @@ TQDomElement KWDWriter::addParagraph(TQDomElement tqparent, TQDomElement tqlayou
 	paragraph.appendChild(text);
 	tqparent.appendChild(paragraph);
 	paragraph.appendChild(tqlayout);
-	tqlayoutAttribute(paragraph,"NAME","value","Standard");
+	layoutAttribute(paragraph,"NAME","value","Standard");
 	return paragraph;
 }
 
@@ -403,9 +403,9 @@ TQString KWDWriter::getLayoutAttribute(TQDomElement paragraph, TQString name, TQ
 	return TQString();
 }
 
-TQDomElement KWDWriter::tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr) 
+TQDomElement KWDWriter::layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr) 
 {
-  kdDebug() << "Entering KWDWriter::tqlayoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl;
+  kdDebug() << "Entering KWDWriter::layoutAttribute name=" << name << " attrName=" << attrName << " attr=" << attr << endl;
   TQDomElement currentLayout=paragraph.elementsByTagName("LAYOUT").item(0).toElement();
   TQDomNodeList qdnl= currentLayout.elementsByTagName(name);
 
diff --git a/filters/kword/html/import/kwdwriter.h b/filters/kword/html/import/kwdwriter.h
index 2fc888c4..59694e8d 100644
--- a/filters/kword/html/import/kwdwriter.h
+++ b/filters/kword/html/import/kwdwriter.h
@@ -131,7 +131,7 @@ public:
         /**
          * adds/changes an attribute to/of the current tqlayout
          **/
-        TQDomElement tqlayoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
+        TQDomElement layoutAttribute(TQDomElement paragraph, TQString name, TQString attrName, TQString attr);
 
         /**
          * creates a new format in the current paragraph. do this before adding text
diff --git a/filters/kword/kword1.3/import/kword13parser.cpp b/filters/kword/kword1.3/import/kword13parser.cpp
index c6dce3d5..00d8290d 100644
--- a/filters/kword/kword1.3/import/kword13parser.cpp
+++ b/filters/kword/kword1.3/import/kword13parser.cpp
@@ -106,7 +106,7 @@ bool KWord13Parser::startElementFormatOneProperty( const TQString& name, const T
     }
     else
     {
-        kdError(30520) << "Wrong tqparents for FORMAT property: " << name << endl;
+        kdError(30520) << "Wrong parents for FORMAT property: " << name << endl;
         return false;
     }
 }
diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui
index 677329da..8c3835ed 100644
--- a/filters/kword/latex/export/latexexportdia.ui
+++ b/filters/kword/latex/export/latexexportdia.ui
@@ -659,7 +659,7 @@
     <slot>addLanguage()</slot>
     <slot>removeLanguage()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/filters/kword/libexport/TagProcessing.cc b/filters/kword/libexport/TagProcessing.cc
index ca47f1ef..b70d58d9 100644
--- a/filters/kword/libexport/TagProcessing.cc
+++ b/filters/kword/libexport/TagProcessing.cc
@@ -42,15 +42,15 @@
 // #define DEBUG_KWORD_IGNORED_TAGS
 
 
-void ProcessSubtags ( const TQDomNode             &tqparentNode,
+void ProcessSubtags ( const TQDomNode             &parentNode,
                       TQValueList<TagProcessing>  &tagProcessingList,
                       KWEFKWordLeader            *leader)
 {
-    //kdDebug(30508) << "Starting ProcessSubtags for node: " << tqparentNode.nodeName() << endl;
+    //kdDebug(30508) << "Starting ProcessSubtags for node: " << parentNode.nodeName() << endl;
 
     TQDomNode childNode;
 
-    for ( childNode = tqparentNode.firstChild (); !childNode.isNull (); childNode = childNode.nextSibling () )
+    for ( childNode = parentNode.firstChild (); !childNode.isNull (); childNode = childNode.nextSibling () )
     {
         if ( childNode.isElement () )
         {
@@ -74,7 +74,7 @@ void ProcessSubtags ( const TQDomNode             &tqparentNode,
                     else
                     {
                         kdDebug(30508) << "Ignoring " << childNode.nodeName ()
-                            << " tag in " << tqparentNode.nodeName () << endl;
+                            << " tag in " << parentNode.nodeName () << endl;
                     }
 #endif
                     break;
@@ -84,11 +84,11 @@ void ProcessSubtags ( const TQDomNode             &tqparentNode,
             if ( !found )
             {
                 kdDebug(30508) << "Unexpected tag " << childNode.nodeName ()
-                    << " in " << tqparentNode.nodeName () << "!" << endl;
+                    << " in " << parentNode.nodeName () << "!" << endl;
             }
         }
     }
-    //kdDebug(30508) << "Ending ProcessSubtags for node: " << tqparentNode.nodeName() << endl;
+    //kdDebug(30508) << "Ending ProcessSubtags for node: " << parentNode.nodeName() << endl;
 }
 
 void AllowNoSubtags ( const TQDomNode& myNode, KWEFKWordLeader *leader )
diff --git a/filters/kword/libexport/TagProcessing.h b/filters/kword/libexport/TagProcessing.h
index 01080d50..27512bfd 100644
--- a/filters/kword/libexport/TagProcessing.h
+++ b/filters/kword/libexport/TagProcessing.h
@@ -76,7 +76,7 @@ class TagProcessing
         void    *data;
 };
 
-void ProcessSubtags     ( const TQDomNode             &tqparentNode,
+void ProcessSubtags     ( const TQDomNode             &parentNode,
                           TQValueList<TagProcessing>  &tagProcessingList,
                           KWEFKWordLeader            *leader);
 
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 4b221051..83dae4ab 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -81,7 +81,7 @@ int Conversion::fillPatternStyle( int ipat )
 {
     // See $TQTDIR/doc/html/qbrush.html#setStyle
     switch( ipat )  {
-    case 0: // Automatic (Aptqparently it means Solid from background color instead of foreground)
+    case 0: // Automatic (Apparently it means Solid from background color instead of foreground)
     case 1: // Solid
         return TQt::SolidPattern;
     case 2: // 5%
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index f5737200..5044f023 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -371,9 +371,9 @@ void Document::slotTableCellEnd()
     m_textHandler->setFrameSetElement( TQDomElement() );
 }
 
-TQDomElement Document::createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb )
+TQDomElement Document::createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb )
 {
-    TQDomElement frameElementOut = tqparentFramesetElem.ownerDocument().createElement("FRAME");
+    TQDomElement frameElementOut = parentFramesetElem.ownerDocument().createElement("FRAME");
     frameElementOut.setAttribute( "left", left );
     frameElementOut.setAttribute( "right", right );
     frameElementOut.setAttribute( "top", top );
@@ -382,7 +382,7 @@ TQDomElement Document::createInitialFrame( TQDomElement& tqparentFramesetElem, d
     // AutoExtendFrame for header/footer/footnote/endnote, AutoCreateNewFrame for body text
     frameElementOut.setAttribute( "autoCreateNewFrame", autoExtend ? 0 : 1 );
     frameElementOut.setAttribute( "newFrameBehavior", nfb );
-    tqparentFramesetElem.appendChild( frameElementOut );
+    parentFramesetElem.appendChild( frameElementOut );
     return frameElementOut;
 }
 
@@ -405,7 +405,7 @@ void Document::generateFrameBorder( TQDomElement& frameElementOut, const wvWare:
         // If ipat = 0 (solid fill), icoBack is the background color.
         // But otherwise, icoFore is the one we need to set as bkColor
         // (and icoBack is usually white; it's the other colour of the pattern,
-        // something that we can't set in TQt aptqparently).
+        // something that we can't set in TQt apparently).
         int bkColor = shd.ipat ? shd.cvFore : shd.cvBack;
         kdDebug(30513) << "generateFrameBorder: " << " icoFore=" << shd.cvFore << " icoBack=" << shd.cvBack << " ipat=" << shd.ipat << " -> bkColor=" << bkColor << endl;
 
diff --git a/filters/kword/msword/document.h b/filters/kword/msword/document.h
index 0e79065a..af527e2a 100644
--- a/filters/kword/msword/document.h
+++ b/filters/kword/msword/document.h
@@ -113,7 +113,7 @@ private:
     void processStyles();
     void processAssociatedStrings();
     enum NewFrameBehavior { Reconnect=0, NoFollowup=1, Copy=2 };
-    TQDomElement createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb );
+    TQDomElement createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb );
     void generateFrameBorder( TQDomElement& frameElementOut, const wvWare::Word97::BRC& brcTop, const wvWare::Word97::BRC& brcBottom, const wvWare::Word97::BRC& brcLeft, const wvWare::Word97::BRC& brcRight, const wvWare::Word97::SHD& shd );
 
     TQDomDocument& m_mainDocument;
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 0dcffdbb..e58ffead 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -315,7 +315,7 @@ void KWordTextHandler::runOfText( const wvWare::UString& text, wvWare::SharedPtr
 
 }
 
-void KWordTextHandler::writeFormat( TQDomElement& tqparentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement )
+void KWordTextHandler::writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement )
 {
     TQDomElement format( mainDocument().createElement( "FORMAT" ) );
     format.setAttribute( "id", formatId );
@@ -471,7 +471,7 @@ void KWordTextHandler::writeFormat( TQDomElement& tqparentElement, const wvWare:
     }
 
     if ( pChildElement || !format.firstChild().isNull() ) // Don't save an empty format tag, unless the caller asked for it
-        tqparentElement.appendChild( format );
+        parentElement.appendChild( format );
     if ( pChildElement )
         *pChildElement = format;
 }
@@ -551,34 +551,34 @@ void KWordTextHandler::writeOutParagraph( const TQString& styleName, const TQStr
     textElement.setAttribute( "xml:space", "preserve" );
     paragraphElementOut.appendChild(textElement);
     paragraphElementOut.appendChild( m_formats );
-    TQDomElement tqlayoutElement=mainDocument().createElement("LAYOUT");
-    paragraphElementOut.appendChild(tqlayoutElement);
+    TQDomElement layoutElement=mainDocument().createElement("LAYOUT");
+    paragraphElementOut.appendChild(layoutElement);
 
     TQDomElement nameElement = mainDocument().createElement("NAME");
     nameElement.setAttribute("value", styleName);
-    tqlayoutElement.appendChild(nameElement);
+    layoutElement.appendChild(nameElement);
 
     if ( m_paragraphProperties )
     {
         // Write out the properties of the paragraph
-        writeLayout( tqlayoutElement, *m_paragraphProperties, m_currentStyle );
+        writeLayout( layoutElement, *m_paragraphProperties, m_currentStyle );
     }
 
     textElement.appendChild(mainDocument().createTextNode(text));
 
     m_paragraph = TQString( "" );
     m_index = 0;
-    m_oldLayout = tqlayoutElement; // Keep a reference to the old tqlayout for some hacks
+    m_oldLayout = layoutElement; // Keep a reference to the old tqlayout for some hacks
 }
 
-void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
+void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
 {
     const wvWare::Word97::PAP& pap = paragraphProperties.pap();
     // Always write out the tqalignment, it's required
     TQDomElement flowElement = mainDocument().createElement("FLOW");
     TQString tqalignment = Conversion::tqalignment( pap.jc );
     flowElement.setAttribute( "align", tqalignment );
-    tqparentElement.appendChild( flowElement );
+    parentElement.appendChild( flowElement );
 
     //kdDebug(30513) << k_funcinfo << " dxaLeft1=" << pap.dxaLeft1 << " dxaLeft=" << pap.dxaLeft << " dxaRight=" << pap.dxaRight << " dyaBefore=" << pap.dyaBefore << " dyaAfter=" << pap.dyaAfter << " lspd=" << pap.lspd.dyaLine << "/" << pap.lspd.fMultLinespace << endl;
 
@@ -589,14 +589,14 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare:
         indentsElement.setAttribute( "first", (double)pap.dxaLeft1 / 20.0 );
         indentsElement.setAttribute( "left", (double)pap.dxaLeft / 20.0 );
         indentsElement.setAttribute( "right", (double)pap.dxaRight / 20.0 );
-        tqparentElement.appendChild( indentsElement );
+        parentElement.appendChild( indentsElement );
     }
     if ( pap.dyaBefore || pap.dyaAfter )
     {
         TQDomElement offsetsElement = mainDocument().createElement("OFFSETS");
         offsetsElement.setAttribute( "before", (double)pap.dyaBefore / 20.0 );
         offsetsElement.setAttribute( "after", (double)pap.dyaAfter / 20.0 );
-        tqparentElement.appendChild( offsetsElement );
+        parentElement.appendChild( offsetsElement );
     }
 
     // Linespacing
@@ -605,7 +605,7 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare:
     {
         TQDomElement lineSpacingElem = mainDocument().createElement( "LINESPACING" );
         lineSpacingElem.setAttribute("value", lineSpacing );
-        tqparentElement.appendChild( lineSpacingElem );
+        parentElement.appendChild( lineSpacingElem );
     }
 
     if ( pap.fKeep || pap.fKeepFollow || pap.fPageBreakBefore )
@@ -617,7 +617,7 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare:
             pageBreak.setAttribute("hardFrameBreak", "true" );
         if ( pap.fKeepFollow )
             pageBreak.setAttribute("keepWithNext", "true" );
-        tqparentElement.appendChild( pageBreak );
+        parentElement.appendChild( pageBreak );
     }
 
     // Borders
@@ -625,25 +625,25 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare:
     {
         TQDomElement borderElement = mainDocument().createElement( "TOPBORDER" );
         Conversion::setBorderAttributes( borderElement, pap.brcTop );
-        tqparentElement.appendChild( borderElement );
+        parentElement.appendChild( borderElement );
     }
     if ( pap.brcBottom.brcType )
     {
         TQDomElement borderElement = mainDocument().createElement( "BOTTOMBORDER" );
         Conversion::setBorderAttributes( borderElement, pap.brcBottom );
-        tqparentElement.appendChild( borderElement );
+        parentElement.appendChild( borderElement );
     }
     if ( pap.brcLeft.brcType )
     {
         TQDomElement borderElement = mainDocument().createElement( "LEFTBORDER" );
         Conversion::setBorderAttributes( borderElement, pap.brcLeft );
-        tqparentElement.appendChild( borderElement );
+        parentElement.appendChild( borderElement );
     }
     if ( pap.brcRight.brcType )
     {
         TQDomElement borderElement = mainDocument().createElement( "RIGHTBORDER" );
         Conversion::setBorderAttributes( borderElement, pap.brcRight );
-        tqparentElement.appendChild( borderElement );
+        parentElement.appendChild( borderElement );
     }
 
     // Tabulators
@@ -674,17 +674,17 @@ void KWordTextHandler::writeLayout( TQDomElement& tqparentElement, const wvWare:
             }
             tabElement.setAttribute( "filling", filling );
             tabElement.setAttribute( "width", width );
-            tqparentElement.appendChild( tabElement );
+            parentElement.appendChild( tabElement );
         }
     }
 
     if ( pap.ilfo > 0 )
     {
-        writeCounter( tqparentElement, paragraphProperties, style );
+        writeCounter( parentElement, paragraphProperties, style );
     }
 }
 
-void KWordTextHandler::writeCounter( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
+void KWordTextHandler::writeCounter( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style )
 {
     const wvWare::ListInfo* listInfo = paragraphProperties.listInfo();
     if ( !listInfo )
@@ -820,7 +820,7 @@ void KWordTextHandler::writeCounter( TQDomElement& tqparentElement, const wvWare
     else
         m_previousEnumLSID = listInfo->lsid();
     counterElement.setAttribute( "numberingtype", numberingType );
-    tqparentElement.appendChild( counterElement );
+    parentElement.appendChild( counterElement );
 }
 
 void KWordTextHandler::setFrameSetElement( const TQDomElement& frameset )
diff --git a/filters/kword/msword/texthandler.h b/filters/kword/msword/texthandler.h
index 3075803b..ebea5202 100644
--- a/filters/kword/msword/texthandler.h
+++ b/filters/kword/msword/texthandler.h
@@ -86,10 +86,10 @@ public:
 
     // Write a <FORMAT> tag from the given CHP
     // Returns that element into pChildElement if set (in that case even an empty FORMAT can be appended)
-    void writeFormat( TQDomElement& tqparentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement );
+    void writeFormat( TQDomElement& parentElement, const wvWare::Word97::CHP* chp, const wvWare::Word97::CHP* refChp, int pos, int len, int formatId, TQDomElement* pChildElement );
 
     // Write the _contents_ (tqchildren) of a <LAYOUT> or <STYLE> tag, from the given parag props
-    void writeLayout( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style );
+    void writeLayout( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style );
 
     // Communication with Document, without having to know about Document
 signals:
@@ -100,7 +100,7 @@ signals:
 
 protected:
     void writeOutParagraph( const TQString& styleName, const TQString& text );
-    void writeCounter( TQDomElement& tqparentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style );
+    void writeCounter( TQDomElement& parentElement, const wvWare::ParagraphProperties& paragraphProperties, const wvWare::Style* style );
     TQDomElement insertVariable( int type, wvWare::SharedPtr<const wvWare::Word97::CHP> chp, const TQString& format );
     TQDomElement insertAnchor( const TQString& fsname );
     TQString getFont(unsigned fc) const;
diff --git a/filters/kword/mswrite/ImportDialogUI.ui b/filters/kword/mswrite/ImportDialogUI.ui
index 953caac6..db7dcc20 100644
--- a/filters/kword/mswrite/ImportDialogUI.ui
+++ b/filters/kword/mswrite/ImportDialogUI.ui
@@ -252,5 +252,5 @@
     <tabstop>checkBoxLinespacing</tabstop>
     <tabstop>checkBoxImageOffset</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/kword/mswrite/structures_generated.h b/filters/kword/mswrite/structures_generated.h
index 6ee59103..0ee985ce 100644
--- a/filters/kword/mswrite/structures_generated.h
+++ b/filters/kword/mswrite/structures_generated.h
@@ -730,7 +730,7 @@ namespace MSWrite
 		
 		static const Byte numDataBytesDefault = Byte (0);
 		static const Byte magic0_60_or_61Default = Byte (60);
-		static const Byte tqalignmentDefault = Byte (0);
+		static const Byte alignmentDefault = Byte (0);
 		static const Word magic30Default = Word (30);
 		static const Word rightIndentDefault = Word (0);
 		static const Word leftIndentDefault = Word (0);
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 3432d611..36485105 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -1728,7 +1728,7 @@ void OOWriterWorker::processParagraphData ( const TQString &paraText,
     }
 }
 
-TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrigin,
+TQString OOWriterWorker::layoutToParagraphStyle(const LayoutData& layoutOrigin,
     const LayoutData& tqlayout, const bool force, TQString& styleKey)
 {
     TQString props; // Props has to remain empty, if there is no difference.
@@ -1736,7 +1736,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
     styleKey += tqlayout.styleName;
     styleKey += ',';
 
-    if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
         // NOTE: OO 1.0.x uses start and end like left and right (section 3.11.4)
         // Unfortunately in XSL-FO's text-align, they are really supposed to be the start and the end.
@@ -1777,7 +1777,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
     styleKey += ',';
 
     if ((tqlayout.indentLeft>=0.0)
-        && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)))
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
         props += TQString("fo:margin-left=\"%1pt\" ").tqarg(tqlayout.indentLeft);
         styleKey += TQString::number(tqlayout.indentLeft);
@@ -1786,7 +1786,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
     styleKey += ',';
 
     if ((tqlayout.indentRight>=0.0)
-        && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight)))
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
         props += TQString("fo:margin-right=\"%1pt\" ").tqarg(tqlayout.indentRight);
         styleKey += TQString::number(tqlayout.indentRight);
@@ -1794,7 +1794,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
 
     styleKey += ',';
 
-    if (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft))
+    if (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft))
     {
         props += "fo:text-indent=\"";
         props += TQString::number(tqlayout.indentFirst);
@@ -1805,7 +1805,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
     styleKey += ',';
 
     if ((tqlayout.marginBottom>=0.0)
-        && ( force || ( tqlayoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
+        && ( force || ( layoutOrigin.marginBottom != tqlayout.marginBottom ) ) )
     {
        props += TQString("fo:margin-bottom=\"%1pt\" ").tqarg(tqlayout.marginBottom);
        styleKey += TQString::number(tqlayout.marginBottom);
@@ -1814,7 +1814,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
     styleKey += ',';
 
     if ((tqlayout.marginTop>=0.0)
-        && ( force || ( tqlayoutOrigin.marginTop != tqlayout.marginTop ) ) )
+        && ( force || ( layoutOrigin.marginTop != tqlayout.marginTop ) ) )
     {
        props += TQString("fo:margin-top=\"%1pt\" ").tqarg(tqlayout.marginTop);
        styleKey += TQString::number(tqlayout.marginTop);
@@ -1823,8 +1823,8 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
     styleKey += ',';
 
     if (force
-        || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
         switch ( tqlayout.lineSpacingType )
         {
@@ -1918,7 +1918,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
 
     styleKey += '@'; // A more visible seperator
 
-    props += textFormatToStyle(tqlayoutOrigin.formatData.text,tqlayout.formatData.text,force,styleKey);
+    props += textFormatToStyle(layoutOrigin.formatData.text,tqlayout.formatData.text,force,styleKey);
 
     props += ">";
 
@@ -1926,7 +1926,7 @@ TQString OOWriterWorker::tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrig
 
     // ### TODO/FIXME: what if all tabulators must be erased?
     if (!tqlayout.tabulatorList.isEmpty()
-        && (force || (tqlayoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         props += "\n    <style:tab-stops>\n";
         TabulatorList::ConstIterator it;
@@ -1984,7 +1984,7 @@ bool OOWriterWorker::doFullParagraph(const TQString& paraText, const LayoutData&
     const LayoutData& styleLayout=m_styleMap[tqlayout.styleName];
 
     TQString styleKey;
-    const TQString props(tqlayoutToParagraphStyle(styleLayout,tqlayout,false,styleKey));
+    const TQString props(layoutToParagraphStyle(styleLayout,tqlayout,false,styleKey));
 
     TQString actualStyle(tqlayout.styleName);
     if (!props.isEmpty())
@@ -2068,7 +2068,7 @@ bool OOWriterWorker::doFullDefineStyle(LayoutData& tqlayout)
     m_styles += "   <style:properties ";
 
     TQString debugKey; // Not needed
-    m_styles += tqlayoutToParagraphStyle(tqlayout,tqlayout,true,debugKey);
+    m_styles += layoutToParagraphStyle(tqlayout,tqlayout,true,debugKey);
     kdDebug(30518) << "Defining style: " << debugKey << endl;
 
     m_styles += "</style:properties>\n";
diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h
index 4e7a567e..0a898227 100644
--- a/filters/kword/oowriter/ExportFilter.h
+++ b/filters/kword/oowriter/ExportFilter.h
@@ -106,7 +106,7 @@ private:
         const FormatData& formatData);
     TQString textFormatToStyle(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force, TQString& key);
-    TQString tqlayoutToParagraphStyle(const LayoutData& tqlayoutOrigin,
+    TQString layoutToParagraphStyle(const LayoutData& layoutOrigin,
         const LayoutData& tqlayout, const bool force, TQString& styleKey);
     TQString escapeOOText(const TQString& strText) const;
     TQString escapeOOSpan(const TQString& strText) const;
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index fa831de2..4304f346 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -520,9 +520,9 @@ void OoWriterImport::prepareDocument( TQDomDocument& mainDocument, TQDomElement&
 }
 
 // Copied from the msword importer
-TQDomElement OoWriterImport::createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb )
+TQDomElement OoWriterImport::createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb )
 {
-    TQDomElement frameElementOut = tqparentFramesetElem.ownerDocument().createElement("FRAME");
+    TQDomElement frameElementOut = parentFramesetElem.ownerDocument().createElement("FRAME");
     frameElementOut.setAttribute( "left", left );
     frameElementOut.setAttribute( "right", right );
     frameElementOut.setAttribute( "top", top );
@@ -531,7 +531,7 @@ TQDomElement OoWriterImport::createInitialFrame( TQDomElement& tqparentFramesetE
     // AutoExtendFrame for header/footer/footnote/endnote, AutoCreateNewFrame for body text
     frameElementOut.setAttribute( "autoCreateNewFrame", autoExtend ? 0 : 1 );
     frameElementOut.setAttribute( "newFrameBehavior", nfb );
-    tqparentFramesetElem.appendChild( frameElementOut );
+    parentFramesetElem.appendChild( frameElementOut );
     return frameElementOut;
 }
 
@@ -552,7 +552,7 @@ KoFilter::ConversiontqStatus OoWriterImport::openFile()
     //kdDebug(30518)<<" m_content.toCString() :"<<m_content.toCString()<<endl;
 
     // We need to keep the TQDomDocument for styles too, unfortunately.
-    // Otherwise styleElement.tqparentNode() returns a null node
+    // Otherwise styleElement.parentNode() returns a null node
     // (see StyleStack::isUserStyle). Most of styles.xml is in m_styles
     // anyway, so this doesn't make a big difference.
     // We now also rely on this in createStyles.
@@ -814,14 +814,14 @@ void OoWriterImport::addStyles( const TQDomElement* style )
 {
     Q_ASSERT( style );
     if ( !style ) return;
-    // this recursive function is necessary as tqparent styles can have tqparents themselves
+    // this recursive function is necessary as tqparent styles can have parents themselves
     if ( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) {
-        const TQString tqparentStyleName = style->attributeNS( ooNS::style, "tqparent-style-name", TQString() );
-        TQDomElement* tqparentStyle = m_styles[ tqparentStyleName ];
-        if ( tqparentStyle )
-            addStyles( tqparentStyle );
+        const TQString parentStyleName = style->attributeNS( ooNS::style, "tqparent-style-name", TQString() );
+        TQDomElement* parentStyle = m_styles[ parentStyleName ];
+        if ( parentStyle )
+            addStyles( parentStyle );
         else
-            kdWarning(30518) << "Parent style not found: " << tqparentStyleName << endl;
+            kdWarning(30518) << "Parent style not found: " << parentStyleName << endl;
     }
     else if ( !m_defaultStyle.isNull() ) // on top of all, the default style
         m_styleStack.push( m_defaultStyle );
@@ -830,18 +830,18 @@ void OoWriterImport::addStyles( const TQDomElement* style )
     m_styleStack.push( *style );
 }
 
-void OoWriterImport::applyListStyle( TQDomDocument& doc, TQDomElement& tqlayoutElement, const TQDomElement& paragraph )
+void OoWriterImport::applyListStyle( TQDomDocument& doc, TQDomElement& layoutElement, const TQDomElement& paragraph )
 {
     // Spec: see 3.3.5 p137
     if ( m_listStyleStack.hasListStyle() && m_nextItemIsListItem ) {
         bool heading = paragraph.localName() == "h";
         m_nextItemIsListItem = false;
         int level = heading ? paragraph.attributeNS( ooNS::text, "level", TQString() ).toInt() : m_listStyleStack.level();
-        writeCounter( doc, tqlayoutElement, heading, level, m_insideOrderedList );
+        writeCounter( doc, layoutElement, heading, level, m_insideOrderedList );
     }
 }
 
-void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& tqlayoutElement, bool heading, int level, bool ordered )
+void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& layoutElement, bool heading, int level, bool ordered )
 {
     const TQDomElement listStyle = m_listStyleStack.currentListStyle();
     //const TQDomElement listStyleProperties = m_listStyleStack.currentListStyleProperties();
@@ -914,7 +914,7 @@ void OoWriterImport::writeCounter( TQDomDocument& doc, TQDomElement& tqlayoutEle
         }
     }
 
-    tqlayoutElement.appendChild(counter);
+    layoutElement.appendChild(counter);
 }
 
 static TQDomElement findListLevelStyle( TQDomElement& fullListStyle, int level )
@@ -1189,8 +1189,8 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
     //kdDebug(30518) << k_funcinfo << "Para text is: " << paragraphText << endl;
 
     p.appendChild( formats );
-    TQDomElement tqlayoutElement = doc.createElement( "LAYOUT" );
-    p.appendChild( tqlayoutElement );
+    TQDomElement layoutElement = doc.createElement( "LAYOUT" );
+    p.appendChild( layoutElement );
 
     // Style name
     TQString styleName = m_styleStack.userStyleName("paragraph");
@@ -1198,13 +1198,13 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
     {
         TQDomElement nameElement = doc.createElement("NAME");
         nameElement.setAttribute( "value", kWordStyleName(styleName) );
-        tqlayoutElement.appendChild(nameElement);
+        layoutElement.appendChild(nameElement);
     }
 
-    writeLayout( doc, tqlayoutElement );
-    writeFormat( doc, tqlayoutElement, 1, 0, 0 ); // paragraph format, useful for empty parags
+    writeLayout( doc, layoutElement );
+    writeFormat( doc, layoutElement, 1, 0, 0 ); // paragraph format, useful for empty parags
 
-    applyListStyle( doc, tqlayoutElement, paragraph );
+    applyListStyle( doc, layoutElement, paragraph );
 
     TQDomElement* paragraphStyle = m_styles[paragraph.attributeNS( ooNS::text, "style-name", TQString() )];
     TQString masterPageName = paragraphStyle ? paragraphStyle->attributeNS( ooNS::style, "master-page-name", TQString() ) : TQString();
@@ -1222,10 +1222,10 @@ TQDomElement OoWriterImport::parseParagraph( TQDomDocument& doc, const TQDomElem
         else
         {
             m_currentMasterPage = masterPageName;
-            TQDomElement pageBreakElem = tqlayoutElement.namedItem( "PAGEBREAKING" ).toElement();
+            TQDomElement pageBreakElem = layoutElement.namedItem( "PAGEBREAKING" ).toElement();
             if ( !pageBreakElem.isNull() )  {
                 pageBreakElem = doc.createElement( "PAGEBREAKING" );
-                tqlayoutElement.appendChild( pageBreakElem );
+                layoutElement.appendChild( pageBreakElem );
             }
             pageBreakElem.setAttribute( "hardFrameBreak", "true" );
             // We have no way to store the new page tqlayout, KWord doesn't have sections.
@@ -1454,9 +1454,9 @@ void OoWriterImport::writeFormat( TQDomDocument& doc, TQDomElement& formats, int
         formats.appendChild( format );
 }
 
-void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElement )
+void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& layoutElement )
 {
-    Q_ASSERT( tqlayoutElement.ownerDocument() == doc );
+    Q_ASSERT( layoutElement.ownerDocument() == doc );
 
     // Always write out the tqalignment, it's required
     TQDomElement flowElement = doc.createElement("FLOW");
@@ -1476,7 +1476,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
         else
             flowElement.setAttribute( "align", "auto" );
     }
-    tqlayoutElement.appendChild( flowElement );
+    layoutElement.appendChild( flowElement );
 
     if ( m_styleStack.hasAttributeNS( ooNS::fo, "writing-mode" ) ) // http://web4.w3.org/TR/xsl/slice7.html#writing-mode
     {
@@ -1486,19 +1486,19 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
     }
 
     // Indentation (margins)
-    OoUtils::importIndents( tqlayoutElement, m_styleStack );
+    OoUtils::importIndents( layoutElement, m_styleStack );
 
     // Offset before and after paragraph
-    OoUtils::importTopBottomMargin( tqlayoutElement, m_styleStack );
+    OoUtils::importTopBottomMargin( layoutElement, m_styleStack );
 
     // Line spacing
-    OoUtils::importLineSpacing( tqlayoutElement, m_styleStack );
+    OoUtils::importLineSpacing( layoutElement, m_styleStack );
 
     // Tabulators
-    OoUtils::importTabulators( tqlayoutElement, m_styleStack );
+    OoUtils::importTabulators( layoutElement, m_styleStack );
 
     // Borders
-    OoUtils::importBorders( tqlayoutElement, m_styleStack );
+    OoUtils::importBorders( layoutElement, m_styleStack );
 
     // Page breaking. This isn't in OoUtils since it doesn't apply to KPresenter
     if( m_styleStack.hasAttributeNS( ooNS::fo, "break-before") ||
@@ -1528,7 +1528,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
             TQString val = m_styleStack.attributeNS( ooNS::fo, "keep-with-next" );
             pageBreak.setAttribute("keepWithNext", ( val == "true" || val == "always" ) ? "true" : "false");
         }
-        tqlayoutElement.appendChild( pageBreak );
+        layoutElement.appendChild( pageBreak );
     }
 
     // TODO in KWord: padding
@@ -1566,7 +1566,7 @@ void OoWriterImport::writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElem
     vertical tqalignment - a bit like offsetfrombaseline (but not for subscript/superscript, in general)
   Michael said those are in fact parag properties:
     style:text-autospace, 3.10.32 - not implemented in kotext
-    style:line-break, 3.10.37 - aptqparently that's for some Asian languages
+    style:line-break, 3.10.37 - apparently that's for some Asian languages
 */
 
 }
diff --git a/filters/kword/oowriter/oowriterimport.h b/filters/kword/oowriter/oowriterimport.h
index 1b646c2e..18f57e68 100644
--- a/filters/kword/oowriter/oowriterimport.h
+++ b/filters/kword/oowriter/oowriterimport.h
@@ -47,16 +47,16 @@ private:
     void parseList( TQDomDocument& doc, const TQDomElement& list, TQDomElement& currentFramesetElement );
     bool pushListLevelStyle( const TQString& listStyleName, int level );
     bool pushListLevelStyle( const TQString& listStyleName, TQDomElement& fullListStyle, int level );
-    void applyListStyle( TQDomDocument& doc, TQDomElement& tqlayoutElement, const TQDomElement& paragraph );
-    void writeCounter( TQDomDocument& doc, TQDomElement& tqlayoutElement, bool heading, int level, bool ordered );
+    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);
-    // Reads from m_styleStack, writes the text properties to tqparentElement
-    void writeFormat( TQDomDocument& doc, TQDomElement& tqparentElement, int id, int pos, int length );
-    // Reads from m_styleStack, writes the paragraph properties to tqlayoutElement
-    void writeLayout( TQDomDocument& doc, TQDomElement& tqlayoutElement );
+    // 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
+    void writeLayout( TQDomDocument& doc, TQDomElement& layoutElement );
     enum NewFrameBehavior { Reconnect=0, NoFollowup=1, Copy=2 };
-    TQDomElement createInitialFrame( TQDomElement& tqparentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb );
+    TQDomElement createInitialFrame( TQDomElement& parentFramesetElem, double left, double right, double top, double bottom, bool autoExtend, NewFrameBehavior nfb );
     void createStyles( TQDomDocument &doc );
     void createDocumentInfo( TQDomDocument &docinfo );
     void createDocumentContent( TQDomDocument &doccontent, TQDomElement& mainFramesetElement );
diff --git a/filters/kword/pdf/DESIGN b/filters/kword/pdf/DESIGN
index 1208b8db..d2d5bb08 100644
--- a/filters/kword/pdf/DESIGN
+++ b/filters/kword/pdf/DESIGN
@@ -59,7 +59,7 @@ PDFImport::convert
  |           |   |
  |           |   |- associate links
  |           |   |
- |           |   |- Page::initParagraph: compute tabs, indents and tqalignments
+ |           |   |- Page::initParagraph: compute tabs, indents and alignments
  |           |   |
  |           |   |- Page::fillParagrap: remove hyphen/eol, add tabs, add text 
  |           |   |
diff --git a/filters/kword/pdf/FilterDevice.cpp b/filters/kword/pdf/FilterDevice.cpp
index 0d840fc3..b47770c6 100644
--- a/filters/kword/pdf/FilterDevice.cpp
+++ b/filters/kword/pdf/FilterDevice.cpp
@@ -295,14 +295,14 @@ uint Device::initImage(GfxState *state, int width, int height,
 
 void Device::drawImage(GfxState *state, Object *, Stream *str,
                              int width, int height, GfxImageColorMap *colorMap,
-                             int *tqmaskColors, GBool inlineImg)
+                             int *maskColors, GBool inlineImg)
 {
     kdDebug(30516) << "image kind=" << str->getKind()
                    << " inline=" << inlineImg
-                   << " tqmaskColors=" << (tqmaskColors!=0) << endl;
+                   << " maskColors=" << (maskColors!=0) << endl;
     if ( !_data.options().importImages ) return;
 
-    uint offset = initImage(state, width, height, tqmaskColors!=0);
+    uint offset = initImage(state, width, height, maskColors!=0);
 
     // read pixels
     int nbComps = colorMap->getNumPixelComps();
@@ -316,9 +316,9 @@ void Device::drawImage(GfxState *state, Object *, Stream *str,
             GfxRGB rgb;
             colorMap->getRGB(p, &rgb);
             int alpha = 255;
-            if (tqmaskColors) {
+            if (maskColors) {
                 for (int k=0; k<nbComps; k++)
-                    if ( p[k]<tqmaskColors[2*k] || p[k]>tqmaskColors[2*k+1] ) {
+                    if ( p[k]<maskColors[2*k] || p[k]>maskColors[2*k+1] ) {
                         alpha = 0;
                         break;
                     }
diff --git a/filters/kword/pdf/FilterDevice.h b/filters/kword/pdf/FilterDevice.h
index 3318b4ac..7c4590fa 100644
--- a/filters/kword/pdf/FilterDevice.h
+++ b/filters/kword/pdf/FilterDevice.h
@@ -86,7 +86,7 @@ public:
                                GBool inlineImg);
     virtual void drawImage(GfxState *, Object *ref, Stream *,
                            int width, int height, GfxImageColorMap *colorMap,
-                           int *tqmaskColors, GBool inlineImg);
+                           int *maskColors, GBool inlineImg);
 
     //----- path painting
     virtual void stroke(GfxState *state);
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index aefa2acc..5391cb24 100644
--- a/filters/kword/pdf/FilterPage.cpp
+++ b/filters/kword/pdf/FilterPage.cpp
@@ -530,13 +530,13 @@ void Page::prepare()
 
 void Page::dump(const Paragraph &par)
 {
-    TQValueVector<TQDomElement> tqlayouts;
+    TQValueVector<TQDomElement> layouts;
     TQValueVector<TQDomElement> formats;
 
     // tabulations
     for (uint k=0; k<par.tabs.size(); k++) {
         TQDomElement element = par.tabs[k].createElement(_data);
-        tqlayouts.push_back(element);
+        layouts.push_back(element);
     }
 
     // indents
@@ -545,14 +545,14 @@ void Page::dump(const Paragraph &par)
         element.setAttribute("left", par.leftIndent);
         double delta = par.firstIndent - par.leftIndent;
         if ( !equal(delta, 0) ) element.setAttribute("first", delta);
-        tqlayouts.push_back(element);
+        layouts.push_back(element);
     }
 
     // offset before
     if ( par.offset>0 ) {
         TQDomElement element = _data.createElement("OFFSETS");
         element.setAttribute("before", par.offset);
-        tqlayouts.push_back(element);
+        layouts.push_back(element);
     }
 
     // flow
@@ -568,7 +568,7 @@ void Page::dump(const Paragraph &par)
         if ( !flow.isEmpty() ) {
             TQDomElement element = _data.createElement("FLOW");
             element.setAttribute("align", TQString(flow.utf8()));
-            tqlayouts.push_back(element);
+            layouts.push_back(element);
         }
     }
 
@@ -587,7 +587,7 @@ void Page::dump(const Paragraph &par)
         pos += len;
     }
 
-    _data.createParagraph(text, par.type, tqlayouts, formats);
+    _data.createParagraph(text, par.type, layouts, formats);
 }
 
 void Page::dump()
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index 90fdc731..a6abf929 100644
--- a/filters/kword/pdf/data.cpp
+++ b/filters/kword/pdf/data.cpp
@@ -179,7 +179,7 @@ void Data::initPage(const TQValueVector<DRect> &rects,
 }
 
 void Data::createParagraph(const TQString &text, ParagraphType type,
-                           const TQValueVector<TQDomElement> &tqlayouts,
+                           const TQValueVector<TQDomElement> &layouts,
                            const TQValueVector<TQDomElement> &formats)
 {
     TQDomElement paragraph = _document.createElement("PARAGRAPH");
@@ -194,8 +194,8 @@ void Data::createParagraph(const TQString &text, ParagraphType type,
     TQDomElement element = _document.createElement("NAME");
     element.setAttribute("value", "Standard");
     tqlayout.appendChild(element);
-    for (uint i=0; i<tqlayouts.size(); i++)
-        tqlayout.appendChild(tqlayouts[i]);
+    for (uint i=0; i<layouts.size(); i++)
+        tqlayout.appendChild(layouts[i]);
 
     if ( formats.size() ) {
         TQDomElement format = _document.createElement("FORMATS");
diff --git a/filters/kword/pdf/data.h b/filters/kword/pdf/data.h
index d7ac0ba9..12c8a716 100644
--- a/filters/kword/pdf/data.h
+++ b/filters/kword/pdf/data.h
@@ -45,7 +45,7 @@ public:
     TQDomElement createElement(const TQString &name)
         { return _document.createElement(name); }
     void createParagraph(const TQString &text, ParagraphType type,
-                         const TQValueVector<TQDomElement> &tqlayouts,
+                         const TQValueVector<TQDomElement> &layouts,
                          const TQValueVector<TQDomElement> &formats);
 
     KoFilterChain *chain() const { return _chain; }
diff --git a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
index 6257d287..e6464612 100644
--- a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
+++ b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
@@ -104,14 +104,14 @@ diff -u -p -r1.3 -r1.3.2.1
 +++ xpdf/Gfx.cc	22 Dec 2004 12:07:12 -0000	1.3.2.1
 @@ -2379,7 +2379,9 @@ void Gfx::doImage(Object *ref, Stream *s
      haveMask = gFalse;
-     dict->lookup("Mask", &tqmaskObj);
-     if (tqmaskObj.isArray()) {
--      for (i = 0; i < tqmaskObj.arrayGetLength(); ++i) {
+     dict->lookup("Mask", &maskObj);
+     if (maskObj.isArray()) {
+-      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
 +      for (i = 0;
-+	   i < tqmaskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
++	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
 +	   ++i) {
- 	tqmaskObj.arrayGet(i, &obj1);
- 	tqmaskColors[i] = obj1.getInt();
+ 	maskObj.arrayGet(i, &obj1);
+ 	maskColors[i] = obj1.getInt();
  	obj1.free();
 Index: xpdf/GfxState.cc
 ===================================================================
diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp
index 88a79a94..1dd953aa 100644
--- a/filters/kword/pdf/fstring.cpp
+++ b/filters/kword/pdf/fstring.cpp
@@ -36,7 +36,7 @@ TQDomElement Tabulator::createElement(Data &data) const
     element.setAttribute("ptpos", pos);
     element.setAttribute("filling", filling);
     if ( tqalignment==Character )
-        element.setAttribute("alignchar", TQString(tqalignmentChar));
+        element.setAttribute("alignchar", TQString(alignmentChar));
     return element;
 }
 
diff --git a/filters/kword/pdf/fstring.h b/filters/kword/pdf/fstring.h
index f860b92f..6e4d0b6a 100644
--- a/filters/kword/pdf/fstring.h
+++ b/filters/kword/pdf/fstring.h
@@ -47,7 +47,7 @@ public:
     double    pos;
     Alignment tqalignment;
     Filling   filling;
-    TQChar     tqalignmentChar;
+    TQChar     alignmentChar;
 };
 
 inline bool operator <(const Tabulator &t1, const Tabulator &t2)
diff --git a/filters/kword/pdf/status.html b/filters/kword/pdf/status.html
index 4e6c263c..946c3df4 100644
--- a/filters/kword/pdf/status.html
+++ b/filters/kword/pdf/status.html
@@ -50,7 +50,7 @@
      <td><ul>
      <li>import text with formatting.
      <li>import links.
-     <li>import images (image tqmasks cannot be handled correctly thought).
+     <li>import images (image masks cannot be handled correctly thought).
      </ul></td>
     </tr>
 
diff --git a/filters/kword/pdf/transform.h b/filters/kword/pdf/transform.h
index 8f8ae7f1..c7fe3bc3 100644
--- a/filters/kword/pdf/transform.h
+++ b/filters/kword/pdf/transform.h
@@ -75,7 +75,7 @@ namespace PDFImport
     CharType checkSpecial(Unicode, Unicode &res);
 
     // detect some letter/accent combinations
-    // (latex tqlayouts them separately)
+    // (latex layouts them separately)
     Unicode checkCombi(Unicode letter, Unicode accent);
 }
 
diff --git a/filters/kword/pdf/xpdf/xpdf/Catalog.cc b/filters/kword/pdf/xpdf/xpdf/Catalog.cc
index 4a68d3b3..8f7e6b04 100644
--- a/filters/kword/pdf/xpdf/xpdf/Catalog.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Catalog.cc
@@ -25,7 +25,7 @@
 #include "Catalog.h"
 
 // This define is used to limit the depth of recursive readPageTree calls
-// This is needed because the page tree nodes can reference their tqparents
+// This is needed because the page tree nodes can reference their parents
 // leaving us in an infinite loop
 // Most sane pdf documents don't have a call depth higher than 10
 #define MAX_CALL_DEPTH 1000
diff --git a/filters/kword/pdf/xpdf/xpdf/Gfx.cc b/filters/kword/pdf/xpdf/xpdf/Gfx.cc
index d357ba94..53999975 100644
--- a/filters/kword/pdf/xpdf/xpdf/Gfx.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Gfx.cc
@@ -2263,9 +2263,9 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
   GBool invert;
   GfxColorSpace *colorSpace;
   GfxImageColorMap *colorMap;
-  Object tqmaskObj;
+  Object maskObj;
   GBool haveMask;
-  int tqmaskColors[2*gfxColorMaxComps];
+  int maskColors[2*gfxColorMaxComps];
   Object obj1, obj2;
   int i;
 
@@ -2377,13 +2377,13 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
 
     // get the tqmask
     haveMask = gFalse;
-    dict->lookup("Mask", &tqmaskObj);
-    if (tqmaskObj.isArray()) {
+    dict->lookup("Mask", &maskObj);
+    if (maskObj.isArray()) {
       for (i = 0;
-	   i < tqmaskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
+	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
 	   ++i) {
-	tqmaskObj.arrayGet(i, &obj1);
-	tqmaskColors[i] = obj1.getInt();
+	maskObj.arrayGet(i, &obj1);
+	maskColors[i] = obj1.getInt();
 	obj1.free();
       }
       haveMask = gTrue;
@@ -2391,10 +2391,10 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
 
     // draw it
     out->drawImage(state, ref, str, width, height, colorMap,
-		   haveMask ? tqmaskColors : (int *)NULL,  inlineImg);
+		   haveMask ? maskColors : (int *)NULL,  inlineImg);
     delete colorMap;
 
-    tqmaskObj.free();
+    maskObj.free();
   }
 
   if ((i = width * height) > 1000) {
diff --git a/filters/kword/pdf/xpdf/xpdf/GfxFont.cc b/filters/kword/pdf/xpdf/xpdf/GfxFont.cc
index 7886ae69..1ed21174 100644
--- a/filters/kword/pdf/xpdf/xpdf/GfxFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GfxFont.cc
@@ -738,7 +738,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, const char *tagA, Ref idA, GString *nameA,
   } else {
     // this is technically an error -- the Widths entry is required
     // for all but the Base-14 fonts -- but certain PDF generators
-    // aptqparently don't include widths for Arial and TimesNewRoman
+    // apparently don't include widths for Arial and TimesNewRoman
     if (isFixedWidth()) {
       i = 0;
     } else if (isSerif()) {
diff --git a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc
index 43bfc793..1a6d87e1 100644
--- a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc
@@ -96,7 +96,7 @@ void ImageOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 void ImageOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 			       int width, int height,
 			       GfxImageColorMap *colorMap,
-			       int *tqmaskColors, GBool inlineImg) {
+			       int *maskColors, GBool inlineImg) {
   FILE *f;
   ImageStream *imgStr;
   Guchar *p;
diff --git a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.h b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.h
index 4f317150..c3eb36e0 100644
--- a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.h
+++ b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.h
@@ -62,7 +62,7 @@ public:
 			     GBool inlineImg);
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
-			 int *tqmaskColors, GBool inlineImg);
+			 int *maskColors, GBool inlineImg);
 
 private:
 
diff --git a/filters/kword/pdf/xpdf/xpdf/OutputDev.cc b/filters/kword/pdf/xpdf/xpdf/OutputDev.cc
index fbef8c17..34ec5683 100644
--- a/filters/kword/pdf/xpdf/xpdf/OutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/OutputDev.cc
@@ -81,7 +81,7 @@ void OutputDev::drawImageMask(GfxState */*state*/, Object */*ref*/,
 
 void OutputDev::drawImage(GfxState */*state*/, Object */*ref*/, Stream *str,
 			  int width, int height, GfxImageColorMap *colorMap,
-              int */*tqmaskColors*/, GBool inlineImg) {
+              int */*maskColors*/, GBool inlineImg) {
   int i, j;
 
   if (inlineImg) {
diff --git a/filters/kword/pdf/xpdf/xpdf/OutputDev.h b/filters/kword/pdf/xpdf/xpdf/OutputDev.h
index 0e29c40c..a7e1f0ab 100644
--- a/filters/kword/pdf/xpdf/xpdf/OutputDev.h
+++ b/filters/kword/pdf/xpdf/xpdf/OutputDev.h
@@ -135,7 +135,7 @@ public:
 			     GBool inlineImg);
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
-			 int *tqmaskColors, GBool inlineImg);
+			 int *maskColors, GBool inlineImg);
 
 #ifdef OPI_SUPPORT
   //----- OPI functions
diff --git a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
index 700c4829..671d0599 100644
--- a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
@@ -862,7 +862,7 @@ void PSOutputDev::setupFonts(Dict *resDict) {
   fontDict.free();
 }
 
-void PSOutputDev::setupFont(GfxFont *font, Dict *tqparentResDict) {
+void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
   Ref fontFileID;
   GString *name;
   PSFontParam *fontParam;
@@ -960,7 +960,7 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *tqparentResDict) {
     sprintf(type3Name, "T3_%d_%d",
 	    font->getID()->num, font->getID()->gen);
     psName = type3Name;
-    setupType3Font(font, psName, tqparentResDict);
+    setupType3Font(font, psName, parentResDict);
 
   // do 8-bit font substitution
   } else if (!font->isCIDFont()) {
@@ -1477,7 +1477,7 @@ void PSOutputDev::setupEmbeddedCIDTrueTypeFont(GfxFont *font, Ref *id,
 }
 
 void PSOutputDev::setupType3Font(GfxFont *font, char *psName,
-				 Dict *tqparentResDict) {
+				 Dict *parentResDict) {
   Dict *resDict;
   Dict *charProcs;
   Object charProc;
@@ -1491,7 +1491,7 @@ void PSOutputDev::setupType3Font(GfxFont *font, char *psName,
   if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
     setupResources(resDict);
   } else {
-    resDict = tqparentResDict;
+    resDict = parentResDict;
   }
 
   // beginning comment
@@ -2217,7 +2217,7 @@ void PSOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 
 void PSOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 			    int width, int height, GfxImageColorMap *colorMap,
-			    int *tqmaskColors, GBool inlineImg) {
+			    int *maskColors, GBool inlineImg) {
   int len;
 
   len = height * ((width * colorMap->getNumPixelComps() *
diff --git a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.h b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.h
index 245ff0b4..fbfc3a5c 100644
--- a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.h
+++ b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.h
@@ -131,7 +131,7 @@ public:
 			     GBool inlineImg);
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
-			 int *tqmaskColors, GBool inlineImg);
+			 int *maskColors, GBool inlineImg);
 
 #if OPI_SUPPORT
   //----- OPI functions
@@ -155,7 +155,7 @@ private:
 	    int firstPage, int lastPage, PSOutMode modeA);
   void setupResources(Dict *resDict);
   void setupFonts(Dict *resDict);
-  void setupFont(GfxFont *font, Dict *tqparentResDict);
+  void setupFont(GfxFont *font, Dict *parentResDict);
   void setupEmbeddedType1Font(Ref *id, char *psName);
   void setupExternalType1Font(GString *fileName, char *psName);
   void setupEmbeddedType1CFont(GfxFont *font, Ref *id, char *psName);
@@ -163,7 +163,7 @@ private:
   void setupExternalTrueTypeFont(GfxFont *font, char *psName);
   void setupEmbeddedCIDType0Font(GfxFont *font, Ref *id, char *psName);
   void setupEmbeddedCIDTrueTypeFont(GfxFont *font, Ref *id, char *psName);
-  void setupType3Font(GfxFont *font, char *psName, Dict *tqparentResDict);
+  void setupType3Font(GfxFont *font, char *psName, Dict *parentResDict);
   void setupImages(Dict *resDict);
   void setupImage(Ref id, Stream *str);
   void addProcessColor(double c, double m, double y, double k);
diff --git a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
index f172ac41..dc37ee21 100644
--- a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
@@ -3294,7 +3294,7 @@ void XOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 
 void XOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 			   int width, int height, GfxImageColorMap *colorMap,
-			   int *tqmaskColors, GBool inlineImg) {
+			   int *maskColors, GBool inlineImg) {
   ImageStream *imgStr;
   XImage *image;
   int nComps, nVals, nBits;
@@ -3464,7 +3464,7 @@ void XOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 
   // allocate pixel buffer
   pixBuf = (GfxRGB *)gmalloc((yp + 1) * width * sizeof(GfxRGB));
-  if (tqmaskColors) {
+  if (maskColors) {
     alphaBuf = (Guchar *)gmalloc((yp + 1) * width * sizeof(Guchar));
   } else {
     alphaBuf = NULL;
@@ -3475,11 +3475,11 @@ void XOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   image->data = (char *)gmalloc(bh * image->bytes_per_line);
 
   // if the transform is anything other than a 0/90/180/270 degree
-  // rotation/flip, or if there is color key tqmasking, read the
+  // rotation/flip, or if there is color key masking, read the
   // backgound pixmap to fill in the corners
   if (!((ulx == llx && uly == ury) ||
 	(uly == lly && ulx == urx)) ||
-      tqmaskColors) {
+      maskColors) {
     XGetSubImage(display, pixmap, cx0, cy0, cw, ch, (1 << depth) - 1, ZPixmap,
 		 image, cx1, cy1);
   }
@@ -3540,8 +3540,8 @@ void XOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
           if (q) {
             *q = 1;
             for (k = 0; k < nComps; ++k) {
-              if (p2[k] < tqmaskColors[2*k] ||
-                  p2[k] > tqmaskColors[2*k]) {
+              if (p2[k] < maskColors[2*k] ||
+                  p2[k] > maskColors[2*k]) {
                 *q = 0;
                 break;
               }
@@ -3657,7 +3657,7 @@ void XOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   // free memory
   delete imgStr;
   gfree(pixBuf);
-  if (tqmaskColors) {
+  if (maskColors) {
     gfree(alphaBuf);
   }
   gfree(image->data);
diff --git a/filters/kword/pdf/xpdf/xpdf/XOutputDev.h b/filters/kword/pdf/xpdf/xpdf/XOutputDev.h
index 0d97af89..e4974f31 100644
--- a/filters/kword/pdf/xpdf/xpdf/XOutputDev.h
+++ b/filters/kword/pdf/xpdf/xpdf/XOutputDev.h
@@ -569,7 +569,7 @@ public:
 			     GBool inlineImg);
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
-			 int *tqmaskColors, GBool inlineImg);
+			 int *maskColors, GBool inlineImg);
 
   //----- Type 3 font operators
   virtual void type3D0(GfxState *state, double wx, double wy);
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
index a7897358..2aa620d6 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
@@ -106,16 +106,16 @@ XPDFCore *XPDFCore::currentSelectionOwner = NULL;
 // XPDFCore
 //------------------------------------------------------------------------
 
-XPDFCore::XPDFCore(Widget shellA, Widget tqparentWidgetA,
+XPDFCore::XPDFCore(Widget shellA, Widget parentWidgetA,
 		   Gulong paperColorA, GBool fullScreenA, GBool reverseVideo,
 		   GBool installCmap, int rgbCubeSize) {
   GString *initialZoom;
   int i;
 
   shell = shellA;
-  tqparentWidget = tqparentWidgetA;
-  display = XtDisplay(tqparentWidget);
-  screenNum = XScreenNumberOfScreen(XtScreen(tqparentWidget));
+  parentWidget = parentWidgetA;
+  display = XtDisplay(parentWidget);
+  screenNum = XScreenNumberOfScreen(XtScreen(parentWidget));
 
   paperColor = paperColorA;
   fullScreen = fullScreenA;
@@ -1364,7 +1364,7 @@ void XPDFCore::initWindow() {
   n = 0;
   XtSetArg(args[n], XmNscrollingPolicy, XmAPPLICATION_DEFINED); ++n;
   XtSetArg(args[n], XmNvisualPolicy, XmVARIABLE); ++n;
-  scrolledWin = XmCreateScrolledWindow(tqparentWidget, "scroll", args, n);
+  scrolledWin = XmCreateScrolledWindow(parentWidget, "scroll", args, n);
   XtManageChild(scrolledWin);
   n = 0;
   XtSetArg(args[n], XmNorientation, XmHORIZONTAL); ++n;
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
index 25c26f6b..4c250704 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.h
@@ -84,8 +84,8 @@ typedef GString *(*XPDFReqPasswordCbk)(void *data, GBool again);
 class XPDFCore {
 public:
 
-  // Create viewer core inside <tqparentWidgetA>.
-  XPDFCore(Widget shellA, Widget tqparentWidgetA,
+  // Create viewer core inside <parentWidgetA>.
+  XPDFCore(Widget shellA, Widget parentWidgetA,
 	   Gulong paperColorA, GBool fullScreenA, GBool reverseVideo,
 	   GBool installCmap, int rgbCubeSize);
 
@@ -229,7 +229,7 @@ private:
   Visual *visual;
   Colormap colormap;
   Widget shell;			// top-level shell containing the widget
-  Widget tqparentWidget;		// tqparent widget (not created by XPDFCore)
+  Widget parentWidget;		// tqparent 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 1ead3a27..3440bf1c 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
@@ -57,7 +57,7 @@ static void deleteChildFromList(XPDFTreeEntry *e, XPDFTreeEntry **listHead);
 static void createGC(Widget widget);
 static void destroyGC(Widget widget);
 static void tqlayout(Widget widget, Widget instigator);
-static int tqlayoutSubtree(XPDFTreeWidget w, Widget instigator,
+static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
 			 XPDFTreeEntry *e, Position x, Position y,
 			 Boolean visible);
 static void calcSize(Widget widget, Widget instigator,
@@ -189,7 +189,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
 #endif
     NULL,					// syn_constraint_resources
     0,						// num_syn_constraint_res's
-    XmInheritParentProcess,			// tqparent_process
+    XmInheritParentProcess,			// parent_process
     NULL					// extension
   },
   { // XPDFTree
@@ -446,7 +446,7 @@ static XtGeometryResult tqgeometryManager(Widget widget,
   XPDFTreeWidget w = (XPDFTreeWidget)XtParent(widget);
   XPDFTreeWidgetClass cls = (XPDFTreeWidgetClass)XtClass(w);
   Dimension curWidth, curHeight, curBW;
-  XtWidgetGeometry tqparentReq;
+  XtWidgetGeometry parentReq;
   XtGeometryResult result;
 
   // deny any requests for a new position
@@ -471,21 +471,21 @@ static XtGeometryResult tqgeometryManager(Widget widget,
   }
 
   // calculate the new ideal size
-  tqparentReq.width = 0;
-  tqparentReq.height = 0;
+  parentReq.width = 0;
+  parentReq.height = 0;
   if (cls->treeClass.calcSize) {
     (*cls->treeClass.calcSize)((Widget)w, widget,
-			       &tqparentReq.width, &reply->height);
+			       &parentReq.width, &reply->height);
   } else {
-    calcSize((Widget)w, widget, &tqparentReq.width, &reply->height);
+    calcSize((Widget)w, widget, &parentReq.width, &reply->height);
   }
 
   // send tqgeometry request to our tqparent
-  tqparentReq.request_mode = CWWidth | CWHeight;
+  parentReq.request_mode = CWWidth | CWHeight;
   if (request->request_mode & XtCWQueryOnly) {
-    tqparentReq.request_mode |= XtCWQueryOnly;
+    parentReq.request_mode |= XtCWQueryOnly;
   }
-  result = XtMakeGeometryRequest((Widget)w, &tqparentReq, NULL);
+  result = XtMakeGeometryRequest((Widget)w, &parentReq, NULL);
   if (result == XtGeometryAlmost) {
     result = XtGeometryNo;
   }
@@ -709,11 +709,11 @@ static void tqlayout(Widget widget, Widget instigator) {
   x = w->tree.marginWidth + xpdfTreeIndent;
   y = w->tree.marginHeight;
   for (e = w->tree.root; e; e = e->next) {
-    y = tqlayoutSubtree(w, instigator, e, x, y, True);
+    y = layoutSubtree(w, instigator, e, x, y, True);
   }
 }
 
-static int tqlayoutSubtree(XPDFTreeWidget w, Widget instigator,
+static int layoutSubtree(XPDFTreeWidget w, Widget instigator,
 			 XPDFTreeEntry *e, Position x, Position y,
 			 Boolean visible) {
   Widget ew;
@@ -748,7 +748,7 @@ static int tqlayoutSubtree(XPDFTreeWidget w, Widget instigator,
   // place this entry's tqchildren
   x += xpdfTreeIndent;
   for (child = e->tqchildren; child; child = child->next) {
-    y = tqlayoutSubtree(w, instigator, child, x, y,
+    y = layoutSubtree(w, instigator, child, x, y,
 		      visible && (!c || c->entryExpanded));
   }
 
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
index fecc2572..9f31f9e2 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTreeP.h
@@ -16,20 +16,20 @@ typedef void (*XPDFLayoutProc)(Widget widget, Widget instigator);
 typedef void (*XPDFCalcSizeProc)(Widget widget, Widget instigator,
 				 Dimension *totalWidth,
 				 Dimension *totalHeight);
-typedef Boolean (*XPDFNeedRetqlayoutProc)(Widget oldWidget, Widget newWidget);
+typedef Boolean (*XPDFNeedRelayoutProc)(Widget oldWidget, Widget newWidget);
 
 #define XPDFInheritCreateGC ((XtWidgetProc)_XtInherit)
 #define XPDFInheritDestroyGC ((XtWidgetProc)_XtInherit)
 #define XPDFInheritLayout ((XPDFLayoutProc)_XtInherit)
 #define XPDFInheritCalcSize ((XPDFCalcSizeProc)_XtInherit)
-#define XPDFInheritNeedRetqlayout ((XPDFNeedRetqlayoutProc)_XtInherit)
+#define XPDFInheritNeedRetqlayout ((XPDFNeedRelayoutProc)_XtInherit)
 
 typedef struct {
   XtWidgetProc createGC;
   XtWidgetProc destroyGC;
   XPDFLayoutProc tqlayout;
   XPDFCalcSizeProc calcSize;
-  XPDFNeedRetqlayoutProc needRetqlayout;
+  XPDFNeedRelayoutProc needRetqlayout;
   XtPointer extension;
 } XPDFTreeClassPart;
 
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index da43d2a4..67df3fd1 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -528,7 +528,7 @@ TQString RTFWorker::ProcessParagraphData ( const TQString &paraText,
 
     LayoutData styleLayout;
     markup += lookupStyle(tqlayout.styleName, styleLayout);
-    markup += tqlayoutToRtf(styleLayout,tqlayout,true);
+    markup += layoutToRtf(styleLayout,tqlayout,true);
 
     if ( 1==tqlayout.formatData.text.verticalAlignment )
     {
@@ -1035,7 +1035,7 @@ void RTFWorker::writeStyleData(void)
         if (count>0) // \s0 is not written out
             *m_streamOut << "\\s" << count;
 
-        *m_streamOut << tqlayoutToRtf((*it),(*it),true);
+        *m_streamOut << layoutToRtf((*it),(*it),true);
 
         // \snext must be the last keyword before the style name
         // Find the number of the following style
@@ -1458,13 +1458,13 @@ TQString RTFWorker::textFormatToRtf(const TextFormatting& formatOrigin,
     return strElement;
 }
 
-TQString RTFWorker::tqlayoutToRtf(const LayoutData& tqlayoutOrigin,
+TQString RTFWorker::layoutToRtf(const LayoutData& layoutOrigin,
     const LayoutData& tqlayout, const bool force)
 {
     TQString strLayout;
 
 
-    if (force || (tqlayoutOrigin.tqalignment!=tqlayout.tqalignment))
+    if (force || (layoutOrigin.tqalignment!=tqlayout.tqalignment))
     {
         if (tqlayout.tqalignment=="left")
             strLayout += "\\ql";
@@ -1486,40 +1486,40 @@ TQString RTFWorker::tqlayoutToRtf(const LayoutData& tqlayoutOrigin,
     }
 
     if ((tqlayout.indentLeft>=0.0)
-        && (force || (tqlayoutOrigin.indentLeft!=tqlayout.indentLeft)))
+        && (force || (layoutOrigin.indentLeft!=tqlayout.indentLeft)))
     {
        strLayout += "\\li";
        strLayout += TQString::number(int(tqlayout.indentLeft)*20, 10);
     }
 
     if ((tqlayout.indentRight>=0.0)
-        && (force || (tqlayoutOrigin.indentRight!=tqlayout.indentRight)))
+        && (force || (layoutOrigin.indentRight!=tqlayout.indentRight)))
     {
        strLayout += "\\ri";
        strLayout += TQString::number(int(tqlayout.indentRight)*20, 10);
     }
 
-    if (force || (tqlayoutOrigin.indentFirst!=tqlayout.indentFirst))
+    if (force || (layoutOrigin.indentFirst!=tqlayout.indentFirst))
     {
        strLayout += "\\fi";
        strLayout += TQString::number(int(tqlayout.indentFirst)*20, 10);
     }
 
     if ((tqlayout.marginBottom>=0.0)
-        && (force || (tqlayoutOrigin.marginBottom!=tqlayout.marginBottom)))
+        && (force || (layoutOrigin.marginBottom!=tqlayout.marginBottom)))
     {
        strLayout += "\\sa";
        strLayout += TQString::number(int(tqlayout.marginBottom)*20 ,10);
     }
 
     if ((tqlayout.marginTop>=0.0)
-        && (force || (tqlayoutOrigin.marginTop!=tqlayout.marginTop)))
+        && (force || (layoutOrigin.marginTop!=tqlayout.marginTop)))
     {
        strLayout += "\\sb";
        strLayout += TQString::number(int(tqlayout.marginTop)*20, 10);
     }
 
-    if (force || (tqlayoutOrigin.keepLinesTogether!=tqlayout.keepLinesTogether))
+    if (force || (layoutOrigin.keepLinesTogether!=tqlayout.keepLinesTogether))
     {
        if(tqlayout.keepLinesTogether) strLayout += "\\keep";
     }
@@ -1529,22 +1529,22 @@ TQString RTFWorker::tqlayoutToRtf(const LayoutData& tqlayoutOrigin,
     // - AbiWord's RTF import does not like \*\pgbrk
     // ### TODO: decide if we really remove this code
 #if 0
-    if (force || (tqlayoutOrigin.pageBreakBefore!=tqlayout.pageBreakBefore))
+    if (force || (layoutOrigin.pageBreakBefore!=tqlayout.pageBreakBefore))
     {
        if(tqlayout.pageBreakBefore) strLayout += "\\pagebb";
     }
 
     // Note: RTF doesn't specify "page break after"
     // \*\pgbrk0 is used after OpenOffice.org Writer
-    if (force || (tqlayoutOrigin.pageBreakAfter!=tqlayout.pageBreakAfter))
+    if (force || (layoutOrigin.pageBreakAfter!=tqlayout.pageBreakAfter))
     {
        if(tqlayout.pageBreakAfter) strLayout += "\\*\\pgbrk0";
     }
 #endif
 
     if (force
-        || ( tqlayoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
-        || ( tqlayoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
+        || ( layoutOrigin.lineSpacingType != tqlayout.lineSpacingType )
+        || ( layoutOrigin.lineSpacing != tqlayout.lineSpacing ) )
     {
         if ( tqlayout.lineSpacingType==LayoutData::LS_SINGLE  )
            ;// do nothing, single linespace is default in RTF
@@ -1570,7 +1570,7 @@ TQString RTFWorker::tqlayoutToRtf(const LayoutData& tqlayoutOrigin,
     }
 
     if (!tqlayout.tabulatorList.isEmpty()
-        && (force || (tqlayoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
+        && (force || (layoutOrigin.tabulatorList!=tqlayout.tabulatorList) ))
     {
         TabulatorList::ConstIterator it;
         for (it=tqlayout.tabulatorList.begin();it!=tqlayout.tabulatorList.end();++it)
@@ -1614,7 +1614,7 @@ TQString RTFWorker::tqlayoutToRtf(const LayoutData& tqlayoutOrigin,
     // TODO: borders
 
     // This must remain last, as it adds a terminating space.
-    strLayout+=textFormatToRtf(tqlayoutOrigin.formatData.text,
+    strLayout+=textFormatToRtf(layoutOrigin.formatData.text,
         tqlayout.formatData.text,force);
 
     return strLayout;
diff --git a/filters/kword/rtf/export/ExportFilter.h b/filters/kword/rtf/export/ExportFilter.h
index 77567980..88158efe 100644
--- a/filters/kword/rtf/export/ExportFilter.h
+++ b/filters/kword/rtf/export/ExportFilter.h
@@ -80,7 +80,7 @@ private:
     void writeStyleData(void);
     TQString textFormatToRtf(const TextFormatting& formatOrigin,
         const TextFormatting& formatData, const bool force);
-    TQString tqlayoutToRtf(const LayoutData& tqlayoutOrigin,
+    TQString layoutToRtf(const LayoutData& layoutOrigin,
         const LayoutData& tqlayout, const bool force);
     TQString lookupFont(const TQString& markup, const TQString& fontName);
     TQString lookupColor(const TQString& markup, const TQColor& color);
diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cc
index 0e023618..9a4ac58b 100644
--- a/filters/liboofilter/ooutils.cc
+++ b/filters/liboofilter/ooutils.cc
@@ -92,7 +92,7 @@ bool OoUtils::parseBorder(const TQString & tag, double * width, int * style, TQC
     return true;
 }
 
-void OoUtils::importIndents( TQDomElement& tqparentElement, const KoStyleStack& styleStack )
+void OoUtils::importIndents( TQDomElement& parentElement, const KoStyleStack& styleStack )
 {
     if ( styleStack.hasAttributeNS( ooNS::fo, "margin-left" ) || // 3.11.19
          styleStack.hasAttributeNS( ooNS::fo, "margin-right" ) )
@@ -111,19 +111,19 @@ void OoUtils::importIndents( TQDomElement& tqparentElement, const KoStyleStack&
 
         if ( marginLeft != 0 || marginRight != 0 || first != 0 )
         {
-            TQDomElement indent = tqparentElement.ownerDocument().createElement( "INDENTS" );
+            TQDomElement indent = parentElement.ownerDocument().createElement( "INDENTS" );
             if( marginLeft != 0 )
                 indent.setAttribute( "left", marginLeft );
             if( marginRight != 0 )
                 indent.setAttribute( "right", marginRight );
             if( first != 0 )
                 indent.setAttribute( "first", first );
-            tqparentElement.appendChild( indent );
+            parentElement.appendChild( indent );
         }
     }
 }
 
-void OoUtils::importLineSpacing( TQDomElement& tqparentElement, const KoStyleStack& styleStack )
+void OoUtils::importLineSpacing( TQDomElement& parentElement, const KoStyleStack& styleStack )
 {
     if( styleStack.hasAttributeNS( ooNS::fo, "line-height") )
     {
@@ -131,7 +131,7 @@ void OoUtils::importLineSpacing( TQDomElement& tqparentElement, const KoStyleSta
         TQString value = styleStack.attributeNS( ooNS::fo, "line-height" ); // 3.11.1
         if ( value != "normal" )
         {
-            TQDomElement lineSpacing = tqparentElement.ownerDocument().createElement( "LINESPACING" );
+            TQDomElement lineSpacing = parentElement.ownerDocument().createElement( "LINESPACING" );
 
             if ( value.endsWith("%" ) )
             {
@@ -153,7 +153,7 @@ void OoUtils::importLineSpacing( TQDomElement& tqparentElement, const KoStyleSta
                 kdWarning(30519) << "Unhandled value for fo:line-height: " << value << endl;
                 lineSpacing.setAttribute("type","single"); // fallback
             }
-            tqparentElement.appendChild( lineSpacing );
+            parentElement.appendChild( lineSpacing );
         }
     }
     // Line-height-at-least is mutually exclusive with line-height
@@ -165,10 +165,10 @@ void OoUtils::importLineSpacing( TQDomElement& tqparentElement, const KoStyleSta
         // Did we make the wrong choice in kotext?
         //kdWarning(30519) << "Unimplemented support for style:line-height-at-least: " << value << endl;
         // Well let's see if this makes a big difference.
-        TQDomElement lineSpacing = tqparentElement.ownerDocument().createElement("LINESPACING");
+        TQDomElement lineSpacing = parentElement.ownerDocument().createElement("LINESPACING");
         lineSpacing.setAttribute("type", "atleast");
         lineSpacing.setAttribute("spacingvalue", KoUnit::parseValue(value));
-        tqparentElement.appendChild(lineSpacing);
+        parentElement.appendChild(lineSpacing);
     }
     // Line-spacing is mutually exclusive with line-height and line-height-at-least
     else if ( styleStack.hasAttributeNS( ooNS::style, "line-spacing") ) // 3.11.3
@@ -176,16 +176,16 @@ void OoUtils::importLineSpacing( TQDomElement& tqparentElement, const KoStyleSta
         double value = KoUnit::parseValue( styleStack.attributeNS( ooNS::style, "line-spacing" ) );
         if ( value != 0.0 )
         {
-            TQDomElement lineSpacing = tqparentElement.ownerDocument().createElement( "LINESPACING" );
+            TQDomElement lineSpacing = parentElement.ownerDocument().createElement( "LINESPACING" );
             lineSpacing.setAttribute( "type", "custom" );
             lineSpacing.setAttribute( "spacingvalue", value );
-            tqparentElement.appendChild( lineSpacing );
+            parentElement.appendChild( lineSpacing );
         }
     }
 
 }
 
-void OoUtils::importTopBottomMargin( TQDomElement& tqparentElement, const KoStyleStack& styleStack )
+void OoUtils::importTopBottomMargin( TQDomElement& parentElement, const KoStyleStack& styleStack )
 {
     if( styleStack.hasAttributeNS( ooNS::fo, "margin-top") || // 3.11.22
         styleStack.hasAttributeNS( ooNS::fo, "margin-bottom"))
@@ -194,17 +194,17 @@ void OoUtils::importTopBottomMargin( TQDomElement& tqparentElement, const KoStyl
         double mbottom = KoUnit::parseValue( styleStack.attributeNS( ooNS::fo, "margin-bottom" ) );
         if( mtop != 0 || mbottom != 0 )
         {
-            TQDomElement offset = tqparentElement.ownerDocument().createElement( "OFFSETS" );
+            TQDomElement offset = parentElement.ownerDocument().createElement( "OFFSETS" );
             if( mtop != 0 )
                 offset.setAttribute( "before", mtop );
             if( mbottom != 0 )
                 offset.setAttribute( "after", mbottom );
-            tqparentElement.appendChild( offset );
+            parentElement.appendChild( offset );
         }
     }
 }
 
-void OoUtils::importTabulators( TQDomElement& tqparentElement, const KoStyleStack& styleStack )
+void OoUtils::importTabulators( TQDomElement& parentElement, const KoStyleStack& styleStack )
 {
     if ( !styleStack.hasChildNodeNS( ooNS::style, "tab-stops" ) ) // 3.11.10
         return;
@@ -216,7 +216,7 @@ void OoUtils::importTabulators( TQDomElement& tqparentElement, const KoStyleStac
         Q_ASSERT( tabStop.tagName() == "style:tab-stop" );
         TQString type = tabStop.attributeNS( ooNS::style, "type", TQString() ); // left, right, center or char
 
-        TQDomElement elem = tqparentElement.ownerDocument().createElement( "TABULATOR" );
+        TQDomElement elem = parentElement.ownerDocument().createElement( "TABULATOR" );
         int kOfficeType = 0;
         if ( type == "left" )
             kOfficeType = 0;
@@ -255,12 +255,12 @@ void OoUtils::importTabulators( TQDomElement& tqparentElement, const KoStyleStac
             }
             elem.setAttribute( "filling", filling );
         }
-        tqparentElement.appendChild( elem );
+        parentElement.appendChild( elem );
     }
 
 }
 
-void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack& styleStack )
+void OoUtils::importBorders( TQDomElement& parentElement, const KoStyleStack& styleStack )
 {
     if (styleStack.hasAttributeNS( ooNS::fo, "border","left"))
     {
@@ -269,7 +269,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
         TQColor color;
         if (OoUtils::parseBorder(styleStack.attributeNS( ooNS::fo, "border", "left"), &width, &style, &color))
         {
-            TQDomElement lbElem = tqparentElement.ownerDocument().createElement("LEFTBORDER");
+            TQDomElement lbElem = parentElement.ownerDocument().createElement("LEFTBORDER");
             lbElem.setAttribute("width", width);
             lbElem.setAttribute("style", style);
             if (color.isValid()) {
@@ -277,7 +277,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
                 lbElem.setAttribute("green", color.green());
                 lbElem.setAttribute("blue", color.blue());
             }
-            tqparentElement.appendChild(lbElem);
+            parentElement.appendChild(lbElem);
         }
     }
 
@@ -288,7 +288,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
         TQColor color;
         if (OoUtils::parseBorder(styleStack.attributeNS( ooNS::fo, "border", "right"), &width, &style, &color))
         {
-            TQDomElement lbElem = tqparentElement.ownerDocument().createElement("RIGHTBORDER");
+            TQDomElement lbElem = parentElement.ownerDocument().createElement("RIGHTBORDER");
             lbElem.setAttribute("width", width);
             lbElem.setAttribute("style", style);
             if (color.isValid()) {
@@ -296,7 +296,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
                 lbElem.setAttribute("green", color.green());
                 lbElem.setAttribute("blue", color.blue());
             }
-            tqparentElement.appendChild(lbElem);
+            parentElement.appendChild(lbElem);
         }
     }
 
@@ -307,7 +307,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
         TQColor color;
         if (OoUtils::parseBorder(styleStack.attributeNS( ooNS::fo, "border", "top"), &width, &style, &color))
         {
-            TQDomElement lbElem = tqparentElement.ownerDocument().createElement("TOPBORDER");
+            TQDomElement lbElem = parentElement.ownerDocument().createElement("TOPBORDER");
             lbElem.setAttribute("width", width);
             lbElem.setAttribute("style", style);
             if (color.isValid()) {
@@ -315,7 +315,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
                 lbElem.setAttribute("green", color.green());
                 lbElem.setAttribute("blue", color.blue());
             }
-            tqparentElement.appendChild(lbElem);
+            parentElement.appendChild(lbElem);
         }
     }
 
@@ -326,7 +326,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
         TQColor color;
         if (OoUtils::parseBorder(styleStack.attributeNS( ooNS::fo, "border", "bottom"), &width, &style, &color))
         {
-            TQDomElement lbElem = tqparentElement.ownerDocument().createElement("BOTTOMBORDER");
+            TQDomElement lbElem = parentElement.ownerDocument().createElement("BOTTOMBORDER");
             lbElem.setAttribute("width", width);
             lbElem.setAttribute("style", style);
             if (color.isValid()) {
@@ -334,7 +334,7 @@ void OoUtils::importBorders( TQDomElement& tqparentElement, const KoStyleStack&
                 lbElem.setAttribute("green", color.green());
                 lbElem.setAttribute("blue", color.blue());
             }
-            tqparentElement.appendChild(lbElem);
+            parentElement.appendChild(lbElem);
         }
     }
 }
diff --git a/filters/liboofilter/ooutils.h b/filters/liboofilter/ooutils.h
index 4619adcf..70de64c8 100644
--- a/filters/liboofilter/ooutils.h
+++ b/filters/liboofilter/ooutils.h
@@ -56,19 +56,19 @@ namespace OoUtils
     ///////// Paragraph properties /////////
 
     // Convert fo:margin-left, fo:margin-right and fo:text-indent to <INDENTS>
-    void importIndents( TQDomElement& tqparentElement, const KoStyleStack& styleStack );
+    void importIndents( TQDomElement& parentElement, const KoStyleStack& styleStack );
 
     // Convert fo:line-height, style:line-height-at-least and style:line-spacing to <LINESPACING>
-    void importLineSpacing( TQDomElement& tqparentElement, const KoStyleStack& styleStack );
+    void importLineSpacing( TQDomElement& parentElement, const KoStyleStack& styleStack );
 
     // Convert fo:margin-top and fo:margin-bottom to <OFFSETS>
-    void importTopBottomMargin( TQDomElement& tqparentElement, const KoStyleStack& styleStack );
+    void importTopBottomMargin( TQDomElement& parentElement, const KoStyleStack& styleStack );
 
     // Convert style:tab-stops to <TABULATORS>
-    void importTabulators( TQDomElement& tqparentElement, const KoStyleStack& styleStack );
+    void importTabulators( TQDomElement& parentElement, const KoStyleStack& styleStack );
 
     // Convert fo:border* to <*BORDER>
-    void importBorders( TQDomElement& tqparentElement, const KoStyleStack& styleStack );
+    void importBorders( TQDomElement& parentElement, const KoStyleStack& styleStack );
 
     /////////// Text properties ///////////
 
diff --git a/filters/xsltfilter/export/xsltdialog.ui b/filters/xsltfilter/export/xsltdialog.ui
index cacf710f..a52e922c 100644
--- a/filters/xsltfilter/export/xsltdialog.ui
+++ b/filters/xsltfilter/export/xsltdialog.ui
@@ -217,5 +217,5 @@
     <slot>chooseCommonSlot()</slot>
     <slot>okSlot()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filters/xsltfilter/import/xsltdialog.ui b/filters/xsltfilter/import/xsltdialog.ui
index cacf710f..a52e922c 100644
--- a/filters/xsltfilter/import/xsltdialog.ui
+++ b/filters/xsltfilter/import/xsltdialog.ui
@@ -217,5 +217,5 @@
     <slot>chooseCommonSlot()</slot>
     <slot>okSlot()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/interfaces/koChart.cc b/interfaces/koChart.cc
index 20d576ad..0037d60b 100644
--- a/interfaces/koChart.cc
+++ b/interfaces/koChart.cc
@@ -32,10 +32,10 @@ WizardExtension::~WizardExtension()
 {
 }
 
-Part::Part( TQWidget *tqparentWidget, const char *widgetName,
+Part::Part( TQWidget *parentWidget, const char *widgetName,
             TQObject *tqparent, const char *name,
             bool singleViewMode )
-    : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
 {
 }
 
diff --git a/interfaces/koChart.h b/interfaces/koChart.h
index b185b9c3..af6623d7 100644
--- a/interfaces/koChart.h
+++ b/interfaces/koChart.h
@@ -62,7 +62,7 @@ namespace KoChart
         Q_OBJECT
   TQ_OBJECT
     public:
-        Part( TQWidget *tqparentWidget, const char *widgetName,
+        Part( TQWidget *parentWidget, const char *widgetName,
               TQObject *tqparent, const char *name,
               bool singleViewMode = false );
 
diff --git a/karbon/commands/vdeletenodescmd.cc b/karbon/commands/vdeletenodescmd.cc
index c16ac497..d1f7c979 100644
--- a/karbon/commands/vdeletenodescmd.cc
+++ b/karbon/commands/vdeletenodescmd.cc
@@ -52,7 +52,7 @@ VDeleteNodeCmd::visitVSubpath( VSubpath& path )
 		segment = segment->next();
 	}
 	if( m_segments.count() > 0 )
-		path.tqinvalidateBoundingBox();
+		path.invalidateBoundingBox();
 }
 
 void
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc
index 5cb08953..f0173920 100644
--- a/karbon/commands/vtransformcmd.cc
+++ b/karbon/commands/vtransformcmd.cc
@@ -195,7 +195,7 @@ VTransformCmd::visitVSubpath( VSubpath& path )
 		segment = segment->next();
 	}
 
-	path.tqinvalidateBoundingBox();
+	path.invalidateBoundingBox();
 }
 
 void
@@ -217,7 +217,7 @@ VTransformCmd::visitVText( VText& text )
 		visit( *itr.current() );
 	}
 
-	text.tqinvalidateBoundingBox();
+	text.invalidateBoundingBox();
 }
 
 void
@@ -343,7 +343,7 @@ VTranslateBezierCmd::execute()
 	}
 
 	if( m_subpath )
-		m_subpath->tqinvalidateBoundingBox();
+		m_subpath->invalidateBoundingBox();
 
 	setSuccess( true );
 }
@@ -487,5 +487,5 @@ VTranslatePointCmd::translatePoints()
 	// tqinvalidate all changed subpaths
 	VObjectListIterator itr( m_subpaths );
 	for( ; itr.current(); ++itr )
-		itr.current()->tqinvalidateBoundingBox();
+		itr.current()->invalidateBoundingBox();
 }
diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cc
index 5f238898..e1e00531 100644
--- a/karbon/commands/vungroupcmd.cc
+++ b/karbon/commands/vungroupcmd.cc
@@ -64,7 +64,7 @@ VUnGroupCmd::execute()
 
 		for ( ; itr.current() ; ++itr )
 		{
-			itr.current()->tqinvalidateBoundingBox();
+			itr.current()->invalidateBoundingBox();
 			tqparent->append( itr.current() );
 		}
 
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index 8a426577..ab2ec328 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cc
@@ -365,7 +365,7 @@ VGroup::take( const VObject& object )
 {
 	m_objects.removeRef( &object );
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 void
@@ -375,7 +375,7 @@ VGroup::append( VObject* object )
 
 	m_objects.append( object );
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 void
@@ -385,7 +385,7 @@ VGroup::insertInfrontOf( VObject* newObject, VObject* oldObject )
 
 	m_objects.insert( m_objects.tqfind( oldObject ), newObject );
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 void
@@ -393,6 +393,6 @@ VGroup::clear()
 {
 	m_objects.clear();
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
diff --git a/karbon/core/vobject.cc b/karbon/core/vobject.cc
index 2f9333ac..5e9f74b6 100644
--- a/karbon/core/vobject.cc
+++ b/karbon/core/vobject.cc
@@ -41,7 +41,7 @@ VObject::VObject( VObject* tqparent, VState state ) : m_dcop( 0L )
 	m_parent = tqparent;
 	m_state = state;
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 VObject::VObject( const VObject& obj )
@@ -52,7 +52,7 @@ VObject::VObject( const VObject& obj )
 	m_parent = obj.m_parent;
 	m_state = obj.m_state;
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 	m_dcop = 0L;
 
 	VDocument *srcDoc = obj.document();
@@ -205,7 +205,7 @@ VObject::addStyles( const TQDomElement* style, KoOasisLoadingContext & context )
 {
 	if(style)
 	{
-		// this function is necessary as tqparent styles can have tqparents themself
+		// 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 );
 		context.addStyles( style, "style-name" );
diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h
index 93a3ab1f..7cbbb0e9 100644
--- a/karbon/core/vobject.h
+++ b/karbon/core/vobject.h
@@ -124,12 +124,12 @@ public:
 	 * This function is public so visitors can access it themself at the right
 	 * time when they manipulate many VSegments.
 	 */
-	void tqinvalidateBoundingBox()
+	void invalidateBoundingBox()
 	{
 		m_boundingBoxIsInvalid = true;
 
 		if( m_parent )
-			m_parent->tqinvalidateBoundingBox();
+			m_parent->invalidateBoundingBox();
 	}
 
 	/**
diff --git a/karbon/core/vobject_iface.h b/karbon/core/vobject_iface.h
index e4a645ca..e3a081d3 100644
--- a/karbon/core/vobject_iface.h
+++ b/karbon/core/vobject_iface.h
@@ -44,7 +44,7 @@ k_dcop:
 	const KoRect& boundingBox() const { return m_boundingBox; }
 
 	bool boundingBoxIsInvalid() const;
-	void tqinvalidateBoundingBox();
+	void invalidateBoundingBox();
 	void setParent( VObject* tqparent ) { m_parent = tqparent; }*/
 
 	DCOPRef tqparent() const;
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc
index 88baa8fe..a198eb52 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cc
@@ -820,7 +820,7 @@ VSubpath::insert( const VSegment* segment )
 	m_current = s;
 	++m_number;
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 
 	return true;
 }
@@ -856,7 +856,7 @@ VSubpath::insert( uint index, const VSegment* segment )
 	m_current = s;
 	++m_number;
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 
 	return true;
 }
@@ -878,7 +878,7 @@ VSubpath::prepend( const VSegment* segment )
 	++m_number;
 	m_currentIndex = 0;
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 void
@@ -898,7 +898,7 @@ VSubpath::append( const VSegment* segment )
 	m_currentIndex = m_number;
 	++m_number;
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 void
@@ -924,7 +924,7 @@ VSubpath::clear()
 
 	m_isClosed = false;
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 VSegment*
diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cc
index 30398ec4..b7cc2167 100644
--- a/karbon/core/vselection.cc
+++ b/karbon/core/vselection.cc
@@ -79,7 +79,7 @@ VSelection::take( VObject& object )
 	m_objects.removeRef( &object );
 	if( object.state() >= selected )
 		object.setState( normal );
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 bool
@@ -112,7 +112,7 @@ VSelection::take( const KoRect& rect, bool selectObjects, bool exclusive )
 		}
 	}
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 
 	return success;
 }
@@ -126,7 +126,7 @@ VSelection::append()
 	op.visit( *static_cast<VDocument*>( tqparent() ) );
 	selectNodes();
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 void
@@ -138,7 +138,7 @@ VSelection::append( VObject* object )
 		if( ! m_objects.tqcontainsRef( object ) )
 			m_objects.append( object );
 		object->setState( selected );
-		tqinvalidateBoundingBox();
+		invalidateBoundingBox();
 	}
 }
 
@@ -186,7 +186,7 @@ VSelection::append( const KoRect& rect, bool selectObjects, bool exclusive )
 			take( *( jtr.current() ) );
 	}
 
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 
 	return success;
 }
@@ -206,7 +206,7 @@ VSelection::clear()
 	}
 
 	m_objects.clear();
-	tqinvalidateBoundingBox();
+	invalidateBoundingBox();
 }
 
 void
diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc
index 0fe49e99..043f4e27 100644
--- a/karbon/core/vstroke.cc
+++ b/karbon/core/vstroke.cc
@@ -69,7 +69,7 @@ VStroke::setLineWidth( float width )
 
 	// tell our tqparent so he can update his bbox:
 	if( m_parent )
-		m_parent->tqinvalidateBoundingBox();
+		m_parent->invalidateBoundingBox();
 }
 
 void
@@ -241,7 +241,7 @@ VStroke::operator=( const VStroke& stroke )
 		m_lineWidth = stroke.m_lineWidth;
 		// Tell our tqparent about the linewidth change, so he can update his bbox:
 		//if( m_parent )
-		//	m_parent->tqinvalidateBoundingBox();
+		//	m_parent->invalidateBoundingBox();
 
 		m_lineCap = stroke.m_lineCap;
 		m_lineJoin = stroke.m_lineJoin;
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 84ed5200..a0cba13b 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -1005,7 +1005,7 @@ VLayersTab::removeDeletedObjectsFromList()
 
 	// iterate over all object items and delete the following items:
 	// - items representing deleted objects
-	// - items with objects objects that changed tqparents
+	// - items with objects objects that changed parents
 	// BEWARE: when deleting an item, the iterator is automatically incremented
 	for(; it.current(); )
 	{
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index d8356184..041de7ff 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -76,7 +76,7 @@ KarbonFactory::~KarbonFactory()
 }
 
 KParts::Part*
-KarbonFactory::createPartObject( TQWidget* tqparentWidget, const char* widgetName,
+KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
 								 TQObject* tqparent, const char* name, const char* classname, const TQStringList& )
 {
 	// If classname is "KoDocument", our host is a koffice application
@@ -84,10 +84,10 @@ KarbonFactory::createPartObject( TQWidget* tqparentWidget, const char* widgetNam
 	// single view.
 	bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-	// tqparentWidget and widgetName are used by KoDocument for the
+	// parentWidget and widgetName are used by KoDocument for the
 	// "readonly+singleView" case.
 	KarbonPart* part =
-		new KarbonPart( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+		new KarbonPart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
 	if( !bWantKoDocument )
 		part->setReadWrite( false );
diff --git a/karbon/karbon_factory.h b/karbon/karbon_factory.h
index 308bc603..436faa2c 100644
--- a/karbon/karbon_factory.h
+++ b/karbon/karbon_factory.h
@@ -37,7 +37,7 @@ public:
 	KarbonFactory( TQObject* tqparent = 0, const char* name = 0 );
 	~KarbonFactory();
 
-	virtual KParts::Part* createPartObject( TQWidget *tqparentWidget = 0,
+	virtual KParts::Part* createPartObject( TQWidget *parentWidget = 0,
 											const char* widgetName = 0L, TQObject* tqparent = 0L, const char* name = 0L,
 											const char* classname = "KoDocument", const TQStringList& args = TQStringList() );
 
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 90f10117..7aa145d3 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -57,9 +57,9 @@
 // Make sure an appropriate DTD is available in www/koffice/DTD if changing this value
 // static const char * CURRENT_DTD_VERSION = "1.2";
 
-KarbonPart::KarbonPart( TQWidget* tqparentWidget, const char* widgetName,
+KarbonPart::KarbonPart( TQWidget* parentWidget, const char* widgetName,
 						TQObject* tqparent, const char* name, bool singleViewMode )
-		: KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+		: KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
 {
 	setInstance( KarbonFactory::instance(), false );
 	setTemplateType( "karbon_template" );
@@ -118,7 +118,7 @@ KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit )
 }
 
 bool
-KarbonPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+KarbonPart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
         if (flags==KoDocument::InitDocEmpty)
         {
@@ -133,7 +133,7 @@ KarbonPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
         else
             dlgtype = KoTemplateChooseDia::OnlyTemplates;
 
-	result = KoTemplateChooseDia::choose( KarbonFactory::instance(), file, dlgtype, "karbon_template", tqparentWidget );
+	result = KoTemplateChooseDia::choose( KarbonFactory::instance(), file, dlgtype, "karbon_template", parentWidget );
 
 	if( result == KoTemplateChooseDia::Template )
 	{
@@ -369,9 +369,9 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
     KoGenStyles mainStyles;
 
     KoGenStyle pageLayout = m_pageLayout.saveOasis();
-    TQString tqlayoutName = mainStyles.lookup( pageLayout, "PL" );
+    TQString layoutName = mainStyles.lookup( pageLayout, "PL" );
     KoGenStyle masterPage( KoGenStyle::STYLE_MASTER );
-    masterPage.addAttribute( "style:page-tqlayout-name", tqlayoutName );
+    masterPage.addAttribute( "style:page-tqlayout-name", layoutName );
     mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering );
 
     KTempFile contentTmpFile;
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index 85e9902f..762f9985 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -47,7 +47,7 @@ class KARBONCOMMON_EXPORT KarbonPart : public KoDocument
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KarbonPart( TQWidget* tqparentWidget = 0L, const char* widgetName = 0L,
+	KarbonPart( TQWidget* parentWidget = 0L, const char* widgetName = 0L,
 				TQObject* tqparent = 0L, const char* name = 0L, bool singleViewMode = false );
 	virtual ~KarbonPart();
 
@@ -55,7 +55,7 @@ public:
 							   bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
 
 	/// standard koDocument inherited methods
-	virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+	virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
 	/// file-> open calls this method
 	virtual bool loadXML( TQIODevice*, const TQDomDocument& document );
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc
index 7e18fb12..39739e68 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cc
@@ -395,7 +395,7 @@ VRoundCornersCmd::visitVSubpath( VSubpath& path )
 	path = newPath;
 
 	// Invalidate bounding box once.
-	path.tqinvalidateBoundingBox();
+	path.invalidateBoundingBox();
 }
 
 #include "roundcornersplugin.moc"
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cc b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
index 6795f9d6..9ad72ed5 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.cc
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
@@ -192,7 +192,7 @@ VWhirlPinchCmd::visitVSubpath( VSubpath& path )
 	}
 
 	// Invalidate bounding box once.
-	path.tqinvalidateBoundingBox();
+	path.invalidateBoundingBox();
 }
 
 #include "whirlpinchplugin.moc"
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
index f8f890e3..be1a839c 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
@@ -320,23 +320,23 @@ gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
 
  * @pixbuf: A pixbuf.
  * @pixmap_return: Return value for the created pixmap.
- * @tqmask_return: Return value for the created tqmask.
+ * @mask_return: Return value for the created tqmask.
  * @alpha_threshold: Threshold value for opacity values.
  *
  * Creates a pixmap and a tqmask bitmap which are returned in the @pixmap_return
- * and @tqmask_return arguments, respectively, and renders a pixbuf and its
+ * and @mask_return arguments, respectively, and renders a pixbuf and its
  * corresponding tresholded alpha tqmask 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
  * gdk_pixbuf_xlib_render_threshold_alpha().
  *
- * If the pixbuf does not have an alpha channel, then *@tqmask_return will be set
+ * 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,
 					Pixmap *pixmap_return,
-					Pixmap *tqmask_return,
+					Pixmap *mask_return,
 					int alpha_threshold)
 {
         g_return_if_fail (pixbuf != NULL);
@@ -361,20 +361,20 @@ gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
 		XFreeGC (gdk_pixbuf_dpy, gc);
 	}
 
-	if (tqmask_return) {
+	if (mask_return) {
 		if (pixbuf->has_alpha) {
-		    *tqmask_return = XCreatePixmap (gdk_pixbuf_dpy,
+		    *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
 						  RootWindow (gdk_pixbuf_dpy,
 							      gdk_pixbuf_screen),
 						  pixbuf->width,
 						  pixbuf->height, 1);
 		    gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
-							    *tqmask_return,
+							    *mask_return,
 							    0, 0, 0, 0,
 							    pixbuf->width,
 							    pixbuf->height,
 							    alpha_threshold);
 		} else
-			*tqmask_return = 0;
+			*mask_return = 0;
 	}
 }*/
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
index 26d2426a..63961ea7 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
@@ -65,7 +65,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
 
 void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
 					     Pixmap *pixmap_return,
-					     Pixmap *tqmask_return,
+					     Pixmap *mask_return,
 					     int alpha_threshold);
 
 
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c b/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c
index 5c6c6ae0..171db33d 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c
@@ -930,7 +930,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
 	  static_image[i]->byte_order = MSBFirst;
 	}
       }
-      /* ok, so aptqparently, image_info->bpp is actually
+      /* ok, so apparently, image_info->bpp is actually
 	 BYTES per pixel.  What fun! */
       switch (static_image[0]->bits_per_pixel) {
       case 1:
diff --git a/kchart/csvimportdialogui.ui b/kchart/csvimportdialogui.ui
index 1c28e67e..a061c0cc 100644
--- a/kchart/csvimportdialogui.ui
+++ b/kchart/csvimportdialogui.ui
@@ -595,7 +595,7 @@
         </widget>
     </widget>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index 3d653c31..825bca94 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -161,13 +161,13 @@ KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams
                            "be used as a background tile. If the image is "
                            "larger then the selected area, you will only see "
                            "the upper left part of it." ) );
-    TQButtonGroup* tqalignmentBG;
-    tqalignmentBG = new TQButtonGroup( right, "GroupBox_Alignment" );
-    tqalignmentBG->setFrameStyle( TQFrame::NoFrame );
-    tqalignmentBG->insert( stretchedRB );
-    tqalignmentBG->insert( scaledRB );
-    tqalignmentBG->insert( centeredRB );
-    tqalignmentBG->insert( tiledRB );
+    TQButtonGroup* alignmentBG;
+    alignmentBG = new TQButtonGroup( right, "GroupBox_Alignment" );
+    alignmentBG->setFrameStyle( TQFrame::NoFrame );
+    alignmentBG->insert( stretchedRB );
+    alignmentBG->insert( scaledRB );
+    alignmentBG->insert( centeredRB );
+    alignmentBG->insert( tiledRB );
 
     intensitySB->hide(); //the property doesn't work atm
 }
diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc
index a9324f24..576be3bd 100644
--- a/kchart/kchart_factory.cc
+++ b/kchart/kchart_factory.cc
@@ -37,7 +37,7 @@ KChartFactory::~KChartFactory()
 }
 
 
-KParts::Part* KChartFactory::createPartObject( TQWidget *tqparentWidget,
+KParts::Part* KChartFactory::createPartObject( TQWidget *parentWidget,
 					       const char *widgetName,
 					       TQObject* tqparent,
 					       const char* name,
@@ -46,7 +46,7 @@ KParts::Part* KChartFactory::createPartObject( TQWidget *tqparentWidget,
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KChartPart *part = new KChartPart( tqparentWidget, widgetName, tqparent, name,
+    KChartPart *part = new KChartPart( parentWidget, widgetName, tqparent, name,
 				       !bWantKoDocument );
 
     if ( !bWantKoDocument )
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index 483c7e22..a2728b6b 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -50,12 +50,12 @@ using namespace std;
 namespace KChart
 {
 
-KChartPart::KChartPart( TQWidget *tqparentWidget, const char *widgetName,
+KChartPart::KChartPart( TQWidget *parentWidget, const char *widgetName,
 			TQObject* tqparent, const char* name,
 			bool singleViewMode )
-  : KoChart::Part( tqparentWidget, widgetName, tqparent, name, singleViewMode ),
+  : KoChart::Part( parentWidget, widgetName, tqparent, name, singleViewMode ),
     m_params( 0 ),
-    m_parentWidget( tqparentWidget ),
+    m_parentWidget( parentWidget ),
     m_rowLabels(), m_colLabels()
 {
     kdDebug(35001) << "Constructor started!" << endl;
@@ -102,7 +102,7 @@ KChartPart::~KChartPart()
 
 // Reimplement KoDocument::initDoc()
 
-bool KChartPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KChartPart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
     // Initialize the parameter set for this chart document
 #if 0
@@ -140,7 +140,7 @@ bool KChartPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
 	dlgtype = KoTemplateChooseDia::Everything;
     ret = KoTemplateChooseDia::choose( KChartFactory::global(), f,
                                        dlgtype, "kchart_template",
-				       tqparentWidget );
+				       parentWidget );
 
     if ( ret == KoTemplateChooseDia::File ) {
 	KURL url( f );
diff --git a/kchart/kchart_part.h b/kchart/kchart_part.h
index effafa06..343a97f1 100644
--- a/kchart/kchart_part.h
+++ b/kchart/kchart_part.h
@@ -26,14 +26,14 @@ class KCHART_EXPORT KChartPart : public KoChart::Part
   TQ_OBJECT
 
 public:
-    KChartPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+    KChartPart( TQWidget *parentWidget = 0, const char *widgetName = 0,
 		TQObject* tqparent = 0, const char* name = 0,
 		bool singleViewMode = false );
     ~KChartPart();
 
     // Methods inherited from KoDocument:
 
-    virtual bool  initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool  initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
     virtual void  paintContent( TQPainter& painter, const TQRect& rect,
 				bool transparent = false,
diff --git a/kchart/kdchart/KDChartCustomBox.h b/kchart/kdchart/KDChartCustomBox.h
index e57110a5..17b47822 100644
--- a/kchart/kdchart/KDChartCustomBox.h
+++ b/kchart/kdchart/KDChartCustomBox.h
@@ -216,7 +216,7 @@ public:
                       uint data3rd = 0,
                       uint deltaAlign = KDCHART_AlignAuto,
                       bool deltaScaleGlobal = true,
-                      int tqparentAxis = -1 )
+                      int parentAxis = -1 )
         : _rotation( 0 ),
           _fontSize( fontSize ),
           _fontScaleGlobal( fontScaleGlobal ),
@@ -235,7 +235,7 @@ public:
           _deltaAlign( deltaAlign ),
           _deltaScaleGlobal( deltaScaleGlobal ),
           _anchorBeingCalculated( false ),
-          _parentAxisArea(  tqparentAxis )
+          _parentAxisArea(  parentAxis )
     {
         _content.deepCopy( &content );
     }
@@ -338,7 +338,7 @@ public:
                       uint data3rd = 0,
                       uint deltaAlign = KDCHART_AlignAuto,
                       bool deltaScaleGlobal = true,
-                      int tqparentAxis = -1 )
+                      int parentAxis = -1 )
         : _rotation( rotation ),
           _fontSize( fontSize ),
           _fontScaleGlobal( fontScaleGlobal ),
@@ -357,7 +357,7 @@ public:
           _deltaAlign( deltaAlign ),
           _deltaScaleGlobal( deltaScaleGlobal ),
           _anchorBeingCalculated( false ),
-          _parentAxisArea(  tqparentAxis )
+          _parentAxisArea(  parentAxis )
     {
         _content.deepCopy( &content );
     }
@@ -974,13 +974,13 @@ protected:
         return _anchorBeingCalculated;
     }
 
-    void setParentAxisArea( int tqparentAxis ) const
+    void setParentAxisArea( int parentAxis ) const
     {
         KDChartCustomBox* that = const_cast<KDChartCustomBox*>(this);
-        that->_parentAxisArea = tqparentAxis;
+        that->_parentAxisArea = parentAxis;
     }
 
-    int tqparentAxisArea() const
+    int parentAxisArea() const
     {
         return _parentAxisArea;
     }
diff --git a/kchart/kdchart/KDChartEnums.h b/kchart/kdchart/KDChartEnums.h
index c506b39a..82956e8c 100644
--- a/kchart/kdchart/KDChartEnums.h
+++ b/kchart/kdchart/KDChartEnums.h
@@ -77,7 +77,7 @@ public:
       \param type the text tqlayout policy to convert
       \return the string representation of the text tqlayout policy enum
       */
-    static TQString tqlayoutPolicyToString( TextLayoutPolicy type ) {
+    static TQString layoutPolicyToString( TextLayoutPolicy type ) {
         switch( type ) {
             case LayoutJustOverwrite:
                 return "JustOverwrite";
diff --git a/kchart/kdchart/KDChartPainter.cpp b/kchart/kdchart/KDChartPainter.cpp
index f68b8ffe..987857aa 100644
--- a/kchart/kdchart/KDChartPainter.cpp
+++ b/kchart/kdchart/KDChartPainter.cpp
@@ -1140,13 +1140,13 @@ TQRect KDChartPainter::calculateAreaRect( bool & allCustomBoxes,
                                                              break;
 
         default: {
-                     uint tqmaskBASE = KDChartEnums::AreaBASEMask & area;
-                     pos = area - tqmaskBASE;
-                     if ( KDChartEnums::AreaAxisBASE == tqmaskBASE ) {
+                     uint maskBASE = KDChartEnums::AreaBASEMask & area;
+                     pos = area - maskBASE;
+                     if ( KDChartEnums::AreaAxisBASE == maskBASE ) {
                          rect = params()->axisParams( pos ).axisTrueAreaRect();
-                     } else if ( KDChartEnums::AreaHdFtBASE == tqmaskBASE ) {
+                     } else if ( KDChartEnums::AreaHdFtBASE == maskBASE ) {
                          rect = params()->headerFooterRect( pos );
-                     } else if ( KDChartEnums::AreaCustomBoxesBASE == tqmaskBASE ) {
+                     } else if ( KDChartEnums::AreaCustomBoxesBASE == maskBASE ) {
                          const KDChartCustomBox * box = params()->customBox( pos );
                          if( box ) {
                              rect = box->trueRect( calculateAnchor( *box, regions ),
@@ -2011,10 +2011,10 @@ void KDChartPainter::calculateAllAxesRects(
              for( idx = 0; idx <= params()->maxCustomBoxIdx(); ++idx ) {
                  const KDChartCustomBox * box = params()->customBox( idx );
                  if (  box )
-                     if ( box->tqparentAxisArea() == KDChartAxisParams::AxisPosBottom
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosLeft
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosTop
-                          || box->tqparentAxisArea() == KDChartAxisParams::AxisPosRight )
+                     if ( box->parentAxisArea() == KDChartAxisParams::AxisPosBottom
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosLeft
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosTop
+                          || box->parentAxisArea() == KDChartAxisParams::AxisPosRight )
                       boxSize = box->trueRect(TQPoint( 0,0 ), _areaWidthP1000, _areaHeightP1000 ).height();
              }
 
diff --git a/kchart/kdchart/KDChartParams.cpp b/kchart/kdchart/KDChartParams.cpp
index 4c7bd871..7306cfe0 100644
--- a/kchart/kdchart/KDChartParams.cpp
+++ b/kchart/kdchart/KDChartParams.cpp
@@ -1041,7 +1041,7 @@ calculation of appropriate rotation for each data value.  Rotation
 will be performed around the internal <b>tqalignment point</b> of the
 text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
 
-\param tqlayoutPolicy The way to handle too narrow space conflicts:
+\param layoutPolicy The way to handle too narrow space conflicts:
 what to do if a data text covers a neighboring data text (or a
         neighboring data area, resp.).
 
diff --git a/kchart/kdchart/KDChartParams_io.cpp b/kchart/kdchart/KDChartParams_io.cpp
index 0006451d..3a3d637d 100644
--- a/kchart/kdchart/KDChartParams_io.cpp
+++ b/kchart/kdchart/KDChartParams_io.cpp
@@ -923,7 +923,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
 
         KDXML::createStringNode( doc, dataValuesSettings1Element,
                 "LayoutPolicy",
-                KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) );
+                KDChartEnums::layoutPolicyToString( _printDataValuesSettings._dataValuesLayoutPolicy ) );
 
         KDXML::createBoolNode( doc, dataValuesSettings1Element, "ShowInfinite",
                                _printDataValuesSettings._dataValuesShowInfinite );
@@ -983,7 +983,7 @@ TQDomDocument KDChartParams::saveXML( bool withPI ) const
 
         KDXML::createStringNode( doc, dataValuesSettings2Element,
                 "LayoutPolicy",
-                KDChartEnums::tqlayoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) );
+                KDChartEnums::layoutPolicyToString( _printDataValuesSettings2._dataValuesLayoutPolicy ) );
 
         KDXML::createBoolNode( doc, dataValuesSettings2Element, "ShowInfinite",
                                _printDataValuesSettings2._dataValuesShowInfinite );
diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp
index f3bc91a2..9b226637 100644
--- a/kdgantt/KDGanttMinimizeSplitter.cpp
+++ b/kdgantt/KDGanttMinimizeSplitter.cpp
@@ -91,7 +91,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e )
     if ( _activeButton != 0)
         return;
 
-    TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
+    TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
 		 - mouseOffset;
     if ( opaque() ) {
 	s->moveSplitter( pos, id() );
@@ -160,7 +160,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e )
     }
     else {
         if ( !opaque() && e->button() == Qt::LeftButton ) {
-            TQCOORD pos = s->pick(tqparentWidget()->mapFromGlobal(e->globalPos()))
+            TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos()))
                 - mouseOffset;
             s->setRubberband( -1 );
             s->moveSplitter( pos, id() );
@@ -242,8 +242,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     p.setBrush( tqcolorGroup().background() );
     p.setPen( tqcolorGroup().foreground() );
     p.drawRect( rect() );
-    tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
-                                           tqparentWidget()->tqcolorGroup());
+    parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, rect(),
+                                           parentWidget()->tqcolorGroup());
 
     int sw = 8; // Hardcoded, given I didn't use styles anymore, I didn't like to use their size
 
@@ -257,8 +257,8 @@ void KDGanttSplitterHandle::paintEvent( TQPaintEvent * )
     for ( TQValueList<TQPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) {
         if ( index == _activeButton ) {
             p.save();
-            p.translate( tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
-                         tqparentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
+            p.translate( parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal ),
+                         parentWidget()->tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical ) );
             p.tqdrawPolygon( *it, true );
             p.restore();
         }
@@ -963,7 +963,7 @@ void KDGanttMinimizeSplitter::recalc( bool update )
 	}
     }
     if ( empty ) {
-        if ( tqparentWidget() != 0 && tqparentWidget()->inherits("KDGanttMinimizeSplitter") ) {
+        if ( parentWidget() != 0 && parentWidget()->inherits("KDGanttMinimizeSplitter") ) {
             // nested splitters; be nice
             maxl = maxt = 0;
         } else {
@@ -1342,7 +1342,7 @@ KDGanttMinimizeSplitter::Direction KDGanttMinimizeSplitter::minimizeDirection()
 }
 
 /*
-  This is a copy of qGeomCalc() in qtqlayoutengine.cpp which
+  This is a copy of qGeomCalc() in qlayoutengine.cpp which
   unfortunately isn't exported.
 */
 static inline int toFixed( int i ) { return i * 256; }
diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp
index 478c478f..9191faaf 100644
--- a/kdgantt/KDGanttView.cpp
+++ b/kdgantt/KDGanttView.cpp
@@ -698,9 +698,9 @@ void KDGanttView::setShowListView( bool show )
     if(listViewIsVisible == show) return;
     listViewIsVisible = show;
     if (listViewIsVisible)
-        myListView->tqparentWidget()->show();
+        myListView->parentWidget()->show();
     else
-        myListView->tqparentWidget()->hide();
+        myListView->parentWidget()->hide();
 }
 
 
diff --git a/kdgantt/KDGanttViewEventItem.cpp b/kdgantt/KDGanttViewEventItem.cpp
index 38c1e767..7d70a6e2 100644
--- a/kdgantt/KDGanttViewEventItem.cpp
+++ b/kdgantt/KDGanttViewEventItem.cpp
@@ -209,7 +209,7 @@ void KDGanttViewEventItem::hideMe()
 void KDGanttViewEventItem::showItem(bool show, int coordY)
 {
   isVisibleInGanttView = show;
-  tqinvalidateHeight () ;
+  invalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp
index 4421517a..f9928c51 100644
--- a/kdgantt/KDGanttViewItem.cpp
+++ b/kdgantt/KDGanttViewItem.cpp
@@ -133,7 +133,7 @@
   overlapping tqchildren, call \a setPriority() for the childs.
 
   Blocking of user interaction to open item:
-  If you want to block users to open items used as tqparents of calendar items,
+  If you want to block users to open items used as parents of calendar items,
   call \a KDGanttView::setCalendarMode( true );
 
   Example 1, Color:
@@ -182,16 +182,16 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param tqparentItem a tqparent item under which this one goes
+  \param parentItem a tqparent 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
 */
 
-KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
+KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
                                   const TQString& lvtext,
                                   const TQString& name ) :
-    TQListViewItem(tqparentItem,lvtext)
+    TQListViewItem(parentItem,lvtext)
 {
     initColorAndShapes(type);
     generateAndInsertName( name );
@@ -224,18 +224,18 @@ KDGanttViewItem::KDGanttViewItem( Type type, KDGanttView* view,
   Constructs an empty Gantt item.
 
   \param type the type of the item to insert
-  \param tqparentItem a tqparent item under which this one goes
+  \param parentItem a tqparent 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
 */
 
-KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* tqparentItem,
+KDGanttViewItem::KDGanttViewItem( Type type, KDGanttViewItem* parentItem,
                                   KDGanttViewItem* after,
                                   const TQString& lvtext,
                                   const TQString& name ) :
-    TQListViewItem( tqparentItem, after, lvtext )
+    TQListViewItem( parentItem, after, lvtext )
 {
     initColorAndShapes(type);
     generateAndInsertName( name );
@@ -1545,13 +1545,13 @@ KDGanttViewItem::Shape KDGanttViewItem::stringToShape( const TQString& string )
   Creates a DOM node that describes this item.
 
   \param doc the DOM document to which the node belongs
-  \param tqparentElement the element into which to insert this node
+  \param parentElement the element into which to insert this node
 */
 void KDGanttViewItem::createNode( TQDomDocument& doc,
-                                  TQDomElement& tqparentElement )
+                                  TQDomElement& parentElement )
 {
     TQDomElement itemElement = doc.createElement( "Item" );
-    tqparentElement.appendChild( itemElement );
+    parentElement.appendChild( itemElement );
     itemElement.setAttribute( "Type", typeToString( type() ) );
 
     KDGanttXML::createDateTimeNode( doc, itemElement, "StartTime", startTime() );
diff --git a/kdgantt/KDGanttViewItem.h b/kdgantt/KDGanttViewItem.h
index 97f2ce44..369153cf 100644
--- a/kdgantt/KDGanttViewItem.h
+++ b/kdgantt/KDGanttViewItem.h
@@ -174,7 +174,7 @@ public:
     static KDGanttViewItem* tqfind( const TQString& name );
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& tqparentElement );
+                     TQDomElement& parentElement );
     static KDGanttViewItem* createFromDomElement( KDGanttView* view,
                                                   TQDomElement& element );
     static KDGanttViewItem* createFromDomElement( KDGanttView* view,
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index e38b0937..8dcd5c75 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -140,13 +140,13 @@ void KDTimeTableWidget::removeItemFromTasklinks( KDGanttViewItem* item)
 
 void KDTimeTableWidget::expandItem( TQListViewItem * item)
 {
-    item->tqinvalidateHeight () ;
+    item->invalidateHeight () ;
     //tqApp->processEvents();
     updateMyContent();
 }
 void KDTimeTableWidget::collapseItem( TQListViewItem * item)
 {
-    item->tqinvalidateHeight () ;
+    item->invalidateHeight () ;
     //tqApp->processEvents();
     updateMyContent();
 }
@@ -160,7 +160,7 @@ void KDTimeTableWidget::highlightItem( TQListViewItem * item )
     highlightedItem = ( KDGanttViewItem*)item;
     itemwashighlighted = highlightedItem->highlight();
     highlightedItem->setHighlight(true);
-    item->tqinvalidateHeight () ;
+    item->invalidateHeight () ;
     myGanttView->myListView->contentsY();
     updateMyContent();
 }
@@ -2529,19 +2529,19 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e )
                 val = 0;
             }
         }
-        if (endMouseDown >  -x() +tqparentWidget()->width() ) {
+        if (endMouseDown >  -x() +parentWidget()->width() ) {
             val = myGanttView->myCanvasView->horizontalScrollBar()->value() +
                 myGanttView->myCanvasView->horizontalScrollBar()->lineStep();
 
         }
-        repaintMe(-x(),tqparentWidget()->width());
+        repaintMe(-x(),parentWidget()->width());
         if ( val > -1 ) {
             if ( val > myGanttView->myCanvasView->horizontalScrollBar()->maxValue() ) {
                 val = myGanttView->myCanvasView->horizontalScrollBar()->maxValue();
             }
             myGanttView->myCanvasView->horizontalScrollBar()->setValue( val );
         }
-        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),tqparentWidget()->width() , e->pos().y());
+        //qDebug("mousemove %d %d %d %d",endMouseDown, -x(),parentWidget()->width() , e->pos().y());
     }
 }
 
@@ -3103,62 +3103,62 @@ void KDListView::startDrag ()
 }
 
 KDCanvasText::KDCanvasText( KDTimeTableWidget* canvas,
-                            void* tqparentItem,
+                            void* parentItem,
                             int type ) :
     TQCanvasText(canvas)
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasLine::KDCanvasLine( KDTimeTableWidget* canvas,
-                            void* tqparentItem,
+                            void* parentItem,
                             int type ) :
     TQCanvasLine(canvas)
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasPolygonItem::KDCanvasPolygonItem( KDTimeTableWidget* canvas,
-                                          void* tqparentItem,
+                                          void* parentItem,
                                           int type ) :
     TQCanvasPolygonalItem( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasPolygon::KDCanvasPolygon( KDTimeTableWidget* canvas,
-                                  void* tqparentItem,
+                                  void* parentItem,
                                   int type ) :
     TQCanvasPolygon( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasEllipse::KDCanvasEllipse( KDTimeTableWidget* canvas,
-                                  void* tqparentItem,
+                                  void* parentItem,
                                   int type ) :
     TQCanvasEllipse( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
 KDCanvasRectangle::KDCanvasRectangle( KDTimeTableWidget* canvas,
-                                      void* tqparentItem,
+                                      void* parentItem,
                                       int type ) :
     TQCanvasRectangle( canvas )
 {
     myParentType = type;
-    myParentItem = tqparentItem;
+    myParentItem = parentItem;
 }
 
 
diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h
index f2b6cadc..e920944d 100644
--- a/kdgantt/KDGanttViewSubwidgets.h
+++ b/kdgantt/KDGanttViewSubwidgets.h
@@ -397,7 +397,7 @@ private slots:
 class KDCanvasText : public TQCanvasText
 {
 public:
-    KDCanvasText( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasText( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -406,7 +406,7 @@ public:
 class KDCanvasLine : public TQCanvasLine
 {
 public:
-    KDCanvasLine( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasLine( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -415,7 +415,7 @@ public:
 class KDCanvasPolygonItem: public TQCanvasPolygonalItem
 {
 public:
-    KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* tqparentItem,
+    KDCanvasPolygonItem( KDTimeTableWidget* canvas, void* parentItem,
                          int type );
     int myParentType;
     void* myParentItem;
@@ -425,7 +425,7 @@ public:
 class KDCanvasPolygon: public TQCanvasPolygon
 {
 public:
-    KDCanvasPolygon( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasPolygon( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -434,7 +434,7 @@ public:
 class KDCanvasEllipse: public TQCanvasEllipse
 {
 public:
-    KDCanvasEllipse( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasEllipse( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
@@ -443,7 +443,7 @@ public:
 class KDCanvasRectangle: public TQCanvasRectangle
 {
 public:
-    KDCanvasRectangle( KDTimeTableWidget* canvas, void* tqparentItem, int type );
+    KDCanvasRectangle( KDTimeTableWidget* canvas, void* parentItem, int type );
     int myParentType;
     void* myParentItem;
 };
diff --git a/kdgantt/KDGanttViewSummaryItem.cpp b/kdgantt/KDGanttViewSummaryItem.cpp
index b0ccfac1..a190864d 100644
--- a/kdgantt/KDGanttViewSummaryItem.cpp
+++ b/kdgantt/KDGanttViewSummaryItem.cpp
@@ -267,7 +267,7 @@ void KDGanttViewSummaryItem::hideMe()
 void KDGanttViewSummaryItem::showItem( bool show, int coordY )
 {
   isVisibleInGanttView = show;
-  tqinvalidateHeight () ;
+  invalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewTaskItem.cpp b/kdgantt/KDGanttViewTaskItem.cpp
index 4b060013..c8be3d85 100644
--- a/kdgantt/KDGanttViewTaskItem.cpp
+++ b/kdgantt/KDGanttViewTaskItem.cpp
@@ -201,7 +201,7 @@ void KDGanttViewTaskItem::showItem(bool show, int coordY)
 
   //qDebug("KDGanttViewTaskItem::showItem() %d %s ", (int) show, listViewText().latin1());
   isVisibleInGanttView = show;
-  tqinvalidateHeight () ;
+  invalidateHeight () ;
   if (!show) {
     hideMe();
     return;
diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp
index 8bbab48f..3e891ef5 100644
--- a/kdgantt/KDGanttViewTaskLink.cpp
+++ b/kdgantt/KDGanttViewTaskLink.cpp
@@ -732,13 +732,13 @@ TQPtrList<KDGanttViewItem> KDGanttViewTaskLink::to() const
   Creates a DOM node that describes this task link.
 
   \param doc the DOM document to which the node belongs
-  \param tqparentElement the element into which to insert this node
+  \param parentElement the element into which to insert this node
 */
 void KDGanttViewTaskLink::createNode( TQDomDocument& doc,
-                                      TQDomElement& tqparentElement )
+                                      TQDomElement& parentElement )
 {
     TQDomElement taskLinkElement = doc.createElement( "TaskLink" );
-    tqparentElement.appendChild( taskLinkElement );
+    parentElement.appendChild( taskLinkElement );
 
     TQDomElement fromItemsElement = doc.createElement( "FromItems" );
     taskLinkElement.appendChild( fromItemsElement );
diff --git a/kdgantt/KDGanttViewTaskLink.h b/kdgantt/KDGanttViewTaskLink.h
index f6f58cc9..b21283e9 100644
--- a/kdgantt/KDGanttViewTaskLink.h
+++ b/kdgantt/KDGanttViewTaskLink.h
@@ -89,7 +89,7 @@ public:
     TQString whatsThisText() const;
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& tqparentElement );
+                     TQDomElement& parentElement );
     static KDGanttViewTaskLink* createFromDomElement( TQDomElement& );
 
     int linkType();
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.cpp b/kdgantt/KDGanttViewTaskLinkGroup.cpp
index a7f65aad..2abee1df 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.cpp
+++ b/kdgantt/KDGanttViewTaskLinkGroup.cpp
@@ -280,13 +280,13 @@ KDGanttViewTaskLinkGroup* KDGanttViewTaskLinkGroup::tqfind( const TQString& name
   Creates a DOM node that describes this task link group.
 
   \param doc the DOM document to which the node belongs
-  \param tqparentElement the element into which to insert this node
+  \param parentElement the element into which to insert this node
 */
 void KDGanttViewTaskLinkGroup::createNode( TQDomDocument& doc,
-                                           TQDomElement& tqparentElement )
+                                           TQDomElement& parentElement )
 {
     TQDomElement taskLinkGroupElement = doc.createElement( "TaskLink" );
-    tqparentElement.appendChild( taskLinkGroupElement );
+    parentElement.appendChild( taskLinkGroupElement );
 
     KDGanttXML::createBoolNode( doc, taskLinkGroupElement, "Highlight",
                            highlight() );
diff --git a/kdgantt/KDGanttViewTaskLinkGroup.h b/kdgantt/KDGanttViewTaskLinkGroup.h
index 1b8bb613..b415ab11 100644
--- a/kdgantt/KDGanttViewTaskLinkGroup.h
+++ b/kdgantt/KDGanttViewTaskLinkGroup.h
@@ -65,7 +65,7 @@ public:
     static KDGanttViewTaskLinkGroup* tqfind( const TQString& name );
 
     void createNode( TQDomDocument& doc,
-                     TQDomElement& tqparentElement );
+                     TQDomElement& parentElement );
     static KDGanttViewTaskLinkGroup* createFromDomElement( TQDomElement& );
 
     void generateAndInsertName( const TQString& name );
diff --git a/kdgantt/Makefile.am b/kdgantt/Makefile.am
index de319d12..fe3a34ac 100644
--- a/kdgantt/Makefile.am
+++ b/kdgantt/Makefile.am
@@ -33,7 +33,7 @@ noinst_HEADERS =	\
 			KDGanttViewTaskLink.h		\
 			KDGanttXMLTools.h			\
 			itemAttributeDialog.ui.h	\
-			qlayoutengine_p.h
+			qtqlayoutengine_p.h
 
 METASOURCES = AUTO
 
diff --git a/kdgantt/itemAttributeDialog.ui b/kdgantt/itemAttributeDialog.ui
index a31e0cdb..a3616dca 100644
--- a/kdgantt/itemAttributeDialog.ui
+++ b/kdgantt/itemAttributeDialog.ui
@@ -733,5 +733,5 @@
     <slot>PrioSlider_valueChanged( int val )</slot>
     <slot returnType="KDGanttViewItem *">getItem()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdgantt/qlayoutengine_p.h b/kdgantt/qlayoutengine_p.h
index 34248062..d4c84938 100644
--- a/kdgantt/qlayoutengine_p.h
+++ b/kdgantt/qlayoutengine_p.h
@@ -46,7 +46,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qtqlayout.cpp, qtqlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
+// of qtqlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/kexi/3rdparty/kexisql/src/pager.c b/kexi/3rdparty/kexisql/src/pager.c
index 5259e085..566c778c 100644
--- a/kexi/3rdparty/kexisql/src/pager.c
+++ b/kexi/3rdparty/kexisql/src/pager.c
@@ -435,7 +435,7 @@ static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
 /*
 ** Unlock the database and clear the in-memory cache.  This routine
 ** sets the state of the pager back to what it was when it was first
-** opened.  Any outstanding pages are tqinvalidated and subsequent attempts
+** opened.  Any outstanding pages are invalidated and subsequent attempts
 ** to access those pages will likely result in a coredump.
 */
 static void pager_reset(Pager *pPager){
@@ -1059,7 +1059,7 @@ int sqlitepager_truncate(Pager *pPager, Pgno nPage){
 ** Shutdown the page cache.  Free all memory and close all files.
 **
 ** If a transaction was in progress when this routine is called, that
-** transaction is rolled back.  All outstanding pages are tqinvalidated
+** transaction is rolled back.  All outstanding pages are invalidated
 ** and their memory is freed.  Any attempt to use a page associated
 ** with this page cache after this function returns will likely
 ** result in a coredump.
diff --git a/kexi/3rdparty/kexisql/src/select.c b/kexi/3rdparty/kexisql/src/select.c
index cc13aec8..28136e76 100644
--- a/kexi/3rdparty/kexisql/src/select.c
+++ b/kexi/3rdparty/kexisql/src/select.c
@@ -1985,7 +1985,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 ** This routine does NOT free the Select structure passed in.  The
 ** calling function needs to do that.
 **
-** The pParent, tqparentTab, and *pParentAgg fields are filled in if this
+** 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.
@@ -2003,7 +2003,7 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){
 ** pParent will be NULL.  During the processing of the outer query, this 
 ** routine is called recursively to handle the subquery.  For the recursive
 ** call, pParent will point to the outer query.  Because the subquery is
-** the second element in a three-way join, the tqparentTab parameter will
+** the second element in a three-way join, the parentTab parameter will
 ** be 1 (the 2nd value of a 0-indexed array.)
 */
 int sqliteSelect(
@@ -2012,7 +2012,7 @@ int sqliteSelect(
   int eDest,             /* How to dispose of the results */
   int iParm,             /* A parameter used by the eDest disposal method */
   Select *pParent,       /* Another SELECT for which this is a sub-query */
-  int tqparentTab,         /* Index in pParent->pSrc of this query */
+  int parentTab,         /* Index in pParent->pSrc of this query */
   int *pParentAgg        /* True if pParent uses aggregate functions */
 ){
   int i;
@@ -2232,7 +2232,7 @@ int sqliteSelect(
   ** If flattening is a possiblity, do so and return immediately.  
   */
   if( pParent && pParentAgg &&
-      flattenSubquery(pParse, pParent, tqparentTab, *pParentAgg, isAgg) ){
+      flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){
     if( isAgg ) *pParentAgg = 1;
     return rc;
   }
@@ -2414,10 +2414,10 @@ int sqliteSelect(
   ** the use of the temporary table.
   */
   if( pParent ){
-    assert( pParent->pSrc->nSrc>tqparentTab );
-    assert( pParent->pSrc->a[tqparentTab].pSelect==p );
+    assert( pParent->pSrc->nSrc>parentTab );
+    assert( pParent->pSrc->a[parentTab].pSelect==p );
     sqliteSelectDelete(p);
-    pParent->pSrc->a[tqparentTab].pSelect = 0;
+    pParent->pSrc->a[parentTab].pSelect = 0;
   }
 
   /* The SELECT was successfully coded.   Set the return code to 0
diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c
index dcf56bf5..6ac81058 100644
--- a/kexi/3rdparty/kexisql/src/vdbe.c
+++ b/kexi/3rdparty/kexisql/src/vdbe.c
@@ -309,7 +309,7 @@ static int toInt(const char *zNum, int *pNum){
 ** Convert the given stack entity into a integer if it isn't one
 ** already.
 **
-** Any prior string or real representation is tqinvalidated.  
+** Any prior string or real representation is invalidated.  
 ** NULLs are converted into 0.
 */
 #define Integerify(P) if(((P)->flags&MEM_Int)==0){ hardIntegerify(P); }
diff --git a/kexi/3rdparty/kexisql/src/where.c b/kexi/3rdparty/kexisql/src/where.c
index 2b94ad3c..58b6e3d0 100644
--- a/kexi/3rdparty/kexisql/src/where.c
+++ b/kexi/3rdparty/kexisql/src/where.c
@@ -36,7 +36,7 @@ struct ExprInfo {
 
 /*
 ** An instance of the following structure keeps track of a mapping
-** between VDBE cursor numbers and bittqmasks.  The VDBE cursor numbers
+** between VDBE cursor numbers and bitmasks.  The VDBE cursor numbers
 ** are small integers contained in SrcList_item.iCursor and Expr.iTable
 ** fields.  For any given WHERE clause, we want to track which cursors
 ** are being used, so we assign a single bit in a 32-bit word to track
@@ -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 tqmaskSet; /* The expression tqmask set */
+  ExprMaskSet maskSet; /* The expression tqmask 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 */
@@ -407,7 +407,7 @@ WhereInfo *sqliteWhereBegin(
   ** array fills up, the last entry might point to an expression which
   ** contains additional unfactored AND operators.
   */
-  initMaskSet(&tqmaskSet);
+  initMaskSet(&maskSet);
   memset(aExpr, 0, sizeof(aExpr));
   nExpr = exprSplit(ARRAYSIZE(aExpr), aExpr, pWhere);
   if( nExpr==ARRAYSIZE(aExpr) ){
@@ -440,21 +440,21 @@ WhereInfo *sqliteWhereBegin(
   /* Analyze all of the subexpressions.
   */
   for(i=0; i<nExpr; i++){
-    exprAnalyze(&tqmaskSet, &aExpr[i]);
+    exprAnalyze(&maskSet, &aExpr[i]);
 
     /* If we are executing a trigger body, remove all references to
-    ** new.* and old.* tables from the prerequisite tqmasks.
+    ** new.* and old.* tables from the prerequisite masks.
     */
     if( pParse->trigStack ){
       int x;
       if( (x = pParse->trigStack->newIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
       }
       if( (x = pParse->trigStack->oldIdx) >= 0 ){
-        int tqmask = ~getMask(&tqmaskSet, x);
+        int tqmask = ~getMask(&maskSet, x);
         aExpr[i].prereqRight &= tqmask;
         aExpr[i].prereqLeft &= tqmask;
         aExpr[i].prereqAll &= tqmask;
@@ -482,7 +482,7 @@ WhereInfo *sqliteWhereBegin(
   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(&tqmaskSet, iCur);   /* Cursor tqmask for this table */
+    int tqmask = getMask(&maskSet, iCur);   /* Cursor tqmask for this table */
     Table *pTab = pTabList->a[i].pTab;
     Index *pIdx;
     Index *pBestIdx = 0;
@@ -1132,7 +1132,7 @@ WhereInfo *sqliteWhereBegin(
       pLevel->p1 = pLevel->iCur;
       pLevel->p2 = start;
     }
-    loopMask |= getMask(&tqmaskSet, iCur);
+    loopMask |= getMask(&maskSet, iCur);
 
     /* Insert code to test every subexpression that can be completely
     ** computed using the current set of tables.
@@ -1179,7 +1179,7 @@ WhereInfo *sqliteWhereBegin(
   if( pushKey && !haveKey ){
     sqliteVdbeAddOp(v, OP_Recno, pTabList->a[0].iCursor, 0);
   }
-  freeMaskSet(&tqmaskSet);
+  freeMaskSet(&maskSet);
   return pWInfo;
 }
 
diff --git a/kexi/3rdparty/kexisql3/src/alter.c b/kexi/3rdparty/kexisql3/src/alter.c
index 73c49b1f..72ebd6c7 100644
--- a/kexi/3rdparty/kexisql3/src/alter.c
+++ b/kexi/3rdparty/kexisql3/src/alter.c
@@ -53,7 +53,7 @@ static void renameTableFunc(
 
   /* The principle used to locate the table name in the CREATE TABLE 
   ** statement is that the table name is the first token that is immediatedly
-  ** followed by a left tqparenthesis - TK_LP.
+  ** followed by a left parenthesis - TK_LP.
   */
   if( zSql ){
     do {
diff --git a/kexi/3rdparty/kexisql3/src/btree.c b/kexi/3rdparty/kexisql3/src/btree.c
index 65cddcd4..fb54c9c4 100644
--- a/kexi/3rdparty/kexisql3/src/btree.c
+++ b/kexi/3rdparty/kexisql3/src/btree.c
@@ -2080,7 +2080,7 @@ int sqlite3BtreeCommitStmt(Btree *pBt){
 ** Rollback the active statement subtransaction.  If no subtransaction
 ** is active this routine is a no-op.
 **
-** All cursors will be tqinvalidated by this operation.  Any attempt
+** All cursors will be invalidated by this operation.  Any attempt
 ** to use a cursor that was open at the beginning of this operation
 ** will result in an error.
 */
@@ -3670,9 +3670,9 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   int szCell;
   CellInfo info;
   Btree *pBt = pPage->pBt;
-  int tqparentIdx = pParent->nCell;   /* pParent new divider cell index */
-  int tqparentSize;                   /* Size of new divider cell */
-  u8 tqparentCell[64];                /* Space for the new divider cell */
+  int parentIdx = pParent->nCell;   /* pParent new divider cell index */
+  int parentSize;                   /* Size of new divider cell */
+  u8 parentCell[64];                /* Space for the new divider cell */
 
   /* Allocate a new page. Insert the overflow cell from pPage
   ** into it. Then remove the overflow cell from pPage.
@@ -3697,16 +3697,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
   */
   assert( pPage->nCell>0 );
   parseCellPtr(pPage, findCell(pPage, pPage->nCell-1), &info);
-  rc = fillInCell(pParent, tqparentCell, 0, info.nKey, 0, 0, &tqparentSize);
+  rc = fillInCell(pParent, parentCell, 0, info.nKey, 0, 0, &parentSize);
   if( rc!=SQLITE_OK ){
     return rc;
   }
-  assert( tqparentSize<64 );
-  rc = insertCell(pParent, tqparentIdx, tqparentCell, tqparentSize, 0, 4);
+  assert( parentSize<64 );
+  rc = insertCell(pParent, parentIdx, parentCell, parentSize, 0, 4);
   if( rc!=SQLITE_OK ){
     return rc;
   }
-  put4byte(findOverflowCell(pParent,tqparentIdx), pPage->pgno);
+  put4byte(findOverflowCell(pParent,parentIdx), pPage->pgno);
   put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew);
 
 #ifndef SQLITE_OMIT_AUTOVACUUM
diff --git a/kexi/3rdparty/kexisql3/src/pager.c b/kexi/3rdparty/kexisql3/src/pager.c
index 469d05fa..b49a37d5 100644
--- a/kexi/3rdparty/kexisql3/src/pager.c
+++ b/kexi/3rdparty/kexisql3/src/pager.c
@@ -839,7 +839,7 @@ static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
 /*
 ** Unlock the database and clear the in-memory cache.  This routine
 ** sets the state of the pager back to what it was when it was first
-** opened.  Any outstanding pages are tqinvalidated and subsequent attempts
+** opened.  Any outstanding pages are invalidated and subsequent attempts
 ** to access those pages will likely result in a coredump.
 */
 static void pager_reset(Pager *pPager){
@@ -1948,7 +1948,7 @@ int sqlite3pager_truncate(Pager *pPager, Pgno nPage){
 ** Shutdown the page cache.  Free all memory and close all files.
 **
 ** If a transaction was in progress when this routine is called, that
-** transaction is rolled back.  All outstanding pages are tqinvalidated
+** transaction is rolled back.  All outstanding pages are invalidated
 ** and their memory is freed.  Any attempt to use a page associated
 ** with this page cache after this function returns will likely
 ** result in a coredump.
diff --git a/kexi/3rdparty/kexisql3/src/parse.y b/kexi/3rdparty/kexisql3/src/parse.y
index c591c99d..7487c731 100644
--- a/kexi/3rdparty/kexisql3/src/parse.y
+++ b/kexi/3rdparty/kexisql3/src/parse.y
@@ -398,7 +398,7 @@ seltablist(A) ::= stl_prefix(X) LP seltablist_paren(S) RP
 }
 
 // A seltablist_paren nonterminal represents anything in a FROM that
-// is contained inside tqparentheses.  This can be either a subquery or
+// is contained inside parentheses.  This can be either a subquery or
 // a grouping of table and subqueries.
 //
 %type seltablist_paren {Select*}
diff --git a/kexi/3rdparty/kexisql3/src/pragma.c b/kexi/3rdparty/kexisql3/src/pragma.c
index 618ce9e1..181d9a94 100644
--- a/kexi/3rdparty/kexisql3/src/pragma.c
+++ b/kexi/3rdparty/kexisql3/src/pragma.c
@@ -86,7 +86,7 @@ static int getTempStore(const char *z){
 ** Invalidate temp storage, either when the temp storage is changed
 ** from default, or when 'file' and the temp_store_directory has changed
 */
-static int tqinvalidateTempStorage(Parse *pParse){
+static int invalidateTempStorage(Parse *pParse){
   sqlite3 *db = pParse->db;
   if( db->aDb[1].pBt!=0 ){
     if( db->flags & SQLITE_InTrans ){
@@ -112,7 +112,7 @@ static int changeTempStorage(Parse *pParse, const char *zStorageType){
   int ts = getTempStore(zStorageType);
   sqlite3 *db = pParse->db;
   if( db->temp_store==ts ) return SQLITE_OK;
-  if( tqinvalidateTempStorage( pParse ) != SQLITE_OK ){
+  if( invalidateTempStorage( pParse ) != SQLITE_OK ){
     return SQLITE_ERROR;
   }
   db->temp_store = ts;
@@ -377,7 +377,7 @@ void sqlite3Pragma(
   ** Return or set the local value of the temp_store_directory flag.  Changing
   ** the value sets a specific directory to be used for temporary files.
   ** Setting to a null string reverts to the default temporary directory search.
-  ** If temporary directory is changed, then tqinvalidateTempStorage.
+  ** If temporary directory is changed, then invalidateTempStorage.
   **
   */
   if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){
@@ -397,7 +397,7 @@ void sqlite3Pragma(
        || (TEMP_STORE==1 && db->temp_store<=1)
        || (TEMP_STORE==2 && db->temp_store==1)
       ){
-        tqinvalidateTempStorage(pParse);
+        invalidateTempStorage(pParse);
       }
       sqliteFree(sqlite3_temp_directory);
       if( zRight[0] ){
diff --git a/kexi/3rdparty/kexisql3/src/select.c b/kexi/3rdparty/kexisql3/src/select.c
index 0f465c09..fd8b41a8 100644
--- a/kexi/3rdparty/kexisql3/src/select.c
+++ b/kexi/3rdparty/kexisql3/src/select.c
@@ -2569,7 +2569,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
 ** This routine does NOT free the Select structure passed in.  The
 ** calling function needs to do that.
 **
-** The pParent, tqparentTab, and *pParentAgg fields are filled in if this
+** 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.
@@ -2587,7 +2587,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
 ** pParent will be NULL.  During the processing of the outer query, this 
 ** routine is called recursively to handle the subquery.  For the recursive
 ** call, pParent will point to the outer query.  Because the subquery is
-** the second element in a three-way join, the tqparentTab parameter will
+** the second element in a three-way join, the parentTab parameter will
 ** be 1 (the 2nd value of a 0-indexed array.)
 */
 int sqlite3Select(
@@ -2596,7 +2596,7 @@ int sqlite3Select(
   int eDest,             /* How to dispose of the results */
   int iParm,             /* A parameter used by the eDest disposal method */
   Select *pParent,       /* Another SELECT for which this is a sub-query */
-  int tqparentTab,         /* Index in pParent->pSrc of this query */
+  int parentTab,         /* Index in pParent->pSrc of this query */
   int *pParentAgg,       /* True if pParent uses aggregate functions */
   char *aff              /* If eDest is SRT_Union, the affinity string */
 ){
@@ -2735,7 +2735,7 @@ int sqlite3Select(
   */
 #ifndef SQLITE_OMIT_VIEW
   if( pParent && pParentAgg &&
-      flattenSubquery(pParse, pParent, tqparentTab, *pParentAgg, isAgg) ){
+      flattenSubquery(pParse, pParent, parentTab, *pParentAgg, isAgg) ){
     if( isAgg ) *pParentAgg = 1;
     goto select_end;
   }
@@ -3105,10 +3105,10 @@ int sqlite3Select(
   ** the use of the temporary table.
   */
   if( pParent ){
-    assert( pParent->pSrc->nSrc>tqparentTab );
-    assert( pParent->pSrc->a[tqparentTab].pSelect==p );
+    assert( pParent->pSrc->nSrc>parentTab );
+    assert( pParent->pSrc->a[parentTab].pSelect==p );
     sqlite3SelectDelete(p);
-    pParent->pSrc->a[tqparentTab].pSelect = 0;
+    pParent->pSrc->a[parentTab].pSelect = 0;
   }
 #endif
 
diff --git a/kexi/3rdparty/kexisql3/src/vdbe.c b/kexi/3rdparty/kexisql3/src/vdbe.c
index c5582b5c..1b5678fd 100644
--- a/kexi/3rdparty/kexisql3/src/vdbe.c
+++ b/kexi/3rdparty/kexisql3/src/vdbe.c
@@ -121,7 +121,7 @@ int sqlite3_sort_count = 0;
 ** Convert the given stack entity into a integer if it isn't one
 ** already.
 **
-** Any prior string or real representation is tqinvalidated.  
+** Any prior string or real representation is invalidated.  
 ** NULLs are converted into 0.
 */
 #define Integerify(P) sqlite3VdbeMemIntegerify(P)
@@ -129,7 +129,7 @@ int sqlite3_sort_count = 0;
 /*
 ** Convert P so that it has type MEM_Real.
 **
-** Any prior string or integer representation is tqinvalidated.
+** Any prior string or integer representation is invalidated.
 ** NULLs are converted into 0.0.
 */
 #define Realify(P) sqlite3VdbeMemRealify(P)
diff --git a/kexi/3rdparty/kexisql3/src/vdbeaux.c b/kexi/3rdparty/kexisql3/src/vdbeaux.c
index 6b37312d..33c812bf 100644
--- a/kexi/3rdparty/kexisql3/src/vdbeaux.c
+++ b/kexi/3rdparty/kexisql3/src/vdbeaux.c
@@ -189,20 +189,20 @@ static int opcodeNoPush(u8 op){
   ** NOPUSH_MASK_0 corresponds to opcodes 0 to 15. NOPUSH_MASK_1 tqcontains
   ** one bit for opcodes 16 to 31, and so on.
   **
-  ** 16-bit bittqmasks (rather than 32-bit) are specified in opcodes.h 
+  ** 16-bit bitmasks (rather than 32-bit) are specified in opcodes.h 
   ** because the file is generated by an awk program. Awk manipulates
   ** all numbers as floating-point and we don't want to risk a rounding
   ** error if someone builds with an awk that uses (for example) 32-bit 
   ** IEEE floats.
   */ 
-  static const u32 tqmasks[5] = {
+  static const u32 masks[5] = {
     NOPUSH_MASK_0 + (NOPUSH_MASK_1<<16),
     NOPUSH_MASK_2 + (NOPUSH_MASK_3<<16),
     NOPUSH_MASK_4 + (NOPUSH_MASK_5<<16),
     NOPUSH_MASK_6 + (NOPUSH_MASK_7<<16),
     NOPUSH_MASK_8 + (NOPUSH_MASK_9<<16)
   };
-  return (tqmasks[op>>5] & (1<<(op&0x1F)));
+  return (masks[op>>5] & (1<<(op&0x1F)));
 }
 
 #ifndef NDEBUG
diff --git a/kexi/3rdparty/kexisql3/src/vdbemem.c b/kexi/3rdparty/kexisql3/src/vdbemem.c
index a7ecce53..0b7e193b 100644
--- a/kexi/3rdparty/kexisql3/src/vdbemem.c
+++ b/kexi/3rdparty/kexisql3/src/vdbemem.c
@@ -151,7 +151,7 @@ int sqlite3VdbeMemNulTerminate(Mem *pMem){
 ** are converted using sqlite3_snprintf().  Converting a BLOB to a string
 ** is a no-op.
 **
-** Existing representations MEM_Int and MEM_Real are *not* tqinvalidated.
+** Existing representations MEM_Int and MEM_Real are *not* invalidated.
 **
 ** A MEM_Null value will never be passed to this function. This function is
 ** used for converting values to text for returning to the user (i.e. via
diff --git a/kexi/3rdparty/kexisql3/src/where.c b/kexi/3rdparty/kexisql3/src/where.c
index ab19f288..f4b8ba51 100644
--- a/kexi/3rdparty/kexisql3/src/where.c
+++ b/kexi/3rdparty/kexisql3/src/where.c
@@ -114,13 +114,13 @@ struct WhereClause {
 
 /*
 ** An instance of the following structure keeps track of a mapping
-** between VDBE cursor numbers and bits of the bittqmasks in WhereTerm.
+** between VDBE cursor numbers and bits of the bitmasks in WhereTerm.
 **
 ** The VDBE cursor numbers are small integers contained in 
 ** SrcList_item.iCursor and Expr.iTable fields.  For any given WHERE 
 ** clause, the cursor numbers might not begin with 0 and they might
 ** contain gaps in the numbering sequence.  But we want to make maximum
-** use of the bits in our bittqmasks.  This structure provides a mapping
+** use of the bits in our bitmasks.  This structure provides a mapping
 ** from the sparse cursor numbers into consecutive integers beginning
 ** with 0.
 **
@@ -146,7 +146,7 @@ struct ExprMaskSet {
 
 
 /*
-** Bittqmasks for the operators that indices are able to exploit.  An
+** Bitmasks for the operators that indices are able to exploit.  An
 ** OR-ed combination of these values can be used when searching for
 ** terms in the where clause.
 */
@@ -301,7 +301,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
 ** 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
-** the bittqmasks together.
+** the bitmasks together.
 */
 static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*);
 static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*);
@@ -458,7 +458,7 @@ static void exprAnalyze(SrcList*, ExprMaskSet*, WhereClause*, int);
 */
 static void exprAnalyzeAll(
   SrcList *pTabList,       /* the FROM clause */
-  ExprMaskSet *pMaskSet,   /* table tqmasks */
+  ExprMaskSet *pMaskSet,   /* table masks */
   WhereClause *pWC         /* the WHERE clause to be analyzed */
 ){
   int i;
@@ -536,7 +536,7 @@ static int isLikeOrGlob(
 */
 static void exprAnalyze(
   SrcList *pSrc,            /* the FROM clause */
-  ExprMaskSet *pMaskSet,    /* table tqmasks */
+  ExprMaskSet *pMaskSet,    /* table masks */
   WhereClause *pWC,         /* the WHERE clause */
   int idxTerm               /* Index of the term to be analyzed */
 ){
@@ -1382,7 +1382,7 @@ WhereInfo *sqlite3WhereBegin(
   int brk, cont = 0;         /* Addresses used during code generation */
   Bittqmask notReady;          /* Cursors that are not yet positioned */
   WhereTerm *pTerm;          /* A single term in the WHERE clause */
-  ExprMaskSet tqmaskSet;       /* The expression tqmask set */
+  ExprMaskSet maskSet;       /* The expression tqmask 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 */
@@ -1400,7 +1400,7 @@ WhereInfo *sqlite3WhereBegin(
   /* Split the WHERE clause into separate subexpressions where each
   ** subexpression is separated by an AND operator.
   */
-  initMaskSet(&tqmaskSet);
+  initMaskSet(&maskSet);
   whereClauseInit(&wc, pParse);
   whereSplit(&wc, pWhere, TK_AND);
     
@@ -1429,9 +1429,9 @@ WhereInfo *sqlite3WhereBegin(
   ** and work forward so that the added virtual terms are never processed.
   */
   for(i=0; i<pTabList->nSrc; i++){
-    createMask(&tqmaskSet, pTabList->a[i].iCursor);
+    createMask(&maskSet, pTabList->a[i].iCursor);
   }
-  exprAnalyzeAll(pTabList, &tqmaskSet, &wc);
+  exprAnalyzeAll(pTabList, &maskSet, &wc);
   if( sqlite3_malloc_failed ){
     goto whereBeginNoMem;
   }
@@ -1469,7 +1469,7 @@ WhereInfo *sqlite3WhereBegin(
     Bittqmask m;                  /* Bittqmask value for j or bestJ */
 
     for(j=iFrom, pTabItem=&pTabList->a[j]; j<pTabList->nSrc; j++, pTabItem++){
-      m = getMask(&tqmaskSet, pTabItem->iCursor);
+      m = getMask(&maskSet, pTabItem->iCursor);
       if( (m & notReady)==0 ){
         if( j==iFrom ) iFrom++;
         continue;
@@ -1506,7 +1506,7 @@ WhereInfo *sqlite3WhereBegin(
     }else{
       pLevel->iIdxCur = -1;
     }
-    notReady &= ~getMask(&tqmaskSet, pTabList->a[bestJ].iCursor);
+    notReady &= ~getMask(&maskSet, pTabList->a[bestJ].iCursor);
     pLevel->iFrom = bestJ;
   }
   TRACE(("*** Optimizer Finished ***\n"));
@@ -1854,7 +1854,7 @@ WhereInfo *sqlite3WhereBegin(
       pLevel->p1 = iCur;
       pLevel->p2 = 1 + sqlite3VdbeAddOp(v, OP_Rewind, iCur, brk);
     }
-    notReady &= ~getMask(&tqmaskSet, iCur);
+    notReady &= ~getMask(&maskSet, iCur);
 
     /* Insert code to test every subexpression that can be completely
     ** computed using the current set of tables.
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
index 016eb767..09bad9d5 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumns.h
@@ -19,8 +19,8 @@
 
 // Description: Page Layout Dialog (sources)
 
-#ifndef kopagetqlayoutcolumns_h
-#define kopagetqlayoutcolumns_h
+#ifndef kopagelayoutcolumns_h
+#define kopagelayoutcolumns_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
index 780bc792..325fe45e 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutColumnsBase.ui
@@ -95,5 +95,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
index 4e3a00a4..de8db04b 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeader.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutheader_h
-#define kopagetqlayoutheader_h
+#ifndef kopagelayoutheader_h
+#define kopagelayoutheader_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
index 4488c6f4..b3bd7978 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
+++ b/kexi/3rdparty/kolibs/KoPageLayoutHeaderBase.ui
@@ -217,5 +217,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.h b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
index 3f46def2..5d7c0494 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.h
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutsize_h
-#define kopagetqlayoutsize_h
+#ifndef kopagelayoutsize_h
+#define kopagelayoutsize_h
 
 #include <tqgroupbox.h>
 #include <KoGlobal.h>
diff --git a/kexi/core/kexidataiteminterface.cpp b/kexi/core/kexidataiteminterface.cpp
index 2dd9c813..b95d7472 100644
--- a/kexi/core/kexidataiteminterface.cpp
+++ b/kexi/core/kexidataiteminterface.cpp
@@ -135,9 +135,9 @@ bool KexiDataItemInterface::valueIsValid()
 	return true;
 }
 
-void KexiDataItemInterface::setParentDataItemInterface(KexiDataItemInterface* tqparentDataItemInterface)
+void KexiDataItemInterface::setParentDataItemInterface(KexiDataItemInterface* parentDataItemInterface)
 {
-	m_parentDataItemInterface = tqparentDataItemInterface;
+	m_parentDataItemInterface = parentDataItemInterface;
 }
 
 bool KexiDataItemInterface::cursorAtNewRow()
diff --git a/kexi/core/kexidataiteminterface.h b/kexi/core/kexidataiteminterface.h
index db6a9afe..ad3a3d25 100644
--- a/kexi/core/kexidataiteminterface.h
+++ b/kexi/core/kexidataiteminterface.h
@@ -192,11 +192,11 @@ class KEXICORE_EXPORT KexiDataItemInterface
 		 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. */
-		void setParentDataItemInterface(KexiDataItemInterface* tqparentDataItemInterface);
+		void setParentDataItemInterface(KexiDataItemInterface* parentDataItemInterface);
 
 		/*! \return a pointer to a Parent Data Item Interface. 
 		 @see setParentDataItemInterface() */
-		inline KexiDataItemInterface* tqparentInterface() const { return m_parentDataItemInterface; }
+		inline KexiDataItemInterface* parentInterface() const { return m_parentDataItemInterface; }
 
 		/*! Handles action having standard name \a actionName. 
 		 Action could be: "edit_cut", "edit_paste", etc.
@@ -239,7 +239,7 @@ class KEXICORE_EXPORT KexiDataItemInterface
 		bool m_listenerIsTQObject;
 		TQVariant m_origValue;
 
-		/*! @see tqparentDataItemInterface() */
+		/*! @see parentDataItemInterface() */
 		KexiDataItemInterface* m_parentDataItemInterface;
 		bool m_hasFocusableWidget : 1;
 		bool m_disable_signalValueChanged : 1;
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 1469575b..01f20d8c 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -394,7 +394,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
 	addActionProxyChild( newView ); //new proxy child
 	m_stack->raiseWidget( newView );
 	newView->propertySetSwitched();
-	m_parentWindow->tqinvalidateSharedActions( TQT_TQOBJECT(newView) );
+	m_parentWindow->invalidateSharedActions( TQT_TQOBJECT(newView) );
 	TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok?
 //	setFocus();
 	return true;
@@ -633,7 +633,7 @@ void KexiDialogBase::activate()
 	}
 	if (v)
 		v->updateActions(true);
-//js: not neeed??	m_parentWindow->tqinvalidateSharedActions(this);
+//js: not neeed??	m_parentWindow->invalidateSharedActions(this);
 }
 
 void KexiDialogBase::deactivate()
@@ -647,14 +647,14 @@ void KexiDialogBase::sendDetachedStateToCurrentView()
 {
 	KexiViewBase *v = selectedView();
 	if (v)
-		v->tqparentDialogDetached();
+		v->parentDialogDetached();
 }
 
 void KexiDialogBase::sendAttachedStateToCurrentView()
 {
 	KexiViewBase *v = selectedView();
 	if (v)
-		v->tqparentDialogAttached();
+		v->parentDialogAttached();
 }
 
 #include "kexidialogbase.moc"
diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h
index 68c71236..6479ae5b 100644
--- a/kexi/core/kexidialogbase.h
+++ b/kexi/core/kexidialogbase.h
@@ -238,13 +238,13 @@ class KEXICORE_EXPORT KexiDialogBase :
 		tristate storeNewData();
 
 		/*! Reimplemented - we're informing the current view about performed detaching by calling
-		 KexiViewBase::tqparentDialogDetached(), so the view can react on this event
-		 (by default KexiViewBase::tqparentDialogDetached() does nothing, you can reimplement it). */
+		 KexiViewBase::parentDialogDetached(), so the view can react on this event
+		 (by default KexiViewBase::parentDialogDetached() does nothing, you can reimplement it). */
 		void sendDetachedStateToCurrentView();
 
 		/*! W're informing the current view about performed atttaching by calling
-		 KexiViewBase::tqparentDialogAttached(), so the view can react on this event
-		 (by default KexiViewBase::tqparentDialogAttached() does nothing, you can reimplement it). */
+		 KexiViewBase::parentDialogAttached(), so the view can react on this event
+		 (by default KexiViewBase::parentDialogAttached() does nothing, you can reimplement it). */
 		void sendAttachedStateToCurrentView();
 
 	signals:
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index b00cbc1b..a98ac5a6 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -44,7 +44,7 @@ void KexiSharedActionHostPrivate::slotAction(const TQString& act_id)
 {
 	TQWidget *w = host->focusWindow(); //tqfocusWidget();
 //	while (w && !w->inherits("KexiDialogBase") && !w->inherits("KexiDockBase"))
-//		w = w->tqparentWidget();
+//		w = w->parentWidget();
 
 	KexiActionProxy *proxy = w ? actionProxies[ w ] : 0;
 
@@ -113,7 +113,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a
 		return; //sanity
 	TQWidget *fw = d->mainWin->tqfocusWidget();
 	while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw))
-		fw = fw->tqparentWidget();
+		fw = fw->parentWidget();
 	if (!fw)
 		return;
 
@@ -137,7 +137,7 @@ KMainWindow* KexiSharedActionHost::mainWindow() const
 	return d->mainWin;
 }
 
-void KexiSharedActionHost::tqinvalidateSharedActions(TQObject *o)
+void KexiSharedActionHost::invalidateSharedActions(TQObject *o)
 {
 	if (!d)
 		return;
@@ -208,7 +208,7 @@ TQWidget* KexiSharedActionHost::focusWindow()
 		fw = aw->tqfocusWidget();
 	}
 	while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw)))
-		fw = fw->tqparentWidget();
+		fw = fw->parentWidget();
 	return fw;
 }
 
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index 035ce352..235ca9b8 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -100,13 +100,13 @@ class KEXICORE_EXPORT KexiSharedActionHost
 		 Otherwise the action is disabled.
 
 		 If \a o is not KexiDialogBase or its child,
-		 actions are only tqinvalidated if these come from mainwindow's KActionCollection
+		 actions are only invalidated if these come from mainwindow's KActionCollection
 		 (thus part-actions are untouched when the focus is e.g. in the Property Editor.
 
 		 Call this method when it is known that some actions need invalidation 
 		 (e.g. when new window is activated). See how it is used in KexiMainWindowImpl.
 		*/
-		virtual void tqinvalidateSharedActions(TQObject *o);
+		virtual void invalidateSharedActions(TQObject *o);
 
 		void setActionAvailable(const char *action_name, bool avail);
 
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index d31a15fa..be201c9b 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -41,7 +41,7 @@ KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *tqparent, const ch
  , m_dirty(false)
 {
 	TQWidget *wi=this;
-	while ((wi = wi->tqparentWidget()) && !wi->inherits("KexiDialogBase"))
+	while ((wi = wi->parentWidget()) && !wi->inherits("KexiDialogBase"))
 		;
 	m_dialog = (wi && wi->inherits("KexiDialogBase")) ? static_cast<KexiDialogBase*>(wi) : 0;
 	if (m_dialog) {
@@ -74,7 +74,7 @@ tristate KexiViewBase::afterSwitchFrom(int /* mode */)
 
 TQSize KexiViewBase::preferredSizeHint(const TQSize& otherSize)
 {
-	KexiDialogBase* dlg = tqparentDialog();
+	KexiDialogBase* dlg = parentDialog();
 	if (dlg && dlg->mdiParent()) {
 		TQRect r = dlg->mdiParent()->mdiAreaContentsRect();
 		return otherSize.boundedTo( TQSize(
@@ -103,14 +103,14 @@ KoProperty::Set *KexiViewBase::propertySet()
 
 void KexiViewBase::propertySetSwitched()
 {
-	if (tqparentDialog())
-		m_mainWin->propertySetSwitched( tqparentDialog(), false );
+	if (parentDialog())
+		m_mainWin->propertySetSwitched( parentDialog(), false );
 }
 
 void KexiViewBase::propertySetReloaded(bool preservePrevSelection, const TQCString& propertyToSelect)
 {
-	if (tqparentDialog())
-		m_mainWin->propertySetSwitched( tqparentDialog(), true, preservePrevSelection, propertyToSelect );
+	if (parentDialog())
+		m_mainWin->propertySetSwitched( parentDialog(), true, preservePrevSelection, propertyToSelect );
 }
 
 void KexiViewBase::setDirty(bool set)
@@ -240,7 +240,7 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
 			if (e->type()==TQEvent::FocusIn && m_actionProxyParent) {
 				m_actionProxyParent->m_focusedChild = this;
 			}
-//			m_mainWin->tqinvalidateSharedActions(this);
+//			m_mainWin->invalidateSharedActions(this);
 		}
 	}
 	return false;
@@ -286,7 +286,7 @@ void KexiViewBase::setFocus()
 		else
 			setFocusInternal();
 	}
-	m_mainWin->tqinvalidateSharedActions(TQT_TQOBJECT(this));
+	m_mainWin->invalidateSharedActions(TQT_TQOBJECT(this));
 }
 
 KAction* KexiViewBase::sharedAction( const char *action_name )
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 24f5d8ad..60beadf8 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -62,11 +62,11 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		inline KexiMainWindow *mainWin() const { return m_mainWin; }
 
 		//! \return tqparent KexiDialogBase that contains this view, or 0 if no dialog contain this view
-		KexiDialogBase* tqparentDialog() const { return m_dialog; }
+		KexiDialogBase* parentDialog() const { return m_dialog; }
 
 		/*! Added for convenience.
 		 \return KexiPart object that was used to create this view (with a dialog)
-		 or 0 if this view is not created using KexiPart. \sa tqparentDialog() */
+		 or 0 if this view is not created using KexiPart. \sa parentDialog() */
 		KexiPart::Part* part() const;
 
 		/*! \return preferred size hint, that can be used to resize the view.
@@ -237,13 +237,13 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
 		 - it is called by KexiDialogBase::youAreDetached().
 		 Default implementation does nothing.
 		 Implement it if you want to perform some appropriate actions. */
-		virtual void tqparentDialogDetached() {};
+		virtual void parentDialogDetached() {};
 
 		/*! Allows to react on tqparent 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. */
-		virtual void tqparentDialogAttached() {};
+		virtual void parentDialogAttached() {};
 
 		TQString m_defaultIconName;
 
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 bca5a387..16195281 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
@@ -246,7 +246,7 @@ After switching to the form's <em>data view</em> you can try whether the action
 </ul>
 
 <a name="form_layouts"></a>
-<H3>5.4.9. Widget tqlayouts</H3>
+<H3>5.4.9. Widget layouts</H3>
 <p>
 In most cases form widgets should be reasonable placed and aligned. Positioning, aligning and resizing widgets by hand is not easy and these parameters are not adjusted when the user resizes the form. In fact the situation is even worse because you cannot assume a given form requires a given space because users have different font sizes and display resolutions.
 </p>
@@ -256,7 +256,7 @@ The following example presents a form where text fields and labels were placed b
  <br>An example form with widgets that cannot not fit in the window<br><br>
 </p>
 <p>
-Using special tool called <em>widget tqlayouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
+Using special tool called <em>widget layouts</em> can help to automatically lay out the form widgets. Widget tqlayout is an action of grouping two or more widgets so these are well positioned and have appropriate sizes.
 </p>
 <p>
 Using tqlayout in this form improves tqalignment. Moreover, its space is better developed. Text fields are closer each other, spacing is constant.
@@ -311,9 +311,9 @@ Besides the grid type, there are other widget tqlayout types.
 </p>
 
 <a name="form_springs"></a>
-<H4>Springs in widget tqlayouts</H4>
+<H4>Springs in widget layouts</H4>
 <p>
-A <em>spring</em> in widget tqlayouts is a special, invisible element allowing to adjust widget's position and size within tqlayouts. Such a spring stretches or squeezes a widget on the right, top, bottom or left hand, so it can have desired size and position.
+A <em>spring</em> in widget layouts is a special, invisible element allowing to adjust widget's position and size within layouts. Such a spring stretches or squeezes a widget on the right, top, bottom or left hand, so it can have desired size and position.
 </p>
 <p>To use a spring:
 <ol>
@@ -331,9 +331,9 @@ To make springs work you need to create a global widget tqlayout i.e. a tqlayout
 </p>
 
 <a name="advanced_form_layouts"></a>
-<H4>Advanced widget tqlayouts</H4>
+<H4>Advanced widget layouts</H4>
 <p>
-Widget tqlayouts can be combined (or nested). On the following example you can identify two nested tqlayouts:
+Widget layouts can be combined (or nested). On the following example you can identify two nested layouts:
 </p>
 <p>
 <ol>
@@ -343,7 +343,7 @@ Widget tqlayouts can be combined (or nested). On the following example you can i
 </p>
 <p>
  <img src="img/05_04_08_form_advanced_layout.png">
- <br>Two widget tqlayouts combined: horizontal tqlayout inside of a grid tqlayout<br><br>
+ <br>Two widget layouts combined: horizontal tqlayout inside of a grid tqlayout<br><br>
 </p>
 <p>
 The horizontal tqlayout is treat in the example as a single widget by the grid tqlayout - it takes exactly one &quot;cell&quot; of the grid.
@@ -356,11 +356,11 @@ After opening a form designed this way in the data view, you can notice (by resi
 </ul>
 <p>
  <img src="img/05_04_08_form_advanced_layout_view.png">
- <br>The form using the two tqlayouts displayed in data view<br><br>
+ <br>The form using the two layouts displayed in data view<br><br>
 </p>
 
-<a name="tqlayout_breaking"></a>
-<H4>Removing widget tqlayouts</H4>
+<a name="layout_breaking"></a>
+<H4>Removing widget layouts</H4>
 <p>
 To remove widget tqlayout without removing widgets, perform one of these actions:
 <ul>
@@ -373,7 +373,7 @@ To remove widget tqlayout without removing widgets, perform one of these actions
 <p>Removing widget tqlayout using the <em>Break Layout</em> command will not remove widgets contained in the tqlayout. If you want to remove the widgets as well, just select the tqlayout by clicking on its border and press <kbd>Delete</kbd> key or use <nobr><em>Edit -&gt <img src="icons/editdelete.png" class="icon"> Delete</em></nobr> menu command or context menu command.
 </p>
 
-<a name="tqlayout_size_types"></a>
+<a name="layout_size_types"></a>
 <H4>Size policies for widgets within a tqlayout</H4>
 <p>
 Instead of setting a fixed size for your widgets, in &kexi; you can choose between various widget's <em>size policies</em>. A size policy is a flexible strategy for controlling how a widget is stretched (or shrunk) depending on other neighbouring widgets and space available within the form.
diff --git a/kexi/doc/handbook/translation-status.txt b/kexi/doc/handbook/translation-status.txt
index 278770d8..65aa6008 100644
--- a/kexi/doc/handbook/translation-status.txt
+++ b/kexi/doc/handbook/translation-status.txt
@@ -68,10 +68,10 @@ DONE    5.4.6. Assigning data sources
 DONE    5.4.7. Inserting text labels
 DONE    5.4.8. Actions
 DONE      * Assigning actions to form buttons
-DONE    5.4.9. Widget tqlayouts
-DONE      * Springs in widget tqlayouts
-DONE      * Advanced widget tqlayouts
-DONE      * Removing widget tqlayouts
+DONE    5.4.9. Widget layouts
+DONE      * Springs in widget layouts
+DONE      * Advanced widget layouts
+DONE      * Removing widget layouts
 DONE      * Size policies for widgets within a tqlayout
 DONE    5.4.10. Setting widgets size and position by hand
 DONE    5.4.11. Setting the tab order
diff --git a/kexi/examples/Simple_Database.kexi.sql b/kexi/examples/Simple_Database.kexi.sql
index dbd89e1d..b7712aa8 100644
--- a/kexi/examples/Simple_Database.kexi.sql
+++ b/kexi/examples/Simple_Database.kexi.sql
@@ -219,7 +219,7 @@ INSERT INTO "kexi__objectdata" VALUES(4, '<!DOCTYPE UI>
 </property>
 </widget>
 </widget>
-<tqlayoutDefaults spacing="6" margin="11" />
+<layoutDefaults spacing="6" margin="11" />
 <tabstops>
 <tabstop>TextLabel1</tabstop>
 <tabstop>TextLabel2</tabstop>
@@ -330,7 +330,7 @@ INSERT INTO "kexi__objectdata" VALUES(96, '<!DOCTYPE UI>
    <data format="XBM.GZ" length="79" >789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
   </image>
  </images>
- <tqlayoutDefaults spacing="6" margin="11" />
+ <layoutDefaults spacing="6" margin="11" />
  <tabstops>
   <tabstop>SubReport1</tabstop>
  </tabstops>
@@ -607,7 +607,7 @@ INSERT INTO "kexi__objectdata" VALUES(105, '<!DOCTYPE UI>
 <includehint>kcombobox.h</includehint>
 <includehint>klineedit.h</includehint>
 </includehints>
-<tqlayoutDefaults spacing="6" margin="11" />
+<layoutDefaults spacing="6" margin="11" />
 <tabstops>
 <tabstop>TextLabel1</tabstop>
 <tabstop>image</tabstop>
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index d628d53f..c08e44e6 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -236,7 +236,7 @@ AlignWidgetsCommand::execute()
 
 	int gridX = m_form->gridSize();
 	int gridY = m_form->gridSize();
-	TQWidget *tqparentWidget = m_form->selectedWidgets()->first()->tqparentWidget();
+	TQWidget *parentWidget = m_form->selectedWidgets()->first()->parentWidget();
 	int tmpx, tmpy;
 
 	WidgetList list;
@@ -265,7 +265,7 @@ AlignWidgetsCommand::execute()
 
 		case AlignToLeft:
 		{
-			tmpx = tqparentWidget->width();
+			tmpx = parentWidget->width();
 			for(TQWidget *w = list.first(); w; w = list.next())
 			{
 				if(w->x() < tmpx)
@@ -293,7 +293,7 @@ AlignWidgetsCommand::execute()
 
 		case AlignToTop:
 		{
-			tmpy = tqparentWidget->height();
+			tmpy = parentWidget->height();
 			for(TQWidget *w = list.first(); w; w = list.next())
 			{
 				if(w->y() < tmpy)
@@ -378,11 +378,11 @@ AdjustSizeCommand::AdjustSizeCommand(int type, WidgetList &list, Form *form)
 {
 	for(TQWidget *w = list.first(); w; w = list.next())
 	{
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		m_sizes.insert(w->name(), w->size());
@@ -446,8 +446,8 @@ AdjustSizeCommand::execute()
 						s.setWidth(30);
 					if(s.height() < 30)
 						s.setHeight(30);
-					// small hack for flow tqlayouts
-					int type = item->container() ? item->container()->tqlayoutType() : Container::NoLayout;
+					// small hack for flow layouts
+					int type = item->container() ? item->container()->layoutType() : Container::NoLayout;
 					if(type == Container::HFlow)
 						s.setWidth(s.width() + 5);
 					else if(type == Container::VFlow)
@@ -846,11 +846,11 @@ InsertWidgetCommand::debug()
 
 /// CreateLayoutCommand ///////////////
 
-CreateLayoutCommand::CreateLayoutCommand(int tqlayoutType, WidgetList &list, Form *form)
- : m_form(form), m_type(tqlayoutType)
+CreateLayoutCommand::CreateLayoutCommand(int layoutType, WidgetList &list, Form *form)
+ : m_form(form), m_type(layoutType)
 {
 	WidgetList *m_list=0;
-	switch(tqlayoutType)
+	switch(layoutType)
 	{
 		case Container::HBox:
 		case Container::Grid:
@@ -890,7 +890,7 @@ CreateLayoutCommand::execute()
 		case Container::HSplitter: case Container::VSplitter:
 			classname = TQSPLITTER_OBJECT_NAME_STRING; break;
 		default:
-			classname = Container::tqlayoutTypeToString(m_type).latin1();
+			classname = Container::layoutTypeToString(m_type).latin1();
 	}
 
 	if(m_name.isEmpty())// the name must be generated only once
@@ -1017,11 +1017,11 @@ BreakLayoutCommand::BreakLayoutCommand(Container *container)
 	m_containername = container->toplevel()->widget()->name();
 	m_name = container->widget()->name();
 	m_form = container->form();
-	m_type = container->tqlayoutType();
+	m_type = container->layoutType();
 
 	for(ObjectTreeItem *tree = container->objectTree()->tqchildren()->first(); tree; tree = container->objectTree()->tqchildren()->next())
 	{
-		TQRect r(container->widget()->mapTo(container->widget()->tqparentWidget(), tree->widget()->pos()), tree->widget()->size());
+		TQRect r(container->widget()->mapTo(container->widget()->parentWidget(), tree->widget()->pos()), tree->widget()->size());
 		m_pos.insert(tree->widget()->name(), r);
 	}
 }
@@ -1385,7 +1385,7 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 	{
 		TQWidget *w = it.current();
 		// Don't delete tabwidget or widgetstack pages
-		if(w->tqparentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
 			list.remove(w);
 			continue;
@@ -1399,8 +1399,8 @@ DeleteWidgetCommand::DeleteWidgetCommand(WidgetList &list, Form *form)
 		if (!item)
 			return;
 
-		// We need to store both tqparentContainer and tqparentWidget as they may be different (eg for TabWidget page)
-		m_containers.insert(item->name().latin1(), m_form->tqparentContainer(item->widget())->widget()->name());
+		// 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);
 		form->connectionBuffer()->saveAllConnectionsForWidget(item->widget()->name(), m_domDoc);
@@ -1421,7 +1421,7 @@ DeleteWidgetCommand::execute()
 		if (!item || !item->widget())
 			continue;
 
-		Container *cont = m_form->tqparentContainer(item->widget());
+		Container *cont = m_form->parentContainer(item->widget());
 		if (!containerToSelect)
 			containerToSelect = cont;
 		cont->deleteWidget(item->widget());
@@ -1476,7 +1476,7 @@ void
 DeleteWidgetCommand::debug()
 {
 	kdDebug() << "DeleteWidgetCommand: containers=" << m_containers.keys()
-		<< " tqparents=" << m_parents.keys() << " form=" << m_form->widget()->name() << endl;
+		<< " parents=" << m_parents.keys() << " form=" << m_form->widget()->name() << endl;
 }
 
 // CutWidgetCommand
@@ -1510,7 +1510,7 @@ void
 CutWidgetCommand::debug()
 {
 	kdDebug() << "CutWidgetCommand: containers=" << m_containers.keys()
-		<< " tqparents=" << m_parents.keys() << " form=" << m_form->widget()->name()
+		<< " parents=" << m_parents.keys() << " form=" << m_form->widget()->name()
 		<< " data=\"" << m_data.left(80) << "...\"" << endl;
 }
 
diff --git a/kexi/formeditor/commands.h b/kexi/formeditor/commands.h
index c38f9b86..d998ad36 100644
--- a/kexi/formeditor/commands.h
+++ b/kexi/formeditor/commands.h
@@ -209,7 +209,7 @@ class KFORMEDITOR_EXPORT InsertWidgetCommand : public Command
 class KFORMEDITOR_EXPORT CreateLayoutCommand : public Command
 {
 	public:
-		CreateLayoutCommand(int tqlayoutType, WidgetList &list, Form *form);
+		CreateLayoutCommand(int layoutType, WidgetList &list, Form *form);
 		CreateLayoutCommand() {;} // for BreakLayoutCommand
 
 		virtual void execute();
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 03302d3a..fff9a47c 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -405,7 +405,7 @@ ConnectionDialog::removeItem()
 	if(m_table->currentRow() == -1 || m_table->currentRow()>=m_table->rows())
 		return;
 
-	int confirm = KMessageBox::warningContinueCancel(tqparentWidget(),
+	int confirm = KMessageBox::warningContinueCancel(parentWidget(),
 		TQString("<qt>")+i18n("Do you want to delete this connection ?")+"</qt>", TQString(), KGuiItem(i18n("&Delete Connection")),
 		"dontAskBeforeDeleteConnection"/*config entry*/);
 	if(confirm == KMessageBox::Cancel)
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index a68e34d2..a9942d1c 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -299,7 +299,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			{
 				if(!m_toplevel && m_moving == m_container) // no effect for form
 					return false;
-				if((!m_moving) || (!m_moving->tqparentWidget()))// || (m_moving->tqparentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+				if((!m_moving) || (!m_moving->parentWidget()))// || (m_moving->parentWidget()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 						return true;
 
 				moveSelectedWidgetsBy(mev->x() - m_grab.x(), mev->y() - m_grab.y());
@@ -915,7 +915,7 @@ Container::createGridLayout(bool testOnly)
 }
 
 TQString
-Container::tqlayoutTypeToString(int type)
+Container::layoutTypeToString(int type)
 {
 	switch(type)
 	{
@@ -1110,24 +1110,24 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		int tmpx = w->x() + realdx;
 		int tmpy = w->y() + realdy;
 		if(tmpx < 0)
 			dx = TQMAX(0 - w->x(), dx); // because dx is <0
-		else if(tmpx > w->tqparentWidget()->width() - gridX)
-			dx = TQMIN(w->tqparentWidget()->width() - gridX - w->x(), dx);
+		else if(tmpx > w->parentWidget()->width() - gridX)
+			dx = TQMIN(w->parentWidget()->width() - gridX - w->x(), dx);
 
 		if(tmpy < 0)
 			dy = TQMAX(0 - w->y(), dy); // because dy is <0
-		else if(tmpy > w->tqparentWidget()->height() - gridY)
-			dy = TQMIN(w->tqparentWidget()->height() - gridY - w->y(), dy);
+		else if(tmpy > w->parentWidget()->height() - gridY)
+			dy = TQMIN(w->parentWidget()->height() - gridY - w->y(), dy);
 	}
 
 	for(TQWidget *w = m_form->selectedWidgets()->first(); w; w = m_form->selectedWidgets()->next())
@@ -1136,11 +1136,11 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev)
 		if(!w || !w->tqparent() || w->tqparent()->inherits(TQTABWIDGET_OBJECT_NAME_STRING) || w->tqparent()->inherits(TQWIDGETSTACK_OBJECT_NAME_STRING))
 			continue;
 
-		if(w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+		if(w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 		{
-			w = w->tqparentWidget(); // widget is WidgetStack page
-			if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
-				w = w->tqparentWidget();
+			w = w->parentWidget(); // widget is WidgetStack page
+			if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) // widget is tabwidget page
+				w = w->parentWidget();
 		}
 
 		int tmpx, tmpy;
diff --git a/kexi/formeditor/container.h b/kexi/formeditor/container.h
index a76c913a..f2ae1f14 100644
--- a/kexi/formeditor/container.h
+++ b/kexi/formeditor/container.h
@@ -107,13 +107,13 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		TQLayout* tqlayout() const { return m_layout; }
 
 		//! \return the type of the tqlayout associated to this Container's widget (see LayoutType enum).
-		LayoutType tqlayoutType() const { return m_layType; }
+		LayoutType layoutType() const { return m_layType; }
 
 		//! \return the margin of this Container.
-		int tqlayoutMargin() { return m_margin; }
+		int layoutMargin() { return m_margin; }
 
 		//! \return the spacing of this Container.
-		int tqlayoutSpacing() { return m_spacing; }
+		int layoutSpacing() { return m_spacing; }
 
 		/*! Sets this Container to use \a type of tqlayout. The widget are inserted
 		 automatically in the tqlayout following their positions.
@@ -126,8 +126,8 @@ class KFORMEDITOR_EXPORT Container : public TQObject
 		//! Sets the margin of this Container.
 		void setLayoutMargin(int margin) { m_margin = margin;}
 
-		//! \return the string representing the tqlayoutType \a type.
-		static TQString tqlayoutTypeToString(int type);
+		//! \return the string representing the layoutType \a type.
+		static TQString layoutTypeToString(int type);
 
 		//! \return the LayoutType (an int) for a given tqlayout name.
 		static LayoutType stringToLayoutType(const TQString &name);
diff --git a/kexi/formeditor/events.cpp b/kexi/formeditor/events.cpp
index d7d62358..ff16bcd9 100644
--- a/kexi/formeditor/events.cpp
+++ b/kexi/formeditor/events.cpp
@@ -67,18 +67,18 @@ ConnectionBuffer::allConnectionsForWidget(const TQString &widget)
 }
 
 void
-ConnectionBuffer::save(TQDomNode &tqparentNode)
+ConnectionBuffer::save(TQDomNode &parentNode)
 {
 	if(isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement connections;
-	if(!tqparentNode.namedItem("connections").isNull())
-		connections = tqparentNode.namedItem("connections").toElement();
+	if(!parentNode.namedItem("connections").isNull())
+		connections = parentNode.namedItem("connections").toElement();
 	else
 		connections = domDoc.createElement("connections");
-	tqparentNode.appendChild(connections);
+	parentNode.appendChild(connections);
 
 	for(Connection *c = first(); c; c = next())
 	{
@@ -109,10 +109,10 @@ ConnectionBuffer::save(TQDomNode &tqparentNode)
 }
 
 void
-ConnectionBuffer::saveAllConnectionsForWidget(const TQString &widget, TQDomNode tqparentNode)
+ConnectionBuffer::saveAllConnectionsForWidget(const TQString &widget, TQDomNode parentNode)
 {
 	ConnectionBuffer *buff = allConnectionsForWidget(widget);
-	buff->save(tqparentNode);
+	buff->save(parentNode);
 	delete buff;
 }
 
diff --git a/kexi/formeditor/events.h b/kexi/formeditor/events.h
index 727b3a43..a0ee3bac 100644
--- a/kexi/formeditor/events.h
+++ b/kexi/formeditor/events.h
@@ -60,15 +60,15 @@ class KFORMEDITOR_EXPORT ConnectionBuffer : public ConnectionList
 		ConnectionBuffer();
 		~ConnectionBuffer() {;}
 
-		void save(TQDomNode &tqparentNode);
-		void load(TQDomNode tqparentNode);
+		void save(TQDomNode &parentNode);
+		void load(TQDomNode parentNode);
 
 		/*! This function is called when a widget is renamed from \a oldname
 		to \a newname. All the Connections for this widget are updated. */
 		void    fixName(const TQString &oldname, const TQString &newName);
 
 		ConnectionBuffer*     allConnectionsForWidget(const TQString &widget);
-		void     saveAllConnectionsForWidget(const TQString &widget, TQDomNode tqparentNode);
+		void     saveAllConnectionsForWidget(const TQString &widget, TQDomNode parentNode);
 		void     removeAllConnectionsForWidget(const TQString &widget);
 };
 
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index ada3f994..15011e50 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -651,12 +651,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 	//m_widget = w;
 //	m_container = container;
 
-	if((classname == "KFDTabWidget") || (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((classname == "KFDTabWidget") || (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		if(w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+		if(w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
 		{
-			//m_widget = w->tqparentWidget()->tqparentWidget();
-			setWidget(w->tqparentWidget()->tqparentWidget(), m_container->toplevel());
+			//m_widget = w->parentWidget()->parentWidget();
+			setWidget(w->parentWidget()->parentWidget(), m_container->toplevel());
 //			m_container = m_container->toplevel();
 		}
 
@@ -668,12 +668,12 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 			menu->setItemEnabled(id, false);
 		return true;
 	}
-	else if(w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+	else if(w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING) && !w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
 	{
-		//m_widget = w->tqparentWidget();
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget(); //m_widget;
+		//m_widget = w->parentWidget();
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
 		setWidget(
-			w->tqparentWidget(),
+			w->parentWidget(),
 			container->form()->objectTree()->lookup(stack->name())->tqparent()->container()
 		);
 //		m_container = container->form()->objectTree()->lookup(m_widget->name())->tqparent()->container();
@@ -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 &tqparentNode, TQDomDocument &tqparent)
+ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
 {
-	if((name == "title") && (w->tqparentWidget()->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget()->tqparentWidget());
-		KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "title", tab->tabLabel(w));
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
+		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "title", tab->tabLabel(w));
 	}
-	else if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+	else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
-		KFormDesigner::FormIO::savePropertyElement(tqparentNode, tqparent, "attribute", "id", stack->id(w));
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
+		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "id", stack->id(w));
 	}
 	else
 		return false;
@@ -743,15 +743,15 @@ ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQW
 	TQString name = node.attribute("name");
 	if((name == "title") && (item->tqparent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->tqparentWidget());
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
 		tab->addTab(w, node.firstChild().toElement().text());
 		item->addModifiedProperty("title", node.firstChild().toElement().text());
 		return true;
 	}
 
-	if((name == "id") && (w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
+	if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)w->tqparentWidget();
+		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
 		int id = KFormDesigner::FormIO::readPropertyValue(node.firstChild(), TQT_TQOBJECT(w), name).toInt();
 		stack->addWidget(w, id);
 		stack->raiseWidget(w);
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index b8623fad..c8bdc1a6 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -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 &tqparentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
 		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 b625c712..7460b480 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -667,7 +667,7 @@ StdWidgetFactory::resizeEditor(TQWidget *editor, TQWidget *widget, const TQCStri
 }
 
 bool
-StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &domDoc)
 {
 	if(name == "list_items" && classname == "KComboBox")
 	{
@@ -676,7 +676,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		{
 			TQDomElement item = domDoc.createElement("item");
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", combo->text(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 		return true;
 	}
@@ -687,7 +687,7 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 		{
 			TQDomElement item = domDoc.createElement("item");
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "text", listbox->text(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 		return true;
 	}
@@ -703,14 +703,14 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "resizable", listview->header()->isResizeEnabled(i));
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "clickable", listview->header()->isClickEnabled(i));
 			KFormDesigner::FormIO::savePropertyElement(item, domDoc, "property", "fullwidth", listview->header()->isStretchEnabled(i));
-			tqparentNode.appendChild(item);
+			parentNode.appendChild(item);
 		}
 
 		// Then we save the list view items
 		TQListViewItem *item = listview->firstChild();
 		while(item)
 		{
-			saveListItem(item, tqparentNode, domDoc);
+			saveListItem(item, parentNode, domDoc);
 			item = item->nextSibling();
 		}
 		return true;
@@ -720,10 +720,10 @@ StdWidgetFactory::saveSpecialProperty(const TQCString &classname, const TQString
 }
 
 void
-StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc)
+StdWidgetFactory::saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc)
 {
 	TQDomElement element = domDoc.createElement("item");
-	tqparentNode.appendChild(element);
+	parentNode.appendChild(element);
 
 	// We save the text of each column
 	for(int i = 0; i < item->listView()->columns(); i++)
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index f5bd5528..5d9032f0 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -74,7 +74,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 
 		virtual bool saveSpecialProperty(const TQCString &classname,
 			const TQString &name, const TQVariant &value, TQWidget *w,
-			TQDomElement &tqparentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &tqparent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node,
 			TQWidget *w, KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
@@ -91,7 +91,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 			const TQCString &property, bool isTopLevel);
 		virtual bool changeText(const TQString &newText);
 		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
-		void saveListItem(TQListViewItem *item, TQDomNode &tqparentNode, TQDomDocument &domDoc);
+		void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
 		void readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview);
 
 	private:
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 41afdf37..6acf139c 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -173,11 +173,11 @@ Form::commonParentContainer(WidgetList *wlist)
 	ObjectTreeItem *item = 0;
 	WidgetList *list = new WidgetList();
 
-	// Creates a list of all widget tqparents
+	// Creates a list of all widget parents
 	for(TQWidget *w = wlist->first(); w; w = wlist->next())
 	{
-		if(list->tqfindRef(w->tqparentWidget()) == -1)
-			list->append(w->tqparentWidget());
+		if(list->tqfindRef(w->parentWidget()) == -1)
+			list->append(w->parentWidget());
 	}
 
 	removeChildrenFromList(*list);
@@ -193,7 +193,7 @@ Form::commonParentContainer(WidgetList *wlist)
 }
 
 Container*
-Form::tqparentContainer(TQWidget *w)
+Form::parentContainer(TQWidget *w)
 {
 	ObjectTreeItem *it;
 	if(!w)
@@ -245,14 +245,14 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 		return;
 	}
 
-	//raise selected widget and all possible tqparents
+	//raise selected widget and all possible parents
 	TQWidget *wtmp = w;
-	while(!dontRaise && wtmp && wtmp->tqparentWidget() && (wtmp != widget()))
+	while(!dontRaise && wtmp && wtmp->parentWidget() && (wtmp != widget()))
 	{
 		wtmp->raise();
 		if(d->resizeHandles[ wtmp->name() ])
 			d->resizeHandles[ wtmp->name() ]->raise();
-		wtmp = wtmp->tqparentWidget();
+		wtmp = wtmp->parentWidget();
 	}
 
 	if (wtmp)
@@ -268,11 +268,11 @@ Form::setSelectedWidget(TQWidget *w, bool add, bool dontRaise, bool moreWillBeSe
 	emitActionSignals(false);
 
 	// WidgetStack and TabWidget pages widgets shouldn't have resize handles, but their tqparent
-	if(!FormManager::self()->isTopLevel(w) && w->tqparentWidget() && w->tqparentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
+	if(!FormManager::self()->isTopLevel(w) && w->parentWidget() && w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING))
 	{
-		w = w->tqparentWidget();
-		if(w->tqparentWidget() && w->tqparentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
-			w = w->tqparentWidget();
+		w = w->parentWidget();
+		if(w->parentWidget() && w->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
+			w = w->parentWidget();
 	}
 
 	if(w && w != widget())
diff --git a/kexi/formeditor/form.h b/kexi/formeditor/form.h
index dbe64b52..d41d7a29 100644
--- a/kexi/formeditor/form.h
+++ b/kexi/formeditor/form.h
@@ -181,7 +181,7 @@ class KFORMEDITOR_EXPORT Form : public TQObject
 		 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.
 		 */
-		Container* tqparentContainer(TQWidget *w=0);
+		Container* parentContainer(TQWidget *w=0);
 
 		/*! \return The \ref Container which is a tqparent of all widgets in \a wlist.
 		 Used by \ref activeContainer(), and to find where
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 4b46f8fe..dbfdc10a 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -183,11 +183,11 @@ FormIO::saveFormToDom(Form *form, TQDomDocument &domDoc)
 	// Save the toplevel widgets, and so the whole Form
 	saveWidget(form->objectTree(), uiElement, domDoc);
 
-	// We then save the tqlayoutdefaults element
-	TQDomElement tqlayoutDefaults = domDoc.createElement("tqlayoutDefaults");
-	tqlayoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing()));
-	tqlayoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin()));
-	uiElement.appendChild(tqlayoutDefaults);
+	// We then save the layoutdefaults element
+	TQDomElement layoutDefaults = domDoc.createElement("layoutDefaults");
+	layoutDefaults.setAttribute("spacing", TQString::number(form->defaultSpacing()));
+	layoutDefaults.setAttribute("margin", TQString::number(form->defaultMargin()));
+	uiElement.appendChild(layoutDefaults);
 
 	/// Save tab Stops
 	if(form->autoTabStops())
@@ -398,7 +398,7 @@ FormIO::loadFormFromDom(Form *form, TQWidget *container, TQDomDocument &inBuf)
 /////////////////////////////////////////////////////////////////////////////
 
 void
-FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, const char *name, 
+FormIO::savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, const char *name, 
 	const TQVariant &value, TQWidget *w, WidgetLibrary *lib)
 {
 	// Widget specific properties and attributes ///////////////
@@ -416,7 +416,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 	{
 		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, tqparentNode, tqparent);
+			lib->saveSpecialProperty(w->className(), name, value, w, parentNode, tqparent);
 		return;
 	}
 
@@ -449,7 +449,7 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 			type.appendChild(valueE);
 		}
 		propertyE.appendChild(type);
-		tqparentNode.appendChild(propertyE);
+		parentNode.appendChild(propertyE);
 		return;
 	}
 
@@ -464,17 +464,17 @@ FormIO::savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, c
 			valueE = tqparent.createTextNode(m_currentItem->pixmapName(property));
 		type.appendChild(valueE);
 		propertyE.appendChild(type);
-		tqparentNode.appendChild(propertyE);
+		parentNode.appendChild(propertyE);
 		return;
 	}
 
 	// Saving a "normal" property
 	writeVariant(tqparent, propertyE, value);
-	tqparentNode.appendChild(propertyE);
+	parentNode.appendChild(propertyE);
 }
 
 void
-FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVariant value)
+FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &parentNode, TQVariant value)
 {
 	TQDomElement type;
 	TQDomText valueE;
@@ -721,16 +721,16 @@ FormIO::writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVari
 			break;
 	}
 
-	tqparentNode.appendChild(type);
+	parentNode.appendChild(type);
 }
 
 void
-FormIO::savePropertyElement(TQDomElement &tqparentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value)
+FormIO::savePropertyElement(TQDomElement &parentNode, TQDomDocument &domDoc, const TQString &tagName, const TQString &property, const TQVariant &value)
 {
 	TQDomElement propertyE = domDoc.createElement(tagName);
 	propertyE.setAttribute("name", property);
 	writeVariant(domDoc, propertyE, value);
-	tqparentNode.appendChild(propertyE);
+	parentNode.appendChild(propertyE);
 }
 
 TQVariant
@@ -1019,22 +1019,22 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 	}
 	// Saving container 's tqlayout if there is one
 	TQDomElement tqlayout;
-	if(item->container() && item->container()->tqlayoutType() != Container::NoLayout)
+	if(item->container() && item->container()->layoutType() != Container::NoLayout)
 	{
 		if(item->container()->tqlayout()) // there is a tqlayout
 		{
 			tqlayout = domDoc.createElement("temp");
 			savePropertyValue(tqlayout, domDoc, "name", "unnamed", item->widget());
-			if(item->modifiedProperties()->tqcontains("tqlayoutMargin"))
-				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->tqlayoutMargin());
-			if(item->modifiedProperties()->tqcontains("tqlayoutSpacing"))
-				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->tqlayoutSpacing());
+			if(item->modifiedProperties()->tqcontains("layoutMargin"))
+				savePropertyElement(tqlayout, domDoc, "property", "margin", item->container()->layoutMargin());
+			if(item->modifiedProperties()->tqcontains("layoutSpacing"))
+				savePropertyElement(tqlayout, domDoc, "property", "spacing", item->container()->layoutSpacing());
 			tclass.appendChild(tqlayout);
 		}
 	}
 
-	int tqlayoutType = item->container() ? item->container()->tqlayoutType() : Container::NoLayout;
-	switch(tqlayoutType) {
+	int layoutType = item->container() ? item->container()->layoutType() : Container::NoLayout;
+	switch(layoutType) {
 		case Container::Grid: // grid tqlayout
 		{
 			tqlayout.setTagName("grid");
@@ -1075,7 +1075,7 @@ FormIO::saveWidget(ObjectTreeItem *item, TQDomElement &tqparent, TQDomDocument &
 			WidgetList *list = (WidgetList*)flow->widgetList();
 
 			// save some special properties
-			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::tqlayoutTypeToString(item->container()->tqlayoutType()) );
+			savePropertyElement(tqlayout, domDoc, "property", "customLayout", Container::layoutTypeToString(item->container()->layoutType()) );
 			savePropertyElement(tqlayout, domDoc, "property", "justify", TQVariant(static_cast<KexiFlowLayout*>(item->container()->tqlayout())->isJustified(), 3) );
 
 			// fill the widget's grid info, ie just simulate grid tqlayout
@@ -1231,7 +1231,7 @@ FormIO::loadWidget(Container *container, const TQDomElement &el, TQWidget *tqpar
 
 	m_currentItem = item;
 	// if we are inside a Grid, we need to insert the widget in the good cell
-	if(container->tqlayoutType() == Container::Grid)  {
+	if(container->layoutType() == Container::Grid)  {
 		TQGridLayout *tqlayout = (TQGridLayout*)container->tqlayout();
 		if(el.hasAttribute("rowspan")) { // widget spans multiple cells
 			if(tqlayout)
@@ -1420,21 +1420,21 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl
 		}
 		else if(tag == "grid") {
 			// first, see if it is flow tqlayout
-			TQString tqlayoutName;
+			TQString layoutName;
 			for(TQDomNode child = node.firstChild(); !child.isNull(); child = child.nextSibling())  {
 				if((child.toElement().tagName() == "property") && (child.toElement().attribute("name") == "customLayout"))  {
-					tqlayoutName = child.toElement().text();
+					layoutName = child.toElement().text();
 					break;
 				}
 			}
 
-			 if(tqlayoutName == "HFlow") {
+			 if(layoutName == "HFlow") {
 				item->container()->m_layType = Container::HFlow;
 				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
 				tqlayout->setOrientation(Qt::Horizontal);
 				item->container()->m_layout = (TQLayout*)tqlayout;
 			}
-			else if(tqlayoutName == "VFlow") {
+			else if(layoutName == "VFlow") {
 				item->container()->m_layType = Container::VFlow;
 				KexiFlowLayout *tqlayout = new KexiFlowLayout(item->widget());
 				tqlayout->setOrientation(Qt::Vertical);
diff --git a/kexi/formeditor/formIO.h b/kexi/formeditor/formIO.h
index f2308433..5556b240 100644
--- a/kexi/formeditor/formIO.h
+++ b/kexi/formeditor/formIO.h
@@ -149,12 +149,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static void loadWidget(Container *container,
 			const TQDomElement &el, TQWidget *tqparent=0);
 
-		/*! Save an element in the \a domDoc as child of \a tqparentNode.
+		/*! Save an element in the \a domDoc as child of \a parentNode.
 		  The element will be saved like this :
 		  \code  <$(tagName) name = "$(property)">< value_as_XML ><$(tagName)/>
 		  \endcode
 		*/
-		static void savePropertyElement(TQDomElement &tqparentNode, TQDomDocument &domDoc, const TQString &tagName,
+		static void savePropertyElement(TQDomElement &parentNode, TQDomDocument &domDoc, const TQString &tagName,
 			const TQString &property, const TQVariant &value);
 
 		/*! Read an object property in the DOM doc.
@@ -165,7 +165,7 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 		static TQVariant readPropertyValue(TQDomNode node, TQObject *obj, const TQString &name);
 
 		/*! Write an object property in the DOM doc.
-		   \param tqparentNode the DOM document to write to
+		   \param parentNode the DOM document to write to
 		   \param name   the name of the property being saved
 		   \param value  the value of this property
 		   \param w      the widget whose property is being saved
@@ -174,12 +174,12 @@ class KFORMEDITOR_EXPORT FormIO : public TQObject
 			 Properties of subwidget are saved with subwidget="true" arribute added 
 			 to 'property' XML element.
 		*/
-		static void savePropertyValue(TQDomElement &tqparentNode, TQDomDocument &tqparent, const char *name,
+		static void savePropertyValue(TQDomElement &parentNode, TQDomDocument &tqparent, 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 tqparentNode.*/
-		static void writeVariant(TQDomDocument &tqparent, TQDomElement &tqparentNode, TQVariant value);
+		/*! 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);
 
 		/*! Creates a toplevel widget from the TQDomElement \a element in the Form \a form,
 		 with \a tqparent as tqparent widget.
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 85001f5e..4004fcd4 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -890,7 +890,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	PLUG_ACTION("edit_paste", true);
 	PLUG_ACTION("edit_delete", !toplevelWidgetSelected);
 	separatorNeeded = true;
-	PLUG_ACTION("tqlayout_menu", enableLayout);
+	PLUG_ACTION("layout_menu", enableLayout);
 	PLUG_ACTION("break_layout", enableLayout);
 	separatorNeeded = true;
 	PLUG_ACTION("align_menu", !toplevelWidgetSelected);
@@ -1050,49 +1050,49 @@ FormManager::slotConnectionCreated(Form *form, Connection &connection)
 }
 
 void
-FormManager::tqlayoutHBox()
+FormManager::layoutHBox()
 {
 	createLayout(Container::HBox);
 }
 
 void
-FormManager::tqlayoutVBox()
+FormManager::layoutVBox()
 {
 	createLayout(Container::VBox);
 }
 
 void
-FormManager::tqlayoutGrid()
+FormManager::layoutGrid()
 {
 	createLayout(Container::Grid);
 }
 
 void
-FormManager::tqlayoutHSplitter()
+FormManager::layoutHSplitter()
 {
 	createLayout(Container::HSplitter);
 }
 
 void
-FormManager::tqlayoutVSplitter()
+FormManager::layoutVSplitter()
 {
 	createLayout(Container::VSplitter);
 }
 
 void
-FormManager::tqlayoutHFlow()
+FormManager::layoutHFlow()
 {
 	createLayout(Container::HFlow);
 }
 
 void
-FormManager::tqlayoutVFlow()
+FormManager::layoutVFlow()
 {
 	createLayout(Container::VFlow);
 }
 
 void
-FormManager::createLayout(int tqlayoutType)
+FormManager::createLayout(int layoutType)
 {
 	WidgetList *list = m_active->selectedWidgets();
 	// if only one widget is selected (a container), we modify its tqlayout
@@ -1105,15 +1105,15 @@ FormManager::createLayout(int tqlayoutType)
 		ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
 		if(!item || !item->container() || !m_propSet->tqcontains("tqlayout"))
 			return;
-		(*m_propSet)["tqlayout"] = Container::tqlayoutTypeToString(tqlayoutType);
+		(*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
 		return;
 	}
 
-	TQWidget *tqparent = list->first()->tqparentWidget();
+	TQWidget *tqparent = list->first()->parentWidget();
 	for(TQWidget *w = list->first(); w; w = list->next())
 	{
-		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->tqparentWidget()->name() << " insteaed of " << tqparent->name() << endl;
-		if(w->tqparentWidget() != tqparent)
+		kdDebug() << "comparing widget " << w->name() << " whose tqparent is " << w->parentWidget()->name() << " insteaed of " << tqparent->name() << endl;
+		if(w->parentWidget() != tqparent)
 		{
 			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
 		   "All selected widgets must have the same tqparent."));
@@ -1122,7 +1122,7 @@ FormManager::createLayout(int tqlayoutType)
 		}
 	}
 
-	KCommand *com = new CreateLayoutCommand(tqlayoutType, *list, m_active);
+	KCommand *com = new CreateLayoutCommand(layoutType, *list, m_active);
 	m_active->addCommand(com, true);
 }
 
@@ -1244,11 +1244,11 @@ FormManager::alignWidgets(int type)
 	if(!activeForm() || !activeForm()->objectTree() || (activeForm()->selectedWidgets()->count() < 2))
 		return;
 
-	TQWidget *tqparentWidget = activeForm()->selectedWidgets()->first()->tqparentWidget();
+	TQWidget *parentWidget = activeForm()->selectedWidgets()->first()->parentWidget();
 
 	for(TQWidget *w = activeForm()->selectedWidgets()->first(); w; w = activeForm()->selectedWidgets()->next())
 	{
-		if(w->tqparentWidget() != tqparentWidget)
+		if(w->parentWidget() != parentWidget)
 		{
 			kdDebug() << "FormManager::alignWidgets() type ==" << type <<  " widgets don't have the same tqparent widget" << endl;
 			return;
@@ -1512,16 +1512,16 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
 	}
 	const bool twoSelected = form->selectedWidgets()->count()==2;
 	// Layout actions
-	enableAction("tqlayout_menu", multiple || containerSelected);
-	enableAction("tqlayout_hbox", multiple || containerSelected);
-	enableAction("tqlayout_vbox", multiple || containerSelected);
-	enableAction("tqlayout_grid", multiple || containerSelected);
-	enableAction("tqlayout_hsplitter", twoSelected);
-	enableAction("tqlayout_vsplitter", twoSelected);
+	enableAction("layout_menu", multiple || containerSelected);
+	enableAction("layout_hbox", multiple || containerSelected);
+	enableAction("layout_vbox", multiple || containerSelected);
+	enableAction("layout_grid", multiple || containerSelected);
+	enableAction("layout_hsplitter", twoSelected);
+	enableAction("layout_vsplitter", twoSelected);
 
 	KFormDesigner::Container *container = activeForm() ? activeForm()->activeContainer() : 0;
 	if (container)
-		enableAction("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+		enableAction("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 
 	emit widgetSelected(form, true);
 }
@@ -1553,13 +1553,13 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form )
 	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
-	enableAction("tqlayout_menu", hasChildren);
-	enableAction("tqlayout_hbox", hasChildren);
-	enableAction("tqlayout_vbox", hasChildren);
-	enableAction("tqlayout_grid", hasChildren);
-	enableAction("tqlayout_hsplitter", twoSelected);
-	enableAction("tqlayout_vsplitter", twoSelected);
-	enableAction("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	enableAction("layout_menu", hasChildren);
+	enableAction("layout_hbox", hasChildren);
+	enableAction("layout_vbox", hasChildren);
+	enableAction("layout_grid", hasChildren);
+	enableAction("layout_hsplitter", twoSelected);
+	enableAction("layout_vsplitter", twoSelected);
+	enableAction("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 
 	emit formWidgetSelected( form );
 }
@@ -1631,12 +1631,12 @@ FormManager::disableWidgetActions()
 	enableAction("format_raise", false);
 	enableAction("format_lower", false);
 
-	enableAction("tqlayout_menu", false);
-	enableAction("tqlayout_hbox", false);
-	enableAction("tqlayout_vbox", false);
-	enableAction("tqlayout_grid", false);
-	enableAction("tqlayout_hsplitter", false);
-	enableAction("tqlayout_vsplitter", false);
+	enableAction("layout_menu", false);
+	enableAction("layout_hbox", false);
+	enableAction("layout_vbox", false);
+	enableAction("layout_grid", false);
+	enableAction("layout_hsplitter", false);
+	enableAction("layout_vsplitter", false);
 	enableAction("break_layout", false);
 }
 
diff --git a/kexi/formeditor/formmanager.h b/kexi/formeditor/formmanager.h
index a4622d1b..e7934cc2 100644
--- a/kexi/formeditor/formmanager.h
+++ b/kexi/formeditor/formmanager.h
@@ -259,19 +259,19 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		void editConnections();
 
 		//! Lay out selected widgets using HBox tqlayout (calls \ref CreateLayoutCommand).
-		void tqlayoutHBox();
+		void layoutHBox();
 		//! Lay out selected widgets using VBox tqlayout.
-		void tqlayoutVBox();
+		void layoutVBox();
 		//! Lay out selected widgets using Grid tqlayout.
-		void tqlayoutGrid();
+		void layoutGrid();
 		//! Lay out selected widgets in an horizontal splitter
-		void  tqlayoutHSplitter();
+		void  layoutHSplitter();
 		//! Lay out selected widgets in a verticak splitter
-		void  tqlayoutVSplitter();
+		void  layoutVSplitter();
 		//! Lay out selected widgets using HFlow tqlayout
-		void tqlayoutHFlow();
+		void layoutHFlow();
 		//! Lay out selected widgets using VFlow tqlayout.
-		void tqlayoutVFlow();
+		void layoutVFlow();
 
 		//! Breaks selected tqlayout(calls \ref BreakLayoutCommand).
 		void breakLayout();
@@ -421,7 +421,7 @@ class KFORMEDITOR_EXPORT FormManager : public TQObject
 		/*! Function called by the "Lay out in..." menu items. It creates a tqlayout from the
 		  currently selected widgets (that must have the same tqparent).
 		  Calls \ref CreateLayoutCommand. */
-		void createLayout(int tqlayoutType);
+		void createLayout(int layoutType);
 
 		/*! Function called by all other AlignWidgets*() function. Calls \ref AlignWidgetsCommand. */
 		void alignWidgets(int type);
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index a79374cd..8ab3ae0d 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -69,11 +69,11 @@ KFDFactory::~KFDFactory()
 }
 
 KParts::Part*
-KFDFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name,
+KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, const char *name,
   const char *classname, const TQStringList &args)
 {
 	bool readOnly = (classname == "KParts::ReadOnlyPart");
-	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(tqparentWidget, name, readOnly, args);
+	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(parentWidget, name, readOnly, args);
 	return part;
 }
 
@@ -215,9 +215,9 @@ KFormDesignerKDevPart::setupActions()
 	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
 	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
 
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid");
+	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
 	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
@@ -405,12 +405,12 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
 			multiple = true;
 	}
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", multiple);
-	ENABLE_ACTION("tqlayout_vbox", multiple);
-	ENABLE_ACTION("tqlayout_grid", multiple);
+	ENABLE_ACTION("layout_hbox", multiple);
+	ENABLE_ACTION("layout_vbox", multiple);
+	ENABLE_ACTION("layout_grid", multiple);
 
 	KFormDesigner::Container *container = KFormDesigner::FormManager::self()->activeForm()->activeContainer();
-	ENABLE_ACTION("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -420,10 +420,10 @@ KFormDesignerKDevPart::slotFormWidgetSelected(Form *form)
 	enableFormActions();
 
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", true);
-	ENABLE_ACTION("tqlayout_vbox", true);
-	ENABLE_ACTION("tqlayout_grid", true);
-	ENABLE_ACTION("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("layout_hbox", true);
+	ENABLE_ACTION("layout_vbox", true);
+	ENABLE_ACTION("layout_grid", true);
+	ENABLE_ACTION("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -486,9 +486,9 @@ KFormDesignerKDevPart::disableWidgetActions()
 	ENABLE_ACTION("format_raise", false);
 	ENABLE_ACTION("format_lower", false);
 
-	ENABLE_ACTION("tqlayout_hbox", false);
-	ENABLE_ACTION("tqlayout_vbox", false);
-	ENABLE_ACTION("tqlayout_grid", false);
+	ENABLE_ACTION("layout_hbox", false);
+	ENABLE_ACTION("layout_vbox", false);
+	ENABLE_ACTION("layout_grid", false);
 	ENABLE_ACTION("break_layout", false);
 }
 
@@ -616,10 +616,10 @@ void
 FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -639,7 +639,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
index 548b4a35..72f2ef82 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 *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
diff --git a/kexi/formeditor/objecttree.cpp b/kexi/formeditor/objecttree.cpp
index 5f17d849..f9dad43a 100644
--- a/kexi/formeditor/objecttree.cpp
+++ b/kexi/formeditor/objecttree.cpp
@@ -37,14 +37,14 @@ using namespace KFormDesigner;
 
 
 ObjectTreeItem::ObjectTreeItem(const TQString &classn, const TQString &name, TQWidget *widget,
- Container *tqparentContainer, Container *container)
+ Container *parentContainer, Container *container)
  : m_enabled(true), m_row(-1), m_col(-1), m_rowspan(-1), m_colspan(-1), m_span(false)
 {
 	m_className = classn;
 	m_name = name;
 	m_widget = widget;
 	m_container = container;
-	m_eater = new EventEater(widget, tqparentContainer);
+	m_eater = new EventEater(widget, parentContainer);
 	m_parent = 0;
 	m_subprops = 0;
 }
diff --git a/kexi/formeditor/objecttree.h b/kexi/formeditor/objecttree.h
index ca301f4d..ae9b1e26 100644
--- a/kexi/formeditor/objecttree.h
+++ b/kexi/formeditor/objecttree.h
@@ -64,7 +64,7 @@ typedef TQMapConstIterator<TQString, TQVariant> TQVariantMapConstIterator;
 class KFORMEDITOR_EXPORT ObjectTreeItem
 {
 	public:
-		ObjectTreeItem(const TQString &className, const TQString &name, TQWidget *widget, Container *tqparentContainer, Container *container=0);
+		ObjectTreeItem(const TQString &className, const TQString &name, TQWidget *widget, Container *parentContainer, Container *container=0);
 		virtual ~ObjectTreeItem();
 
 		TQString name() const { return m_name; }
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index ac1cb4cb..c2448c6e 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -36,7 +36,7 @@
 using namespace KFormDesigner;
 
 ResizeHandle::ResizeHandle(ResizeHandleSet *set, HandlePos pos, bool editing)
- : TQWidget(set->m_widget->tqparentWidget()), m_set(set)
+ : TQWidget(set->m_widget->parentWidget()), m_set(set)
 {
 //	setBackgroundMode(TQt::NoBackground);
 	m_dragging = false;
@@ -226,16 +226,16 @@ void ResizeHandle::mouseMoveEvent(TQMouseEvent *ev)
 		tmpw += tmpx;
 		tmpx = 0;
 	}
-	else if(tmpx + tmpw > m_set->m_widget->tqparentWidget()->width())
-		tmpw = m_set->m_widget->tqparentWidget()->width() - tmpx;
+	else if(tmpx + tmpw > m_set->m_widget->parentWidget()->width())
+		tmpw = m_set->m_widget->parentWidget()->width() - tmpx;
 
 	if(tmpy < 0)
 	{
 		tmph += tmpy;
 		tmpy = 0;
 	}
-	else if(tmpy + tmph > m_set->m_widget->tqparentWidget()->height())
-		tmph = m_set->m_widget->tqparentWidget()->height() - tmpy;
+	else if(tmpy + tmph > m_set->m_widget->parentWidget()->height())
+		tmph = m_set->m_widget->parentWidget()->height() - tmpy;
 
 	const bool shouldBeMoved = (tmpx != m_set->m_widget->x()) || (tmpy != m_set->m_widget->y());
 	const bool shouldBeResized = (tmpw != m_set->m_widget->width()) || (tmph != m_set->m_widget->height());
@@ -272,16 +272,16 @@ void ResizeHandle::paintEvent( TQPaintEvent * )
 	/*TQPainter p(this);
 	p.setRasterOp(XorROP);
 	p.fillRect(TQRect(0, 0, 6, 6),white);
-	bitBlt( this, TQPoint(0,0), tqparentWidget(), rect(), XorROP);*/
+	bitBlt( this, TQPoint(0,0), parentWidget(), rect(), XorROP);*/
 }
 
 /////////////// ResizeHandleSet //////////////////
 
 ResizeHandleSet::ResizeHandleSet(TQWidget *modify, Form *form, bool editing)
-: TQObject(modify->tqparentWidget()), /*m_widget(modify),*/ m_form(form)
+: TQObject(modify->parentWidget()), /*m_widget(modify),*/ m_form(form)
 {
 	m_widget = 0;
-	/*TQWidget *tqparent = modify->tqparentWidget();
+	/*TQWidget *tqparent = modify->parentWidget();
 
 	handles[0] = new ResizeHandle( modify, ResizeHandle::TopLeft, editing);
 	handles[1] = new ResizeHandle( modify, ResizeHandle::TopCenter, editing);
diff --git a/kexi/formeditor/scripting/scriptIO.cpp b/kexi/formeditor/scripting/scriptIO.cpp
index ee0b1f59..b124a99a 100644
--- a/kexi/formeditor/scripting/scriptIO.cpp
+++ b/kexi/formeditor/scripting/scriptIO.cpp
@@ -27,30 +27,30 @@
 #include "main/scriptcontainer.h"
 
 bool
-ScriptIO::saveFormEvents(TQDomNode &tqparentNode, FormScript *formScript)
+ScriptIO::saveFormEvents(TQDomNode &parentNode, FormScript *formScript)
 {
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 
 	// Save the form's code
 	if(!formScript->getCode().isEmpty()) {
 		TQDomElement  script = domDoc.createElement("script");
 		script.setAttribute("language", formScript->scriptContainer()->getInterpreterName());
-		tqparentNode.appendChild(script);
+		parentNode.appendChild(script);
 		TQDomText scriptCode = domDoc.createTextNode(formScript->getCode());
 		script.appendChild(scriptCode);
 	}
 
 	// Save all form events
 	if(!formScript->eventList()->isEmpty())
-		saveEventList(formScript->eventList(), tqparentNode);
+		saveEventList(formScript->eventList(), parentNode);
 	return true;
 }
 
 bool
-ScriptIO::loadFormEvents(TQDomNode &tqparentNode, Form *form, ScriptManager *manager)
+ScriptIO::loadFormEvents(TQDomNode &parentNode, Form *form, ScriptManager *manager)
 {
-	TQDomElement script = tqparentNode.namedItem("script").toElement();
-	TQDomElement events = tqparentNode.namedItem("events").toElement();
+	TQDomElement script = parentNode.namedItem("script").toElement();
+	TQDomElement events = parentNode.namedItem("events").toElement();
 
 	// Load script code
 	FormScript *formScript = new FormScript(form, manager);
@@ -76,15 +76,15 @@ ScriptIO::saveAllEventsForWidget(TQObject *widget, FormScript *formScript, TQDom
 }
 
 void
-ScriptIO::saveEvent(Event *event, TQDomNode &tqparentNode)
+ScriptIO::saveEvent(Event *event, TQDomNode &parentNode)
 {
 	if(!event)
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement eventNode = domDoc.createElement("event");
 	eventNode.setAttribute("type", event->type());
-	tqparentNode.appendChild(eventNode);
+	parentNode.appendChild(eventNode);
 
 	switch(event->type()) {
 		case Event::Slot: {
@@ -138,14 +138,14 @@ ScriptIO::saveEvent(Event *event, TQDomNode &tqparentNode)
 }
 
 void
-ScriptIO::saveEventList(EventList *list, TQDomNode &tqparentNode)
+ScriptIO::saveEventList(EventList *list, TQDomNode &parentNode)
 {
 	if(!list || list->isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement events = domDoc.createElement("events");
-	tqparentNode.appendChild(events);
+	parentNode.appendChild(events);
 
 	TQValueListConstIterator<Event*> endIt = list->constEnd();
 	for(TQValueListConstIterator<Event*> it =  list->constBegin(); it != endIt; ++it)
diff --git a/kexi/formeditor/scripting/scriptIO.h b/kexi/formeditor/scripting/scriptIO.h
index 319de0fd..9261d75c 100644
--- a/kexi/formeditor/scripting/scriptIO.h
+++ b/kexi/formeditor/scripting/scriptIO.h
@@ -42,17 +42,17 @@ class ScriptIO
 		/*! Save the evnts of a form.
 		 Creates an \<events\> tag, and then one \<event\> tag for each event.
 		 Each event tqcontains \<sender\> and \<receiver\> tags, with attributes depending on event type. */
-		static bool  saveFormEvents(TQDomNode &tqparentNode, FormScript *script);
-		/*! Reads the \<events\> tag (\a tqparentNode), then creates and fills a FormScript object linked to this \a form.
+		static bool  saveFormEvents(TQDomNode &parentNode, FormScript *script);
+		/*! Reads the \<events\> tag (\a parentNode), then creates and fills a FormScript object linked to this \a form.
 		 The new FormScript object is then added  to ScriptManager list.*/
-		static bool  loadFormEvents(TQDomNode &tqparentNode, Form *form, ScriptManager *manager);
+		static bool  loadFormEvents(TQDomNode &parentNode, Form *form, ScriptManager *manager);
 
 		/*! Save only the events related to widget \a name in the FormScript \a fscript.
 		 Used eg when copying/pasting widgets to keep also events related to it.*/
 		static bool  saveAllEventsForWidget(TQObject *widget, FormScript *fscript, TQDomNode &node);
 
-		static void  saveEvent(Event *event, TQDomNode &tqparentNode);
-		static void  saveEventList(EventList *list, TQDomNode &tqparentNode);
+		static void  saveEvent(Event *event, TQDomNode &parentNode);
+		static void  saveEventList(EventList *list, TQDomNode &parentNode);
 		static void  loadEvent(TQDomNode &node, EventList *list, Form *form);
 
 	protected:
diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp
index 4bea0294..be8cfb4a 100644
--- a/kexi/formeditor/spring.cpp
+++ b/kexi/formeditor/spring.cpp
@@ -123,10 +123,10 @@ Spring::isPropertyVisible(const TQCString &name)
 
 
 void
-Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparentNode, TQDomDocument &domDoc, bool insideGridLayout)
+Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &parentNode, TQDomDocument &domDoc, bool insideGridLayout)
 {
 	TQDomElement tclass = domDoc.createElement("spacer");
-	tqparentNode.appendChild(tclass);
+	parentNode.appendChild(tclass);
 
 	if(insideGridLayout)
 	{
@@ -141,7 +141,7 @@ Spring::saveSpring(KFormDesigner::ObjectTreeItem *item, TQDomElement &tqparentNo
 
 	KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "name", item->widget()->property("name"), item->widget());
 
-	if(tqparentNode.tagName() == "widget")
+	if(parentNode.tagName() == "widget")
 		KFormDesigner::FormIO::savePropertyValue(tclass, domDoc, "geometry", item->widget()->property("geometry"), item->widget());
 
 	if(!item->widget()->tqsizeHint().isValid())
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 0e1745dc..d95e96ae 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -98,11 +98,11 @@ KFDFactory::~KFDFactory()
 }
 
 KParts::Part*
-KFDFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name,
+KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, const char *name,
   const char *classname, const TQStringList &args)
 {
 	bool readOnly = (classname == "KParts::ReadOnlyPart");
-	KFormDesignerPart *part = new KFormDesignerPart(tqparentWidget, name, readOnly, args);
+	KFormDesignerPart *part = new KFormDesignerPart(parentWidget, name, readOnly, args);
 	return part;
 }
 
@@ -219,22 +219,22 @@ KFormDesignerPart::setupActions()
 	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
 	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
 
-	KActionMenu *tqlayoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "tqlayout_menu");
-	tqlayoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox"));
-	tqlayoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox"));
-	tqlayoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid"));
-	tqlayoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHFlow()), actionCollection(), "tqlayout_hflow"));
-	tqlayoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVFlow()), actionCollection(), "tqlayout_vflow"));
-	tqlayoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()), actionCollection(), "tqlayout_hsplitter"));
-	tqlayoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()), actionCollection(), "tqlayout_vsplitter"));
+	KActionMenu *layoutMenu = new KActionMenu(i18n("Group Widgets"), "", actionCollection(), "layout_menu");
+	layoutMenu->insert(new KAction(i18n("&Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox"));
+	layoutMenu->insert(new KAction(i18n("&Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox"));
+	layoutMenu->insert(new KAction(i18n("In &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid"));
+	layoutMenu->insert(new KAction(i18n("By &Rows"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHFlow()), actionCollection(), "layout_hflow"));
+	layoutMenu->insert(new KAction(i18n("By &Columns"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVFlow()), actionCollection(), "layout_vflow"));
+	layoutMenu->insert(new KAction(i18n("Horizontally in &Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter"));
+	layoutMenu->insert(new KAction(i18n("Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter"));
 	new KAction(i18n("&Ungroup Widgets"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 /*
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid");
-	new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()), actionCollection(), "tqlayout_hsplitter");
-	new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()), actionCollection(), "tqlayout_vsplitter");
+	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
+	new KAction(i18n("Lay Out Widgets H&orizontally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()), actionCollection(), "layout_hsplitter");
+	new KAction(i18n("Lay Out Widgets Verti&cally in Splitter"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()), actionCollection(), "layout_vsplitter");
 	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 */
 	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
@@ -433,15 +433,15 @@ KFormDesignerPart::slotWidgetSelected(Form *form, bool multiple)
 	}
 	const bool twoSelected = form->selectedWidgets()->count()==2;
 	// Layout actions
-	ENABLE_ACTION("tqlayout_menu", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_hbox", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_vbox", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_grid", multiple || containerSelected);
-	ENABLE_ACTION("tqlayout_hsplitter", twoSelected);
-	ENABLE_ACTION("tqlayout_vsplitter", twoSelected);
+	ENABLE_ACTION("layout_menu", multiple || containerSelected);
+	ENABLE_ACTION("layout_hbox", multiple || containerSelected);
+	ENABLE_ACTION("layout_vbox", multiple || containerSelected);
+	ENABLE_ACTION("layout_grid", multiple || containerSelected);
+	ENABLE_ACTION("layout_hsplitter", twoSelected);
+	ENABLE_ACTION("layout_vsplitter", twoSelected);
 
 	KFormDesigner::Container *container = KFormDesigner::FormManager::self()->activeForm()->activeContainer();
-	ENABLE_ACTION("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -454,13 +454,13 @@ KFormDesignerPart::slotFormWidgetSelected(Form *form)
 	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
-	ENABLE_ACTION("tqlayout_menu", hasChildren);
-	ENABLE_ACTION("tqlayout_hbox", hasChildren);
-	ENABLE_ACTION("tqlayout_vbox", hasChildren);
-	ENABLE_ACTION("tqlayout_grid", hasChildren);
-	ENABLE_ACTION("tqlayout_hsplitter", twoSelected);
-	ENABLE_ACTION("tqlayout_vsplitter", twoSelected);
-	ENABLE_ACTION("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("layout_menu", hasChildren);
+	ENABLE_ACTION("layout_hbox", hasChildren);
+	ENABLE_ACTION("layout_vbox", hasChildren);
+	ENABLE_ACTION("layout_grid", hasChildren);
+	ENABLE_ACTION("layout_hsplitter", twoSelected);
+	ENABLE_ACTION("layout_vsplitter", twoSelected);
+	ENABLE_ACTION("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -523,12 +523,12 @@ KFormDesignerPart::disableWidgetActions()
 	ENABLE_ACTION("format_raise", false);
 	ENABLE_ACTION("format_lower", false);
 
-	ENABLE_ACTION("tqlayout_menu", false);
-	ENABLE_ACTION("tqlayout_hbox", false);
-	ENABLE_ACTION("tqlayout_vbox", false);
-	ENABLE_ACTION("tqlayout_grid", false);
-	ENABLE_ACTION("tqlayout_hsplitter", false);
-	ENABLE_ACTION("tqlayout_vsplitter", false);
+	ENABLE_ACTION("layout_menu", false);
+	ENABLE_ACTION("layout_hbox", false);
+	ENABLE_ACTION("layout_vbox", false);
+	ENABLE_ACTION("layout_grid", false);
+	ENABLE_ACTION("layout_hsplitter", false);
+	ENABLE_ACTION("layout_vsplitter", false);
 	ENABLE_ACTION("break_layout", false);
 }
 #endif
@@ -640,10 +640,10 @@ void
 FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -663,7 +663,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/formeditor/test/kfd_part.h b/kexi/formeditor/test/kfd_part.h
index 7ffb8705..5b264b03 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 *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 12585b6c..f26661ab 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -64,9 +64,9 @@ WidgetInfo::WidgetInfo(WidgetFactory *f)
 {
 }
 
-WidgetInfo::WidgetInfo(WidgetFactory *f, const char* tqparentFactoryName,
+WidgetInfo::WidgetInfo(WidgetFactory *f, const char* parentFactoryName,
 	const char* inheritedClassName)
- : m_parentFactoryName( TQCString("kformdesigner_")+tqparentFactoryName )
+ : m_parentFactoryName( TQCString("kformdesigner_")+parentFactoryName )
  , m_inheritedClassName(inheritedClassName)
  , m_inheritedClass(0)
  , m_overriddenAlternateNames(0)
@@ -188,7 +188,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 {
 //#ifdef KEXI_KTEXTEDIT
 	if (multiLine) {
-		KTextEdit *textedit = new KTextEdit(text, TQString(), w->tqparentWidget());
+		KTextEdit *textedit = new KTextEdit(text, TQString(), w->parentWidget());
 		textedit->setTextFormat(TQt::PlainText);
 		textedit->tqsetAlignment(align);
 		if (dynamic_cast<TQTextEdit*>(w)) {
@@ -228,7 +228,7 @@ WidgetFactory::createEditor(const TQCString &classname, const TQString &text,
 //#else
 	}
 	else {
-		KLineEdit *editor = new KLineEdit(text, w->tqparentWidget());
+		KLineEdit *editor = new KLineEdit(text, w->parentWidget());
 		editor->tqsetAlignment(align);
 		editor->setPalette(w->palette());
 		editor->setFont(w->font());
@@ -643,7 +643,7 @@ WidgetFactory::saveSpecialProperty(const TQCString &, const TQString &, const TQ
 bool WidgetFactory::inheritsFactories()
 {
 	for (TQAsciiDictIterator<WidgetInfo> it(m_classesByName); it.current(); ++it) {
-		if (!it.current()->tqparentFactoryName().isEmpty())
+		if (!it.current()->parentFactoryName().isEmpty())
 			return true;
 	}
 	return false;
@@ -667,11 +667,11 @@ void WidgetFactory::setEditor(TQWidget *widget, TQWidget *editor)
 	if (!widget)
 		return;
 	WidgetInfo *winfo = m_classesByName[widget->className()];
-	if (!winfo || winfo->tqparentFactoryName().isEmpty()) {
+	if (!winfo || winfo->parentFactoryName().isEmpty()) {
 		m_editor = editor;
 	}
 	else {
-		WidgetFactory *f = m_library->factory(winfo->tqparentFactoryName());
+		WidgetFactory *f = m_library->factory(winfo->parentFactoryName());
 		if (f!=this)
 			f->setEditor(widget, editor);
 		m_editor = editor; //keep a copy
@@ -683,7 +683,7 @@ TQWidget *WidgetFactory::editor(TQWidget *widget) const
 	if (!widget)
 		return 0;
 	WidgetInfo *winfo = m_classesByName[widget->className()];
-	if (!winfo || winfo->tqparentFactoryName().isEmpty()) {
+	if (!winfo || winfo->parentFactoryName().isEmpty()) {
 		return m_editor;
 	}
 	else {
@@ -697,8 +697,8 @@ TQWidget *WidgetFactory::editor(TQWidget *widget) const
 void WidgetFactory::setWidget(TQWidget *widget, Container* container)
 {
 	WidgetInfo *winfo = widget ? m_classesByName[widget->className()] : 0;
-	if (winfo && !winfo->tqparentFactoryName().isEmpty()) {
-		WidgetFactory *f = m_library->factory(winfo->tqparentFactoryName());
+	if (winfo && !winfo->parentFactoryName().isEmpty()) {
+		WidgetFactory *f = m_library->factory(winfo->parentFactoryName());
 		if (f!=this)
 			f->setWidget(widget, container);
 	}
diff --git a/kexi/formeditor/widgetfactory.h b/kexi/formeditor/widgetfactory.h
index 2cb74fc8..eab422ce 100644
--- a/kexi/formeditor/widgetfactory.h
+++ b/kexi/formeditor/widgetfactory.h
@@ -70,7 +70,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
 
 		WidgetInfo(WidgetFactory *f);
 
-		WidgetInfo(WidgetFactory *f, const char* tqparentFactoryName, const char* inheritedClassName = 0);
+		WidgetInfo(WidgetFactory *f, const char* parentFactoryName, const char* inheritedClassName = 0);
 
 		virtual ~WidgetInfo();
 
@@ -146,7 +146,7 @@ class KFORMEDITOR_EXPORT WidgetInfo
 		 If cancelled value is returned, there is no overriding (the default). */
 		tristate autoSyncForProperty(const char *propertyName) const;
 
-		TQCString tqparentFactoryName() const { return m_parentFactoryName; }
+		TQCString parentFactoryName() const { return m_parentFactoryName; }
 
 		WidgetInfo* inheritedClass() const { return m_inheritedClass; }
 
@@ -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 &tqparentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &tqparent);
 
 		/*! 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 265153e7..ac663f8b 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -135,13 +135,13 @@ WidgetLibrary::loadFactoryWidgets(WidgetFactory *f)
 			continue; //this class is hidden
 		// check if we want to inherit a widget from a different factory
 		if (!w->m_parentFactoryName.isEmpty() && !w->m_inheritedClassName.isEmpty()) {
-			WidgetFactory *tqparentFactory = d->factories[w->m_parentFactoryName];
-			if (!tqparentFactory) {
+			WidgetFactory *parentFactory = d->factories[w->m_parentFactoryName];
+			if (!parentFactory) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->className()
 					<< "' - no such tqparent factory '" << w->m_parentFactoryName << "'" << endl;
 				continue;
 			}
-			WidgetInfo* inheritedClass = tqparentFactory->m_classesByName[ w->m_inheritedClassName ];
+			WidgetInfo* inheritedClass = parentFactory->m_classesByName[ w->m_inheritedClassName ];
 			if (!inheritedClass) {
 				kdWarning() << "WidgetLibrary::loadFactoryWidgets(): class '" << w->m_inheritedClassName
 					<< "' - no such class to inherit in factory '" << w->m_parentFactoryName << "'" << endl;
@@ -536,18 +536,18 @@ WidgetLibrary::iconName(const TQCString &classname)
 }
 
 bool
-WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &tqparentNode, TQDomDocument &tqparent)
+WidgetLibrary::saveSpecialProperty(const TQCString &classname, const TQString &name, const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
 {
 	loadFactories();
 	WidgetInfo *wi = d->widgets.tqfind(classname);
 	if (!wi)
 		return false;
 
-	if (wi->factory()->saveSpecialProperty(classname, name, value, w, tqparentNode, tqparent))
+	if (wi->factory()->saveSpecialProperty(classname, name, value, w, parentNode, tqparent))
 		return true;
 	//try from inherited class
 	if (wi->inheritedClass())
-		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, tqparentNode, tqparent);
+		return wi->inheritedClass()->factory()->saveSpecialProperty(wi->className(), name, value, w, parentNode, tqparent);
 	return false;
 }
 
@@ -649,11 +649,11 @@ TQString WidgetLibrary::propertyDescForName(WidgetInfo *winfo, const TQCString&
 		return TQString();
 
 	//try in tqparent factory, if exists
-	WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
+	if (!parentFactory)
 		return TQString();
 
-	return tqparentFactory->propertyDescForName(propertyName);
+	return parentFactory->propertyDescForName(propertyName);
 }
 
 TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString& name)
@@ -667,11 +667,11 @@ TQString WidgetLibrary::propertyDescForValue(WidgetInfo *winfo, const TQCString&
 		return TQString();
 
 	//try in tqparent factory, if exists
-	WidgetFactory *tqparentFactory = d->factories[winfo->m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo->m_parentFactoryName];
+	if (!parentFactory)
 		return TQString();
 
-	return tqparentFactory->propertyDescForValue(name);
+	return parentFactory->propertyDescForValue(name);
 }
 
 void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo& winfo, TQWidget* w )
@@ -681,10 +681,10 @@ void WidgetLibrary::setPropertyOptions( WidgetPropertySet& buf, const WidgetInfo
 	winfo.factory()->setPropertyOptions(buf, winfo, w);
 	if (winfo.m_parentFactoryName.isEmpty())
 		return;
-	WidgetFactory *tqparentFactory = d->factories[winfo.m_parentFactoryName];
-	if (!tqparentFactory)
+	WidgetFactory *parentFactory = d->factories[winfo.m_parentFactoryName];
+	if (!parentFactory)
 		return;
-	tqparentFactory->setPropertyOptions(buf, winfo, w);
+	parentFactory->setPropertyOptions(buf, winfo, w);
 }
 
 WidgetFactory* WidgetLibrary::factory(const char* factoryName) const
diff --git a/kexi/formeditor/widgetlibrary.h b/kexi/formeditor/widgetlibrary.h
index d8a6529a..22d4c05f 100644
--- a/kexi/formeditor/widgetlibrary.h
+++ b/kexi/formeditor/widgetlibrary.h
@@ -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 &tqparentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
 		bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			ObjectTreeItem *item);
 		bool isPropertyVisible(const TQCString &classname, TQWidget *w,
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index e1c3a1e9..55bd4c60 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -507,7 +507,7 @@ WidgetPropertySet::slotPropertyChanged(KoProperty::Set& set, KoProperty::Propert
 		saveAlignProperty(property);
 		return;
 	}
-	else if((property == "tqlayout") || (property == "tqlayoutMargin") || (property == "tqlayoutSpacing")) {
+	else if((property == "tqlayout") || (property == "layoutMargin") || (property == "layoutSpacing")) {
 		saveLayoutProperty(property, value);
 		return;
 	}
@@ -901,7 +901,7 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 		return;
 
 	TQStringList list;
-	TQString value = Container::tqlayoutTypeToString(container->tqlayoutType());
+	TQString value = Container::layoutTypeToString(container->layoutType());
 
 	list << "NoLayout" << "HBox" << "VBox" << "Grid" << "HFlow" << "VFlow";
 
@@ -912,17 +912,17 @@ WidgetPropertySet::createLayoutProperty(ObjectTreeItem *item)
 
 	updatePropertyValue(item, "tqlayout");
 
-	p = new KoProperty::Property("tqlayoutMargin", container->tqlayoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
+	p = new KoProperty::Property("layoutMargin", container->layoutMargin(), i18n("Layout Margin"), i18n("Layout Margin"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutMargin");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutMargin");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
-	p = new KoProperty::Property("tqlayoutSpacing", container->tqlayoutSpacing(), 
+	p = new KoProperty::Property("layoutSpacing", container->layoutSpacing(), 
 		i18n("Layout Spacing"), i18n("Layout Spacing"));
 	d->set.addProperty(p);
-	updatePropertyValue(item, "tqlayoutSpacing");
-	if(container->tqlayoutType() == Container::NoLayout)
+	updatePropertyValue(item, "layoutSpacing");
+	if(container->layoutType() == Container::NoLayout)
 		p->setVisible(false);
 
 }
@@ -951,19 +951,19 @@ WidgetPropertySet::saveLayoutProperty(const TQString &prop, const TQVariant &val
 
 		container->setLayout(type);
 		bool show = (type != Container::NoLayout);
-		if(show != d->set["tqlayoutMargin"].isVisible())  {
-			d->set["tqlayoutMargin"].setVisible(show);
-			d->set["tqlayoutSpacing"].setVisible(show);
+		if(show != d->set["layoutMargin"].isVisible())  {
+			d->set["layoutMargin"].setVisible(show);
+			d->set["layoutSpacing"].setVisible(show);
 			KFormDesigner::FormManager::self()->showPropertySet(this, true/*force*/);
 		}
 		return;
 	}
 
-	if(prop == "tqlayoutMargin" && container->tqlayout()) {
+	if(prop == "layoutMargin" && container->tqlayout()) {
 		container->setLayoutMargin(value.toInt());
 		container->tqlayout()->setMargin(value.toInt());
 	}
-	else if(prop == "tqlayoutSpacing" && container->tqlayout())  {
+	else if(prop == "layoutSpacing" && container->tqlayout())  {
 		container->setLayoutSpacing(value.toInt());
 		container->tqlayout()->setSpacing(value.toInt());
 	}
diff --git a/kexi/kexidb/connection.h b/kexi/kexidb/connection.h
index 79bd3840..3d4eb82c 100644
--- a/kexi/kexidb/connection.h
+++ b/kexi/kexidb/connection.h
@@ -232,7 +232,7 @@ class KEXI_DB_EXPORT Connection : public TQObject, public KexiDB::Object
 		Transaction beginTransaction();
 
 /*! \todo for nested transactions:
-		Tansaction* beginTransaction(transaction *tqparent_transaction);
+		Tansaction* beginTransaction(transaction *parent_transaction);
 */
 		/*! Commits transaction \a trans.
 		 If there is not \a trans argument passed, and there is default transaction 
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index 0428fdcf..ffa45c9b 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -246,7 +246,7 @@ TQString UnaryExpr::debugString()
 
 TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
 {
-	if (m_token=='(') //tqparentheses (special case)
+	if (m_token=='(') //parentheses (special case)
 		return "(" + (m_arg ? m_arg->toString(params) : "<NULL>") + ")";
 	if (m_token < 255 && isprint(m_token))
 		return tokenToDebugString() + (m_arg ? m_arg->toString(params) : "<NULL>");
diff --git a/kexi/kexidb/fieldlist.h b/kexi/kexidb/fieldlist.h
index c5f28d5b..f77dba2b 100644
--- a/kexi/kexidb/fieldlist.h
+++ b/kexi/kexidb/fieldlist.h
@@ -135,7 +135,7 @@ class KEXI_DB_EXPORT FieldList
 		/*! \return a string that is a result of all field names concatenated 
 		 and with \a separator. This is usable e.g. as argument like "field1,field2" 
 		 for "INSERT INTO (xxx) ..". The result of this method is effectively cached,
-		 and it is tqinvalidated when set of fields changes (e.g. using clear() 
+		 and it is invalidated when set of fields changes (e.g. using clear() 
 		 or addField()).
 		 \a tableAlias, if provided is prepended to each field, so the resulting 
 		 names will be in form tableAlias.fieldName. This option is used for building 
diff --git a/kexi/kexidb/indexschema.cpp b/kexi/kexidb/indexschema.cpp
index c672305a..4775125b 100644
--- a/kexi/kexidb/indexschema.cpp
+++ b/kexi/kexidb/indexschema.cpp
@@ -41,11 +41,11 @@ IndexSchema::IndexSchema(TableSchema *tableSchema)
 	m_master_owned_rels.setAutoDelete(true); //rels at the master-side are owned
 }
 
-IndexSchema::IndexSchema(const IndexSchema& idx, TableSchema& tqparentTable)
+IndexSchema::IndexSchema(const IndexSchema& idx, TableSchema& parentTable)
 //	: FieldList(static_cast<const FieldList&>(idx))//fields are not owned by IndexSchema object
 	: FieldList(false)//fields are not owned by IndexSchema object
 	, SchemaData(static_cast<const SchemaData&>(idx))
-	, m_tableSchema(&tqparentTable)
+	, m_tableSchema(&parentTable)
 	, m_primary( idx.m_primary )
 	, m_unique( idx.m_unique )
 	, m_isAutoGenerated( idx.m_isAutoGenerated )
@@ -55,14 +55,14 @@ IndexSchema::IndexSchema(const IndexSchema& idx, TableSchema& tqparentTable)
 
 	//deep copy of the fields
 	for (Field::ListIterator f_it(idx.m_fields); f_it.current(); ++f_it) {
-		Field *tqparentTableField = tqparentTable.field( f_it.current()->name() );
-		if (!tqparentTableField) {
-			KexiDBWarn << "IndexSchema::IndexSchema(const IndexSchema& idx, const TableSchema& tqparentTable): "
-				"cannot find field '" << f_it.current()->name() << " in tqparentTable. Empty index will be created!" << endl;
+		Field *parentTableField = parentTable.field( f_it.current()->name() );
+		if (!parentTableField) {
+			KexiDBWarn << "IndexSchema::IndexSchema(const IndexSchema& idx, const TableSchema& parentTable): "
+				"cannot find field '" << f_it.current()->name() << " in parentTable. Empty index will be created!" << endl;
 			FieldList::clear();
 			break;
 		}
-		addField( tqparentTableField );
+		addField( parentTableField );
 	}
 
 //js TODO: copy relationships!
diff --git a/kexi/kexidb/indexschema.h b/kexi/kexidb/indexschema.h
index 60d1d7ac..12feae04 100644
--- a/kexi/kexidb/indexschema.h
+++ b/kexi/kexidb/indexschema.h
@@ -56,7 +56,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 
 		/*! Copy constructor. Copies all attributes from index \a idx, and 
 		 fields assigned with it but the fields are taken (by name) from 
-		 \a tqparentTable, not from \a idx itself, so it's possible to copy of index
+		 \a parentTable, not from \a idx itself, so it's possible to copy of index
 		 for a copy of table. 
 
 		 To copy an index within the same table it's enough to call: 
@@ -65,7 +65,7 @@ class KEXI_DB_EXPORT IndexSchema : public FieldList, public SchemaData
 		 \endcode
 		 @todo All relationships should be also copied
 		 */
-		IndexSchema(const IndexSchema& idx, TableSchema& tqparentTable);
+		IndexSchema(const IndexSchema& idx, TableSchema& parentTable);
 
 		/*! Destroys the index. Field objects are not deleted.
 		 All Relationship objects listed in masterRelationships() list 
diff --git a/kexi/kexidb/lookupfieldschema.cpp b/kexi/kexidb/lookupfieldschema.cpp
index 66ed4396..62a0665e 100644
--- a/kexi/kexidb/lookupfieldschema.cpp
+++ b/kexi/kexidb/lookupfieldschema.cpp
@@ -254,12 +254,12 @@ LookupFieldSchema *LookupFieldSchema::loadFromDom(const TQDomElement& lookupEl)
 }
 
 /* static */
-void LookupFieldSchema::saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& tqparentEl)
+void LookupFieldSchema::saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& parentEl)
 {
 	TQDomElement lookupColumnEl, rowSourceEl, rowSourceTypeEl, nameEl;
 	if (!lookupSchema.rowSource().name().isEmpty()) {
 		lookupColumnEl = doc.createElement("lookup-column");
-		tqparentEl.appendChild( lookupColumnEl );
+		parentEl.appendChild( lookupColumnEl );
 
 		rowSourceEl = doc.createElement("row-source");
 		lookupColumnEl.appendChild( rowSourceEl );
diff --git a/kexi/kexidb/lookupfieldschema.h b/kexi/kexidb/lookupfieldschema.h
index 35d3b59f..a4d6407a 100644
--- a/kexi/kexidb/lookupfieldschema.h
+++ b/kexi/kexidb/lookupfieldschema.h
@@ -212,8 +212,8 @@ class KEXI_DB_EXPORT LookupFieldSchema
 		 @return a new LookupFieldSchema object even if lookupEl contains no valid contents. */
 		static LookupFieldSchema* loadFromDom(const TQDomElement& lookupEl);
 
-		/*! Saves data of lookup column schema to \a tqparentEl DOM element of \a doc document. */
-		static void saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& tqparentEl);
+		/*! Saves data of lookup column schema to \a parentEl DOM element of \a doc document. */
+		static void saveToDom(LookupFieldSchema& lookupSchema, TQDomDocument& doc, TQDomElement& parentEl);
 
 		/*! Sets property of name \a propertyName and value \a value for the lookup schema \a lookup
 		 \return true on successful set and false on failure because of invalid value or invalid property name. */
diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y
index 426dec48..7775885d 100644
--- a/kexi/kexidb/parser/sqlparser.y
+++ b/kexi/kexidb/parser/sqlparser.y
@@ -1003,7 +1003,7 @@ aExpr9 '/' aExpr8
 aExpr9
 ;
 
-/* tqparenthesis, unary operators, and terminals precedence */
+/* parenthesis, unary operators, and terminals precedence */
 aExpr9:
 /* --- unary logical left --- */
 '-' aExpr9
diff --git a/kexi/kexidb/queryschema.h b/kexi/kexidb/queryschema.h
index a68acffe..7c6821d1 100644
--- a/kexi/kexidb/queryschema.h
+++ b/kexi/kexidb/queryschema.h
@@ -357,7 +357,7 @@ class KEXI_DB_EXPORT QuerySchema : public FieldList, public SchemaData
 		/*! Removes \a table schema from this query. 
 		 This does not destroy \a table object but only takes it out of the list. 
 		 If this table was master for the query, master table information is also
-		 tqinvalidated. */
+		 invalidated. */
 		void removeTable(TableSchema *table);
 
 		/*! \return table with name \a tableName or 0 if this query has no such table. */
@@ -694,7 +694,7 @@ class KEXI_DB_EXPORT QuerySchema : public FieldList, public SchemaData
 		 for \a infolist, with "," between each one. 
 		 This is usable e.g. as argument like "field1,field2" 
 		 for "INSERT INTO (xxx) ..". The result of this method is effectively cached,
-		 and it is tqinvalidated when set of fields changes (e.g. using clear() 
+		 and it is invalidated when set of fields changes (e.g. using clear() 
 		 or addField()).
 		 
 		 This method is similar to FieldList::sqlFieldsList() it just uses
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index a44f9c36..36267b1f 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -946,22 +946,22 @@ TQVariant KexiDB::loadPropertyValueFromDom( const TQDomNode& node )
 	return TQVariant();
 }
 
-TQDomElement KexiDB::saveNumberElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+TQDomElement KexiDB::saveNumberElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 	const TQString& elementName, int value)
 {
 	TQDomElement el( doc.createElement(elementName) );
-	tqparentEl.appendChild( el );
+	parentEl.appendChild( el );
 	TQDomElement numberEl( doc.createElement("number") );
 	el.appendChild( numberEl );
 	numberEl.appendChild( doc.createTextNode( TQString::number(value) ) );
 	return el;
 }
 
-TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+TQDomElement KexiDB::saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 	const TQString& elementName, bool value)
 {
 	TQDomElement el( doc.createElement(elementName) );
-	tqparentEl.appendChild( el );
+	parentEl.appendChild( el );
 	TQDomElement numberEl( doc.createElement("bool") );
 	el.appendChild( numberEl );
 	numberEl.appendChild( doc.createTextNode( 
diff --git a/kexi/kexidb/utils.h b/kexi/kexidb/utils.h
index fff7a071..b8ee03b5 100644
--- a/kexi/kexidb/utils.h
+++ b/kexi/kexidb/utils.h
@@ -350,20 +350,20 @@ namespace KexiDB
 	KEXI_DB_EXPORT TQString loadStringPropertyValueFromDom( const TQDomNode& node, bool* ok );
 
 	/*! Saves integer element for value \a value to \a doc document within tqparent element
-	 \a tqparentEl. The value will be enclosed in "number" element and "elementName" element.
-	 Example: saveNumberElementToDom(doc, tqparentEl, "height", 15) will create 
+	 \a parentEl. The value will be enclosed in "number" element and "elementName" element.
+	 Example: saveNumberElementToDom(doc, parentEl, "height", 15) will create 
 	 \code
 	  <height><number>15</number></height>
 	 \endcode
 	 \return the reference to element created with tag elementName. */
-	KEXI_DB_EXPORT TQDomElement saveNumberElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+	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
-	 \a tqparentEl. Like saveNumberElementToDom() but creates "bool" tags. True/false values will be
+	 \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. */
-	KEXI_DB_EXPORT TQDomElement saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& tqparentEl, 
+	KEXI_DB_EXPORT TQDomElement saveBooleanElementToDom(TQDomDocument& doc, TQDomElement& parentEl, 
 		const TQString& elementName, bool value);
 
 	/*! \return an empty value that can be set for a database field of type \a type having 
diff --git a/kexi/kexiutils/styleproxy.cpp b/kexi/kexiutils/styleproxy.cpp
index 56bf8391..54c34bd4 100644
--- a/kexi/kexiutils/styleproxy.cpp
+++ b/kexi/kexiutils/styleproxy.cpp
@@ -21,10 +21,10 @@
 
 using namespace KexiUtils;
 
-StyleProxy::StyleProxy(TQStyle* tqparentStyle) 
+StyleProxy::StyleProxy(TQStyle* parentStyle) 
  : TQStyle()
 {
-	setParentStyle(tqparentStyle);
+	setParentStyle(parentStyle);
 }
 
 StyleProxy::~StyleProxy()
@@ -37,7 +37,7 @@ void StyleProxy::setParentStyle(TQStyle* style)
 	m_style = TQStyleFactory::create(style->name());
 }
 
-TQStyle* StyleProxy::tqparentStyle() const
+TQStyle* StyleProxy::parentStyle() const
 {
 	return m_style;
 }
diff --git a/kexi/kexiutils/styleproxy.h b/kexi/kexiutils/styleproxy.h
index 779298ee..867ef23d 100644
--- a/kexi/kexiutils/styleproxy.h
+++ b/kexi/kexiutils/styleproxy.h
@@ -48,13 +48,13 @@ namespace KexiUtils {
 class KEXIUTILS_EXPORT StyleProxy : public TQStyle
 {
 	public:
-		/*! Creates a new style proxy object. \a tqparentStyle pointer will not be kept
+		/*! Creates a new style proxy object. \a parentStyle pointer will not be kept
 		 (because it's most likely owned by the application: a new TQStyle instance 
 		 for this name will be created internally. */
-		StyleProxy(TQStyle* tqparentStyle);
+		StyleProxy(TQStyle* parentStyle);
 		virtual ~StyleProxy();
 
-		TQStyle* tqparentStyle() const;
+		TQStyle* parentStyle() const;
 		void setParentStyle(TQStyle* style);
 
 		virtual void polish( TQWidget *w ) { m_style->polish(w); }
diff --git a/kexi/main/kexifinddialogbase.ui b/kexi/main/kexifinddialogbase.ui
index 5c7e6630..6eea7453 100644
--- a/kexi/main/kexifinddialogbase.ui
+++ b/kexi/main/kexifinddialogbase.ui
@@ -90,7 +90,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="7" colspan="1">
             <property name="name">
-                <cstring>tqlayout_btn</cstring>
+                <cstring>layout_btn</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -340,7 +340,7 @@
     <tabstop>m_wholeWords</tabstop>
     <tabstop>m_promptOnReplace</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index a2cf0e0c..795ddd53 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -242,7 +242,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 	d->config = kapp->config();
 
 	if ( !initialGeometrySet() ) {
-		int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+		int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 		d->config->setGroup("MainWindow");
 		TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ),
@@ -348,7 +348,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 	m_pTaskBar->setCaption(i18n("Task Bar"));	//js TODO: move this to KMDIlib
 
 //	if (!userMode()) {
-		tqinvalidateActions();
+		invalidateActions();
 		d->timer.singleShot(0,this,TQT_SLOT(slotLastActions()));
 //	}
 
@@ -1112,13 +1112,13 @@ void KexiMainWindowImpl::initActions()
 	acat->addAction("scriptpart_create", Kexi::NoActionCategory);
 }
 
-void KexiMainWindowImpl::tqinvalidateActions()
+void KexiMainWindowImpl::invalidateActions()
 {
-	tqinvalidateProjectWideActions();
-	tqinvalidateSharedActions();
+	invalidateProjectWideActions();
+	invalidateSharedActions();
 }
 
-void KexiMainWindowImpl::tqinvalidateSharedActions(TQObject *o)
+void KexiMainWindowImpl::invalidateSharedActions(TQObject *o)
 {
 	//TODO: enabling is more complex...
 /*	d->action_edit_cut->setEnabled(true);
@@ -1127,21 +1127,21 @@ void KexiMainWindowImpl::tqinvalidateSharedActions(TQObject *o)
 
 	if (!o)
 		o = TQT_TQOBJECT(focusWindow());
-	KexiSharedActionHost::tqinvalidateSharedActions(o);
+	KexiSharedActionHost::invalidateSharedActions(o);
 }
 
-void KexiMainWindowImpl::tqinvalidateSharedActions()
+void KexiMainWindowImpl::invalidateSharedActions()
 {
-	tqinvalidateSharedActions(0);
+	invalidateSharedActions(0);
 }
 
 // unused, I think
-void KexiMainWindowImpl::tqinvalidateSharedActionsLater()
+void KexiMainWindowImpl::invalidateSharedActionsLater()
 {
-	TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(tqinvalidateSharedActions()));
+	TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(invalidateSharedActions()));
 }
 
-void KexiMainWindowImpl::tqinvalidateProjectWideActions()
+void KexiMainWindowImpl::invalidateProjectWideActions()
 {
 //	stateChanged("project_opened",d->prj ? StateNoReverse : StateReverse);
 
@@ -1234,7 +1234,7 @@ void KexiMainWindowImpl::tqinvalidateProjectWideActions()
 		d->propEditorTabWidget->setEnabled(d->prj);
 }
 
-void KexiMainWindowImpl::tqinvalidateViewModeActions()
+void KexiMainWindowImpl::invalidateViewModeActions()
 {
 	if (d->curDialog) {
 		//update toggle action
@@ -1341,7 +1341,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
 	initNavigator();
 	Kexi::recentProjects().addProjectData( newProjectData );
 	updateReadOnlyState();
-	tqinvalidateActions();
+	invalidateActions();
 //	d->disableErrorMessages = true;
 	enableMessages( false );
 
@@ -1556,8 +1556,8 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 	d->updatePropEditorVisibility(d->curDialog ? d->curDialog->currentViewMode() : 0);
 #if defined(KDOCKWIDGET_P)
 	if (d->propEditor) {
-				KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
-				KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+				KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
+				KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 				if(ds)
 					ds->setSeparatorPosInPercent(d->config->readNumEntry("RightDockPosition", 80/* % */));
 	}
@@ -1579,8 +1579,8 @@ void KexiMainWindowImpl::slotAutoOpenObjectsLater()
 	d->restoreNavigatorWidth();
 
 #ifndef PROPEDITOR_VISIBILITY_CHANGES
-//	KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget();
-//	KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+//	KDockWidget *dw = (KDockWidget *)d->nav->parentWidget();
+//	KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //	const int pos = ds->separatorPos();
 
 	//if (!d->curDialog || d->curDialog->currentViewMode()==Kexi::DataViewMode)
@@ -1624,8 +1624,8 @@ tristate KexiMainWindowImpl::closeProject()
 #if defined(KDOCKWIDGET_P)
 	//remember docks position - will be used on storeSettings()
 	if (d->propEditor) {
-		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
-		KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
+		KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 		if (ds)
 			d->propEditorDockSeparatorPos = ds->separatorPosInPercent();
 	}
@@ -1635,14 +1635,14 @@ tristate KexiMainWindowImpl::closeProject()
 		if (d->propEditor) {
 			if (d->openedDialogsCount() == 0)
 				makeWidgetDockVisible(d->propEditorTabWidget);
-			KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
-			KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
+			KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 			if(ds)
 				ds->setSeparatorPosInPercent(80);
 		}
 
-		KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget();
-		KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->nav->parentWidget();
+		KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 		int dwWidth = dw->width();
 		if (ds) {
 				if (d->openedDialogsCount()!=0 && d->propEditorTabWidget && d->propEditorTabWidget->isVisible())
@@ -1691,7 +1691,7 @@ tristate KexiMainWindowImpl::closeProject()
 //	Kexi::partManager().unloadAllParts();
 
 	updateReadOnlyState();
-	tqinvalidateActions();
+	invalidateActions();
 //	if (!userMode())
 		updateAppCaption();
 
@@ -1772,15 +1772,15 @@ void KexiMainWindowImpl::initNavigator()
 		d->forceHideProjectNavigatorOnCreation = false;
 	}
 
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiMainWindowImpl::slotLastActions()
 {
 #if defined(KDOCKWIDGET_P)
 	if (mdiMode()==KMdi::ChildframeMode || mdiMode()==KMdi::TabPageMode) {
-//		KDockWidget *dw = (KDockWidget *)d->propEditor->tqparentWidget();
-		//KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+//		KDockWidget *dw = (KDockWidget *)d->propEditor->parentWidget();
+		//KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //		Q_UNUSED(ds);
 //1		ds->resize(ds->width()*3, ds->height());
 //1		ds->setSeparatorPos(30, true);
@@ -1813,9 +1813,9 @@ void KexiMainWindowImpl::initPropertyEditor()
 		d->propEditorTabWidget->setFont(f);
 
 		if (mdiMode()==KMdi::ChildframeMode || mdiMode()==KMdi::TabPageMode) {
-		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->propEditorTabWidget->parentWidget();
 	#if defined(KDOCKWIDGET_P)
-			KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //			ds->setKeepSize(true);
 			makeWidgetDockVisible(d->propEditorTabWidget);
 	//		ds->show();
@@ -2070,7 +2070,7 @@ KexiMainWindowImpl::restoreSettings()
 	if ( !initialGeometrySet() ) {
 		// Default size
 //		int restoredWidth, restoredHeight;
-    	int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+    	int scnum = TQApplication::desktop()->screenNumber(parentWidget());
 		TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 //#if KDE_IS_VERSION(3,1,90)
 //		restoredWidth = KGlobalSettings::screenGeometry(scnum).width();
@@ -2134,11 +2134,11 @@ KexiMainWindowImpl::storeSettings()
 			d->propEditorDockSeparatorPos = 80;
 		if (d->nav && d->navDockSeparatorPos >= 0 && d->navDockSeparatorPos <= 100) {
 			d->config->setGroup("MainWindow");
-			//KDockWidget *dw = (KDockWidget *)d->nav->tqparentWidget();
+			//KDockWidget *dw = (KDockWidget *)d->nav->parentWidget();
 			//int w = dw->width();
 			//int ww = width();
 			//int d1 = (100 * dw->width()) / width() + 1;
-			//KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			//KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 			//int d2 = ds->separatorPosInPercent();
 			if (d->wasAutoOpen && d->dialogExistedBeforeCloseProject) {
 #ifdef TQ_WS_WIN
@@ -2440,7 +2440,7 @@ void KexiMainWindowImpl::activeWindowChanged(KMdiChildView *v)
 		d->curDialog->selectedView()->propertySetSwitched();
 
 	if (dialogChanged) {
-//		tqinvalidateSharedActions();
+//		invalidateSharedActions();
 		//update property editor's contents...
 //		if ((KexiPropertyBuffer*)d->propBuffer!=d->curDialog->propertyBuffer()) {
 //		propertyBufferSwitched();//d->curDialog);
@@ -2457,8 +2457,8 @@ void KexiMainWindowImpl::activeWindowChanged(KMdiChildView *v)
 	}
 //	if (!d->curDialog.isNull())
 //		d->last_checked_mode = d->actions_for_view_modes[ d->curDialog->currentViewMode() ];
-	tqinvalidateViewModeActions();
-	tqinvalidateActions();
+	invalidateViewModeActions();
+	invalidateActions();
 	d->updateFindDialogContents();
 	if (dlg)
 		dlg->setFocus();
@@ -2648,7 +2648,7 @@ KexiMainWindowImpl::createBlankProject()
 	initNavigator();
 	Kexi::recentProjects().addProjectData( new_data );
 
-	tqinvalidateActions();
+	invalidateActions();
 	updateAppCaption();
 	return true;
 }
@@ -2873,7 +2873,7 @@ KexiMainWindowImpl::slotProjectSave()
 		return;
 	saveObject( d->curDialog );
 	updateAppCaption();
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void
@@ -2992,8 +2992,8 @@ void KexiMainWindowImpl::slotViewPropertyEditor()
 	d->block_KMdiMainFrm_eventFilter=false;
 
 /*#if defined(KDOCKWIDGET_P)
-		KDockWidget *dw = (KDockWidget *)d->propEditor->tqparentWidget();
-		KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+		KDockWidget *dw = (KDockWidget *)d->propEditor->parentWidget();
+		KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 		ds->setSeparatorPos(80,true);//d->config->readNumEntry("RightDockPosition", 80), true);
 #endif*/
 }
@@ -3038,8 +3038,8 @@ bool KexiMainWindowImpl::switchToViewMode(int viewMode)
 	d->curDialogViewGUIClient=viewClient; //remember
 
 	d->updatePropEditorVisibility(viewMode);
-	tqinvalidateProjectWideActions();
-	tqinvalidateSharedActions();
+	invalidateProjectWideActions();
+	invalidateSharedActions();
 	d->updateFindDialogContents();
 	return true;
 }
@@ -3060,7 +3060,7 @@ void KexiMainWindowImpl::slotViewTextMode()
 	switchToViewMode(Kexi::TextViewMode);
 }
 
-void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar)
+void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool layoutTaskBar)
 {
 	if (d->insideCloseDialog && dynamic_cast<KexiDialogBase *>(pWnd)) {
 		d->windowsToClose.append(dynamic_cast<KexiDialogBase *>(pWnd));
@@ -3075,7 +3075,7 @@ void KexiMainWindowImpl::closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar)
 		}
 	}
 	*/
-	closeDialog(dynamic_cast<KexiDialogBase *>(pWnd), tqlayoutTaskBar);
+	closeDialog(dynamic_cast<KexiDialogBase *>(pWnd), layoutTaskBar);
 }
 
 tristate KexiMainWindowImpl::getNewObjectInfo(
@@ -3187,7 +3187,7 @@ tristate KexiMainWindowImpl::saveObject( KexiDialogBase *dlg, const TQString& me
 	//item id changed to final one: update association in dialogs' dictionary
 //	d->dialogs.take(oldItemID);
 	d->updateDialogId(dlg, oldItemID);
-	tqinvalidateProjectWideActions();
+	invalidateProjectWideActions();
 	return true;
 }
 
@@ -3196,7 +3196,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg)
 	return closeDialog(dlg, true);
 }
 
-tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskBar, bool doNotSaveChanges)
+tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool layoutTaskBar, bool doNotSaveChanges)
 {
 	if (!dlg) 
 		return true;
@@ -3338,7 +3338,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskB
 
 	const bool isInMaximizedChildFrmMode = this->isInMaximizedChildFrmMode();
 
-	KMdiMainFrm::closeWindow(dlg, tqlayoutTaskBar);
+	KMdiMainFrm::closeWindow(dlg, layoutTaskBar);
 
 	//focus navigator if nothing else available
 	if (d->openedDialogsCount()==0) {
@@ -3348,7 +3348,7 @@ tristate KexiMainWindowImpl::closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskB
 		d->updatePropEditorVisibility(0);
 	}
 
-	tqinvalidateActions();
+	invalidateActions();
 	d->insideCloseDialog = false;
 	if (!d->windowsToClose.isEmpty()) //continue 'close all'
 		closeDialog(d->windowsToClose.take(0), true);
@@ -3395,7 +3395,7 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool
 TQWidget* KexiMainWindowImpl::findWindow(TQWidget *w)
 {
 	while (w && !acceptsSharedActions(TQT_TQOBJECT(w)))
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	return w;
 }
 
@@ -3452,24 +3452,24 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 			if (!d->focus_before_popup.isNull()) {
 				d->focus_before_popup->setFocus();
 				d->focus_before_popup=0;
-				tqinvalidateSharedActions();
+				invalidateSharedActions();
 			} else {
 				if (focus_w) {
 					focus_w->setFocus();
-					tqinvalidateSharedActions();
+					invalidateSharedActions();
 				}
 			}
 		}
 		return false;
 	}
 
-	/*! On mouse click on the findow, make sure it's focused and actions are tqinvalidated */
+	/*! On mouse click on the findow, make sure it's focused and actions are invalidated */
 	if (e->type()==TQEvent::MouseButtonPress) {
 		TQWidget *w = findWindow(TQT_TQWIDGET(obj));
 		KexiVDebug << "MouseButtonPress EVENT " <<  (w ? w->name() : 0) << endl;
 		if (w) {
 			w->setFocus();
-			tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+			invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
 		}
 	}
 	TQWidget *w = findWindow(TQT_TQWIDGET(obj));
@@ -3509,20 +3509,20 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 //			if (d->actionProxies[ w ])
 //			if (d->actionProxies[ focus_w ]) {
 			if (actionProxyFor( focus_w )) {
-//				tqinvalidateSharedActions();
+//				invalidateSharedActions();
 			}
 			else {
 /*			TQObject* o = tqfocusWidget();
 			while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase"))
 				o = o->tqparent();*/
-//js				tqinvalidateSharedActions(focus_w);
+//js				invalidateSharedActions(focus_w);
 			}
 		}
 //		/*|| e->type()==TQEvent::FocusOut*/) && /*(!obj->inherits("KexiDialogBase")) &&*/ d->actionProxies[ obj ]) {
-//		tqinvalidateSharedActions();
+//		invalidateSharedActions();
 	}
 	if (e->type()==TQEvent::FocusOut && focus_w && focus_w==d->curDialog && actionProxyFor( obj )) {
-		tqinvalidateSharedActions(d->curDialog);
+		invalidateSharedActions(d->curDialog);
 	}
 #endif
 
@@ -3530,7 +3530,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		//d->nav->setFocus();
 		d->focus_before_popup->setFocus();
 		d->focus_before_popup=0;
-		tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+		invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
 		return true;
 	}
 
@@ -3538,11 +3538,11 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 	if (e->type()==TQEvent::FocusOut) {
 		if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
 			if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) {
-				tqinvalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+				invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
 				d->focus_before_popup=d->curDialog;
 			}
 			else {
-//not needed???			tqinvalidateSharedActions(focus_w);
+//not needed???			invalidateSharedActions(focus_w);
 				d->focus_before_popup=focus_w;
 			}
 		}
@@ -3568,7 +3568,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 			else if (TQT_TQFOCUSEVENT(e)->reason()==TQFocusEvent::Popup) {
 				d->focus_before_popup=w;
 			}
-			//tqinvalidateSharedActions();
+			//invalidateSharedActions();
 		} else if (e->type()==TQEvent::Hide) {
 			setFocus();
 			return false;
@@ -3666,9 +3666,9 @@ KexiMainWindowImpl::openObject(KexiPart::Item* item, int viewMode, bool &opening
 		d->curDialogViewGUIClient=viewClient; //remember
 	}
 
-	tqinvalidateViewModeActions();
+	invalidateViewModeActions();
 	if (viewMode!=dlg->currentViewMode())
-		tqinvalidateSharedActions();
+		invalidateSharedActions();
 
 #ifndef KEXI_NO_PENDING_DIALOGS
 	d->removePendingDialog( dlg->id() );
@@ -3711,7 +3711,7 @@ KexiMainWindowImpl::openObjectFromNavigator(KexiPart::Item* item, int viewMode,
 	openingCancelled = false;
 	if (dlg) {
 		if (activateWindow(dlg)) {//item->identifier())) {//just activate
-			tqinvalidateViewModeActions();
+			invalidateViewModeActions();
 			return dlg;
 		}
 	}
@@ -3932,7 +3932,7 @@ void KexiMainWindowImpl::slotDirtyFlagChanged(KexiDialogBase* dlg)
 	if(!userMode())
 		d->nav->updateItemName( *item, dlg->dirty() );
 
-	tqinvalidateActions();
+	invalidateActions();
 	updateAppCaption();
 }
 
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index a2d820e8..9dbedae3 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -113,7 +113,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 	public slots:
 		/*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed.
 			Just calls closeDialog(). Use closeDialog() if you need, not this one. */
-		virtual void closeWindow(KMdiChildView *pWnd, bool tqlayoutTaskBar = true);
+		virtual void closeWindow(KMdiChildView *pWnd, bool layoutTaskBar = true);
 
 		/*! Reimplemented for internal reasons. */
 		virtual void addWindow( KMdiChildView* pView, int flags = KMdi::StandardAdd );
@@ -125,7 +125,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		 messages asking for saving the will be skipped and the changes will be dropped. 
 		 This should not be usually used, maybe except for test suites 
 		 (see kexi/tests/altertable/ directory). */
-		tristate closeDialog(KexiDialogBase *dlg, bool tqlayoutTaskBar, bool doNotSaveChanges = false);
+		tristate closeDialog(KexiDialogBase *dlg, bool layoutTaskBar, bool doNotSaveChanges = false);
 
 		virtual void detachWindow(KMdiChildView *pWnd,bool bShow=true);
 		virtual void attachWindow(KMdiChildView *pWnd,bool bShow=true,bool bAutomaticResize=false);
@@ -255,20 +255,20 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		void storeSettings();
 
 		/*! Invalidates availability of all actions for current application state. */
-		void tqinvalidateActions();
+		void invalidateActions();
 
 		/*! Invalidates action availability for current application state.
 		 These actions are dependent on curently selected dialog. */
-		virtual void tqinvalidateSharedActions(TQObject *o);
+		virtual void invalidateSharedActions(TQObject *o);
 
 		/*! Invalidates action availability for current application state.
 		 These actions only depend on project availability, not on curently selected dialog. */
-		void tqinvalidateProjectWideActions();
+		void invalidateProjectWideActions();
 
 		/*! Invalidates action availability for current application state.
 		 These actions only depend on curently selected dialog and currently selected view
 		 (KexiViewBase derived object) within this dialog. */
-		void tqinvalidateViewModeActions();
+		void invalidateViewModeActions();
 
 		/*! Shows dialog for creating new blank project,
 		 and creates one. Dialog is not shown if option for automatic creation
@@ -401,8 +401,8 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 
 		virtual void fillWindowMenu();
 
-		void tqinvalidateSharedActions();
-		void tqinvalidateSharedActionsLater();
+		void invalidateSharedActions();
+		void invalidateSharedActionsLater();
 
 		//! Updates the statusbar, navigator and "Insert->....." actions, dependent on read-only state.
 		//! Only called on project opening and closing.
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index 0abd513a..cf5f44c2 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -202,9 +202,9 @@ public:
 /*
 void updatePropEditorDockWidthInfo() {
 		if (propEditor) {
-			KDockWidget *dw = (KDockWidget *)propEditor->tqparentWidget();
+			KDockWidget *dw = (KDockWidget *)propEditor->parentWidget();
 #if defined(KDOCKWIDGET_P)
-			KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+			KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 			if (ds) {
 				propEditorDockSeparatorPos = ds->separatorPosInPercent();*/
 /*				if (propEditorDockSeparatorPos<=0) {
@@ -273,8 +273,8 @@ void updatePropEditorDockWidthInfo() {
 					origFocusWidget->setFocus();
 /*moved
 #if defined(KDOCKWIDGET_P)
-				KDockWidget *dw = (KDockWidget *)propEditor->tqparentWidget();
-				KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+				KDockWidget *dw = (KDockWidget *)propEditor->parentWidget();
+				KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 				ds->setSeparatorPosInPercent(config->readNumEntry("RightDockPosition", 80));//%
 #endif*/
 			}
@@ -285,8 +285,8 @@ void updatePropEditorDockWidthInfo() {
 	{
 #if defined(KDOCKWIDGET_P)
 			if (wnd->mdiMode()==KMdi::ChildframeMode || wnd->mdiMode()==KMdi::TabPageMode) {
-				KDockWidget *dw = (KDockWidget *)nav->tqparentWidget();
-				KDockSplitter *ds = (KDockSplitter *)dw->tqparentWidget();
+				KDockWidget *dw = (KDockWidget *)nav->parentWidget();
+				KDockSplitter *ds = (KDockSplitter *)dw->parentWidget();
 //				ds->setKeepSize(true);
 
 				config->setGroup("MainWindow");
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 23058e05..2e26b356 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -60,7 +60,7 @@ KexiNewStuff::install(const TQString &fileName)
 	}
 	const KArchiveDirectory *archiveDir = archive.directory();
 	const TQString destDir = KFileDialog::getExistingDirectory(
-		":DownloadExampleDatabases", tqparentWidget(),
+		":DownloadExampleDatabases", parentWidget(),
 		i18n("Choose Directory Where to Install Example Database"));
 	if (destDir.isEmpty()) {
 		kdDebug() << TQString("KexiNewStuff::install: Destination-directory is empty.") << endl;
diff --git a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
index 798ae0e5..6b169f7e 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
+++ b/kexi/main/printing/kexisimpleprintingpagesetupbase.ui
@@ -434,7 +434,7 @@
     <tabstop>openDataLink</tabstop>
     <tabstop>saveSetupLink</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index a6c4d160..797dcc2a 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -225,7 +225,7 @@ void KexiConnSelectorWidget::showSimpleConn()
 //		static_cast<TQVBoxLayout*>(m_file->tqlayout())->insertWidget( 2, m_fileDlg );
 		d->stack->addWidget(m_fileDlg);
 
-		for (TQWidget *w = tqparentWidget(true);w;w=w->tqparentWidget(true)) {
+		for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) {
 			if (w->isDialog()) {
 //#ifndef TQ_WS_WIN
 				connect(m_fileDlg,TQT_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQT_SLOT(reject()));
diff --git a/kexi/main/startup/KexiConnSelectorBase.ui b/kexi/main/startup/KexiConnSelectorBase.ui
index 908404c0..5c7bb64d 100644
--- a/kexi/main/startup/KexiConnSelectorBase.ui
+++ b/kexi/main/startup/KexiConnSelectorBase.ui
@@ -281,5 +281,5 @@
     <tabstop>btn_remove</tabstop>
     <tabstop>descriptionEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiDBTitlePageBase.ui b/kexi/main/startup/KexiDBTitlePageBase.ui
index 1770a6dd..7b711ea3 100644
--- a/kexi/main/startup/KexiDBTitlePageBase.ui
+++ b/kexi/main/startup/KexiDBTitlePageBase.ui
@@ -87,7 +87,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 16226307..79f763ee 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -87,7 +87,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kexi/main/startup/KexiOpenExistingFile.ui b/kexi/main/startup/KexiOpenExistingFile.ui
index 101be957..f11d7f58 100644
--- a/kexi/main/startup/KexiOpenExistingFile.ui
+++ b/kexi/main/startup/KexiOpenExistingFile.ui
@@ -123,5 +123,5 @@
 <tabstops>
     <tabstop>btn_advanced</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiProjectSelectorBase.ui b/kexi/main/startup/KexiProjectSelectorBase.ui
index aa36a55a..18c80544 100644
--- a/kexi/main/startup/KexiProjectSelectorBase.ui
+++ b/kexi/main/startup/KexiProjectSelectorBase.ui
@@ -124,5 +124,5 @@
 <tabstops>
     <tabstop>list</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiServerDBNamePage.ui b/kexi/main/startup/KexiServerDBNamePage.ui
index 0d20fe3e..b423d467 100644
--- a/kexi/main/startup/KexiServerDBNamePage.ui
+++ b/kexi/main/startup/KexiServerDBNamePage.ui
@@ -137,5 +137,5 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index c19a96c0..667c5288 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -46,7 +46,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 	setMode( mode );
 	
 	TQPoint point( 0, 0 );
-	reparent( tqparentWidget(), point );
+	reparent( parentWidget(), point );
 
 	if (tqlayout())
 		tqlayout()->setMargin(0);
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index 4fd7497b..bf20fbfb 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -445,7 +445,7 @@ void ImportWizard::arriveSrcConnPage()
 			}*/
 			//m_srcConn->m_file->label->hide();
 			//m_srcConn->m_file->btn_advanced->hide();
-			//m_srcConn->m_file->label->tqparentWidget()->hide();
+			//m_srcConn->m_file->label->parentWidget()->hide();
 		}
 //	} else {
 //		m_srcConn->showAdvancedConn();
diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
index 0947c8a1..a6033c70 100644
--- a/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
+++ b/kexi/plugins/forms/kexidataawarewidgetinfo.cpp
@@ -26,8 +26,8 @@ KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f
 }
 
 KexiDataAwareWidgetInfo::KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, 
-	const char* tqparentFactoryName, const char* inheritedClassName)
- : KFormDesigner::WidgetInfo(f, tqparentFactoryName, inheritedClassName)
+	const char* parentFactoryName, const char* inheritedClassName)
+ : KFormDesigner::WidgetInfo(f, parentFactoryName, inheritedClassName)
 {
 	init();
 }
diff --git a/kexi/plugins/forms/kexidataawarewidgetinfo.h b/kexi/plugins/forms/kexidataawarewidgetinfo.h
index eddcf909..41e67d85 100644
--- a/kexi/plugins/forms/kexidataawarewidgetinfo.h
+++ b/kexi/plugins/forms/kexidataawarewidgetinfo.h
@@ -33,7 +33,7 @@ class KEXIFORMUTILS_EXPORT KexiDataAwareWidgetInfo : public KFormDesigner::Widge
 		KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f);
 		
 		KexiDataAwareWidgetInfo(KFormDesigner::WidgetFactory *f, 
-			const char* tqparentFactoryName, const char* inheritedClassName = 0);
+			const char* parentFactoryName, const char* inheritedClassName = 0);
 
 		virtual ~KexiDataAwareWidgetInfo();
 
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 400e6d37..3e1e5c4b 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->tqparentInterface()) //item with tqparent interface: collect tqparent instead...
+		if (formDataItem->parentInterface()) //item with tqparent interface: collect tqparent instead...
 			continue;
 #if 0 //! @todo reenable when subform is moved to KexiDBForm
 		KexiDBForm *dbForm = KexiUtils::findParent<KexiDBForm>(obj, "KexiDBForm"); //form's surface...
@@ -183,7 +183,7 @@ bool KexiFormDataProvider::cursorAtNewRow() const
 	return false;
 }
 
-void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidSources,
+void KexiFormDataProvider::invalidateDataSources( const TQDict<char>& invalidSources,
  KexiDB::QuerySchema* query)
 {
 	//fill m_fieldNumbersForDataItems mapping from data item to field number
@@ -222,7 +222,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		//all previous indices have corresponding data source
 //		for (; i < (*it); i++) {
 //			newIndices[i] = number++;
-			//kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl;
+			//kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl;
 //		}
 		//this index have no corresponding data source
 //		newIndices[i]=-1;
@@ -230,14 +230,14 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		if (item)
 			item->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		m_dataItems.remove(*it);
-		kexipluginsdbg << "tqinvalidateDataSources(): " << (*it) << " -> " << -1 << endl;
+		kexipluginsdbg << "invalidateDataSources(): " << (*it) << " -> " << -1 << endl;
 //		i++;
 	}
 #endif
 	//fill remaining part of the vector
 //	for (; i < dataFieldsCount; i++) { //m_dataItems.count(); i++) {
 		//newIndices[i] = number++;
-		//kexipluginsdbg << "tqinvalidateDataSources(): " << i << " -> " << number-1 << endl;
+		//kexipluginsdbg << "invalidateDataSources(): " << i << " -> " << number-1 << endl;
 	//}
 
 #if 0
@@ -247,11 +247,11 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		bool ok;
 		const int newIndex = newIndices.at( it.data(), &ok );
 		if (ok && newIndex!=-1) {
-			kexipluginsdbg << "tqinvalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl;
+			kexipluginsdbg << "invalidateDataSources(): " << it.key()->dataSource() << ": " << it.data() << " -> " << newIndex << endl;
 			newFieldNumbersForDataItems.tqreplace(it.key(), newIndex);
 		}
 		else {
-			kexipluginsdbg << "tqinvalidateDataSources(): removing " << it.key()->dataSource() << endl;
+			kexipluginsdbg << "invalidateDataSources(): removing " << it.key()->dataSource() << endl;
 			m_dataItems.remove(it.key());
 			it.key()->setInvalidState( TQString::tqfromLatin1("#") + i18n("NAME") + TQString::tqfromLatin1("?") );
 		}
@@ -266,7 +266,7 @@ void KexiFormDataProvider::tqinvalidateDataSources( const TQDict<char>& invalidS
 		query->debug();
 
 	//if (query && m_dataItems.count()!=query->fieldCount()) {
-	//	kdWarning() << "KexiFormDataProvider::tqinvalidateDataSources(): m_dataItems.count()!=query->fieldCount() ("
+	//	kdWarning() << "KexiFormDataProvider::invalidateDataSources(): m_dataItems.count()!=query->fieldCount() ("
 	//	 << m_dataItems.count() << "," << query->fieldCount() << ")" << endl;
 	//}
 	//i = 0;
diff --git a/kexi/plugins/forms/kexidataprovider.h b/kexi/plugins/forms/kexidataprovider.h
index f1e9d755..9c630cb4 100644
--- a/kexi/plugins/forms/kexidataprovider.h
+++ b/kexi/plugins/forms/kexidataprovider.h
@@ -74,7 +74,7 @@ class KEXIFORMUTILS_EXPORT KexiFormDataProvider : public KexiDataItemChangesList
 		 \a invalidSources is the set of data sources that should 
 		 be omitted for fillDataItems(). 
 		 Used by KexiFormView::initDataSource(). */
-		void tqinvalidateDataSources( const TQDict<char>& invalidSources, 
+		void invalidateDataSources( const TQDict<char>& invalidSources, 
 			KexiDB::QuerySchema* query = 0 );
 
 		/*! Fills the same data provided by \a value to every data item (other than \a item) 
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 5f379e6e..8683c2bb 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -646,7 +646,7 @@ KexiDBFactory::isPropertyVisibleInternal(const TQCString& classname, TQWidget *w
 	}
 	else if(classname == "KexiDBCheckBox") {
 		//hide text property if the widget is a child of an autofield beause there's already "caption" for this purpose
-		if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->tqparentWidget()))
+		if (property=="text" && w && dynamic_cast<KFormDesigner::WidgetWithSubpropertiesInterface*>(w->parentWidget()))
 			return false;
 		ok = property!="autoRepeat";
 	}
diff --git a/kexi/plugins/forms/kexidbfactory.h b/kexi/plugins/forms/kexidbfactory.h
index f15f8c39..79873b72 100644
--- a/kexi/plugins/forms/kexidbfactory.h
+++ b/kexi/plugins/forms/kexidbfactory.h
@@ -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 &tqparentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
 		//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.cpp b/kexi/plugins/forms/kexiformdataiteminterface.cpp
index 9a861917..c588c7b1 100644
--- a/kexi/plugins/forms/kexiformdataiteminterface.cpp
+++ b/kexi/plugins/forms/kexiformdataiteminterface.cpp
@@ -61,8 +61,8 @@ void KexiFormDataItemInterface::setDisplayDefaultValue(TQWidget* widget, bool di
 
 void KexiFormDataItemInterface::cancelEditor()
 {
-	TQWidget *tqparentWidget = dynamic_cast<TQWidget*>(this)->tqparentWidget();
-	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(tqparentWidget, "KexiFormScrollView");
+	TQWidget *parentWidget = dynamic_cast<TQWidget*>(this)->parentWidget();
+	KexiFormScrollView* view = KexiUtils::findParent<KexiFormScrollView>(parentWidget, "KexiFormScrollView");
 	if (view)
 		view->cancelEditor();
 }
diff --git a/kexi/plugins/forms/kexiformmanager.cpp b/kexi/plugins/forms/kexiformmanager.cpp
index 9f288418..ce9b142b 100644
--- a/kexi/plugins/forms/kexiformmanager.cpp
+++ b/kexi/plugins/forms/kexiformmanager.cpp
@@ -70,7 +70,7 @@ KAction* KexiFormManager::action( const char* name )
 	KexiFormView* formViewWidget = dynamic_cast<KexiFormView*>(scrollViewWidget->tqparent());
 	if (!formViewWidget)
 		return 0;
-	return formViewWidget->tqparentDialog()->mainWin()->actionCollection()->action(n.data());
+	return formViewWidget->parentDialog()->mainWin()->actionCollection()->action(n.data());
 }
 
 KexiFormView* KexiFormManager::activeFormViewWidget() const
@@ -90,7 +90,7 @@ void KexiFormManager::enableAction( const char* name, bool enable )
 	KexiFormView* formViewWidget = activeFormViewWidget();
 	if (!formViewWidget)
 		return;
-//	if (TQString(name)=="tqlayout_menu")
+//	if (TQString(name)=="layout_menu")
 //		kdDebug() << "!!!!!!!!!!! " << enable << endl;
 	formViewWidget->setAvailable(translateName( name ).latin1(), enable);
 }
diff --git a/kexi/plugins/forms/kexiformmanager.h b/kexi/plugins/forms/kexiformmanager.h
index d25cf78e..34decc1d 100644
--- a/kexi/plugins/forms/kexiformmanager.h
+++ b/kexi/plugins/forms/kexiformmanager.h
@@ -77,7 +77,7 @@ TQString KexiFormManager::translateName( const char* name ) const
 {
 	TQString n( name );
 	//translate to our name space:
-	if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("tqlayout_")
+	if (n.startsWith("align_") || n.startsWith("adjust_") || n.startsWith("layout_")
 		|| n=="format_raise" || n=="format_raise" || n=="taborder" | n=="break_layout")
 	{
 		n.prepend("formpart_");
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 2486416e..3f1d3466 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -428,7 +428,7 @@ void KexiFormPart::slotAssignAction()
 	if (!formViewWidget)
 		return;
 
-	KexiMainWindow * mainWin = formViewWidget->tqparentDialog()->mainWin();
+	KexiMainWindow * mainWin = formViewWidget->parentDialog()->mainWin();
 	KexiActionSelectionDialog dlg(mainWin, dbform, data, 
 		propSet->property("name").value().toCString());
 
diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp
index 2ddcb123..057e0a33 100644
--- a/kexi/plugins/forms/kexiformscrollview.cpp
+++ b/kexi/plugins/forms/kexiformscrollview.cpp
@@ -557,7 +557,7 @@ void KexiFormScrollView::handleDataWidgetAction(const TQString& actionName)
 		item = dynamic_cast<KexiFormDataItemInterface*>(w);
 		if (item)
 			break;
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	}
 	if (item)
 		item->handleAction(actionName);
diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp
index 189d515f..3f30fff2 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -121,12 +121,12 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
 		plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo()));
 
 		plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 );
-		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()) );
-		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()) );
-		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()) );
+		plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) );
+		plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) );
+		plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) );
 #ifdef KEXI_SHOW_SPLITTER_WIDGET
-		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHSplitter()) );
-		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVSplitter()) );
+		plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) );
+		plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) );
 #endif
 		plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) );
 
@@ -167,7 +167,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *tqparent,
 KexiFormView::~KexiFormView()
 {
 	if (m_cursor) {
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->deleteCursor(m_cursor);
 		m_cursor = 0;
 	}
@@ -184,7 +184,7 @@ void
 KexiFormView::deleteQuery()
 {
 	if (m_cursor) {
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->deleteCursor(m_cursor);
 		m_cursor = 0;
 	}
@@ -229,7 +229,7 @@ KexiFormView::initForm()
 			KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted()));
 	}
 
-	const bool newForm = tqparentDialog()->id() < 0;
+	const bool newForm = parentDialog()->id() < 0;
 
 	KexiDB::FieldList *fields = 0;
 	if (newForm) {
@@ -296,7 +296,7 @@ void KexiFormView::updateAutoFieldsDataSource()
 	//(this data has not been stored in the form)
 	TQString dataSourceString( m_dbform->dataSource() );
 	TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() );
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(
 		conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query())
@@ -325,7 +325,7 @@ void KexiFormView::updateValuesForSubproperties()
 	//(this data has not been stored in the form)
 	TQString dataSourceString( m_dbform->dataSource() );
 	TQCString dataSourceMimeTypeString( m_dbform->dataSourceMimeType() );
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(
 		conn, dataSourceString.latin1(), dataSourceMimeTypeString=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query())
@@ -390,7 +390,7 @@ KexiFormView::loadForm()
 {
 //@todo also load m_resizeMode !
 
-	kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << tqparentDialog()->id() << endl;
+	kexipluginsdbg << "KexiFormView::loadForm() Loading the form with id : " << parentDialog()->id() << endl;
 	// If we are previewing the Form, use the tempData instead of the form stored in the db
 	if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() )
 	{
@@ -416,7 +416,7 @@ KexiFormView::loadForm()
 void
 KexiFormView::slotPropertySetSwitched(KoProperty::Set *set, bool forceReload, const TQCString& propertyToSelect)
 {
-//	if (set && tqparentDialog()!=tqparentDialog()->mainWin()->currentDialog())
+//	if (set && parentDialog()!=parentDialog()->mainWin()->currentDialog())
 	if (form() != KFormDesigner::FormManager::self()->activeForm())
 		return; //this is not the current form view
 	m_propertySet = set;
@@ -470,7 +470,7 @@ tristate
 KexiFormView::afterSwitchFrom(int mode)
 {
 	if (mode == 0 || mode == Kexi::DesignViewMode) {
-		if (tqparentDialog()->neverSaved()) {
+		if (parentDialog()->neverSaved()) {
 			m_dbform->resize(TQSize(400, 300));
 			m_scrollView->refreshContentsSizeLater(true,true);
 			//m_delayedFormContentsResizeOnShow = false;
@@ -521,7 +521,7 @@ KexiFormView::afterSwitchFrom(int mode)
 		initDataSource();
 
 		//handle events for this form
-		m_scrollView->setMainWidgetForEventHandling(tqparentDialog()->mainWin(), m_dbform);
+		m_scrollView->setMainWidgetForEventHandling(parentDialog()->mainWin(), m_dbform);
 
 		//set focus on 1st focusable widget which has valid dataSource property set
 		if (!m_dbform->orderedFocusWidgets()->isEmpty()) {
@@ -555,7 +555,7 @@ KexiFormView::afterSwitchFrom(int mode)
 
 	//dirty only if it's a new object
 	if (mode == 0)
-		setDirty( tqparentDialog()->partItem()->neverSaved() );
+		setDirty( parentDialog()->partItem()->neverSaved() );
 
 	if (mode==Kexi::DataViewMode && viewMode()==Kexi::DesignViewMode) {
 //		slotPropertySetSwitched
@@ -590,7 +590,7 @@ void KexiFormView::initDataSource()
 		//collect all data-aware widgets and create query schema
 		m_scrollView->setMainDataSourceWidget(m_dbform);
 		sources = m_scrollView->usedDataSources();
-		conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		conn = parentDialog()->mainWin()->project()->dbConnection();
 		if (dataSourceMimeTypeString.isEmpty() /*table type is the default*/ 
 			|| dataSourceMimeTypeString=="kexi/table")
 		{
@@ -681,7 +681,7 @@ void KexiFormView::initDataSource()
 			if (ok) //input cancelled
 				m_cursor = conn->executeQuery( *m_query, params );
 		}
-		m_scrollView->tqinvalidateDataSources( invalidSources, m_query );
+		m_scrollView->invalidateDataSources( invalidSources, m_query );
 		ok = m_cursor!=0;
 	}
 
@@ -730,7 +730,7 @@ KexiFormView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel)
 	}
 	if (!storeData()) {
 		//failure: remove object's schema data to avoid garbage
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->removeObject( s->id() );
 		delete s;
 		return 0;
@@ -742,12 +742,12 @@ tristate
 KexiFormView::storeData(bool dontAsk)
 {
 	Q_UNUSED(dontAsk);
-	kexipluginsdbg << "KexiDBForm::storeData(): " << tqparentDialog()->partItem()->name() 
-		<< " [" << tqparentDialog()->id() << "]" << endl;
+	kexipluginsdbg << "KexiDBForm::storeData(): " << parentDialog()->partItem()->name() 
+		<< " [" << parentDialog()->id() << "]" << endl;
 
 	//-- first, store local BLOBs, so identifiers can be updated
 //! @todo remove unused data stored previously
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableSchema *blobsTable = conn->tableSchema("kexi__blobs");
 	if (!blobsTable) { //compatibility check for older Kexi project versions
 //! @todo show message about missing kexi__blobs?
@@ -767,7 +767,7 @@ KexiFormView::storeData(bool dontAsk)
 	}
 	KexiBLOBBuffer *blobBuf = KexiBLOBBuffer::self();
 	KexiFormView *designFormView 
-		= dynamic_cast<KexiFormView*>( tqparentDialog()->viewForMode(Kexi::DesignViewMode) );
+		= dynamic_cast<KexiFormView*>( parentDialog()->viewForMode(Kexi::DesignViewMode) );
 	if (designFormView) {
 		for (TQMapConstIterator<TQWidget*, KexiBLOBBuffer::Id_t> it = tempData()->unsavedLocalBLOBs.constBegin(); 
 			it!=tempData()->unsavedLocalBLOBs.constEnd(); ++it)
@@ -874,7 +874,7 @@ KexiFormView::slotWidgetSelected(KFormDesigner::Form *f, bool multiple)
 
 	KFormDesigner::Container *container = f->activeContainer();
 	setAvailable("formpart_break_layout", container ?
-		(container->tqlayoutType() != KFormDesigner::Container::NoLayout) : false );
+		(container->layoutType() != KFormDesigner::Container::NoLayout) : false );
 }
 
 void
@@ -890,7 +890,7 @@ KexiFormView::slotFormWidgetSelected(KFormDesigner::Form *f)
 	setAvailable("formpart_layout_hbox", true);
 	setAvailable("formpart_layout_vbox", true);
 	setAvailable("formpart_layout_grid", true);
-	setAvailable("formpart_break_layout", (f->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	setAvailable("formpart_break_layout", (f->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -967,9 +967,9 @@ KexiFormView::setRedoEnabled(bool enabled)
 TQSize
 KexiFormView::preferredSizeHint(const TQSize& otherSize)
 {
-	if (tqparentDialog()->neverSaved()) {
+	if (parentDialog()->neverSaved()) {
 		//ignore otherSize if possible
-//		return KexiViewBase::preferredSizeHint( (tqparentDialog() && tqparentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize);
+//		return KexiViewBase::preferredSizeHint( (parentDialog() && parentDialog()->mdiParent()) ? TQSize(10000,10000) : otherSize);
 	}
 
 	return (m_dbform->size()
@@ -1087,7 +1087,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 	if (fields.isEmpty())
 		return;
 
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	KexiDB::TableOrQuerySchema tableOrQuery(conn, sourceName.latin1(), sourceMimeType=="kexi/table");
 	if (!tableOrQuery.table() && !tableOrQuery.query()) {
 		kexipluginswarn << "KexiFormView::insertAutoFields(): no such table/query \""
@@ -1132,7 +1132,7 @@ KexiFormView::insertAutoFields(const TQString& sourceMimeType, const TQString& s
 		while (targetContainerWidget 
 			&& !dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
 		{
-			targetContainerWidget = targetContainerWidget->tqparentWidget();
+			targetContainerWidget = targetContainerWidget->parentWidget();
 		}
 		if (dynamic_cast<KFormDesigner::Container*>(targetContainerWidget))
 			targetContainer = dynamic_cast<KFormDesigner::Container*>(targetContainerWidget);
@@ -1264,12 +1264,12 @@ void KexiFormView::updateActions(bool activated)
 }*/
 
 /*
-void KexiFormView::tqparentDialogDetached()
+void KexiFormView::parentDialogDetached()
 {
 	m_dbform->updateTabStopsOrder(form());
 }
 
-void KexiFormView::tqparentDialogAttached(KMdiChildFrm *)
+void KexiFormView::parentDialogAttached(KMdiChildFrm *)
 {
 	m_dbform->updateTabStopsOrder(form());
 }*/
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index e699afa1..b05a544c 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -141,7 +141,7 @@ class KEXIFORMUTILS_EXPORT KexiFormView : public KexiDataAwareView
 		virtual tristate storeData(bool dontAsk = false);
 
 		KexiFormPart::TempData* tempData() const {
-			return dynamic_cast<KexiFormPart::TempData*>(tqparentDialog()->tempData()); }
+			return dynamic_cast<KexiFormPart::TempData*>(parentDialog()->tempData()); }
 		KexiFormPart* formPart() const { return dynamic_cast<KexiFormPart*>(part()); }
 
 //moved to formmanager		void disableWidgetActions();
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 4926a334..521dce2a 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -193,7 +193,7 @@ KexiDBAutoField::createEditor()
 			TQWidget::setFocusPolicy(newSubwidget->focusPolicy());
 		}
 		setFocusProxy(newSubwidget); //ok?
-		if (tqparentWidget())
+		if (parentWidget())
 			newSubwidget->setPalette( tqApp->palette() );
 		copyPropertiesToEditor();
 //		KFormDesigner::installRecursiveEventFilter(newSubwidget, this);
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index a908c2fd..f977a962 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -477,9 +477,9 @@ TQVariant KexiDBComboBox::valueFromInternalEditor()
 TQPoint KexiDBComboBox::mapFromParentToGlobal(const TQPoint& pos) const
 {
 //	const KexiFormScrollView* view = KexiUtils::findParentConst<const KexiFormScrollView>(this, "KexiFormScrollView"); 
-	if (!tqparentWidget())
+	if (!parentWidget())
 		return TQPoint(-1,-1);
-	return tqparentWidget()->mapToGlobal(pos);
+	return parentWidget()->mapToGlobal(pos);
 //	return view->viewport()->mapToGlobal(pos);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 8c9534d2..cca955e5 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -210,10 +210,10 @@ void
 KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
@@ -234,7 +234,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -425,7 +425,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						while (dataItemIface) {
 							if (dataItemIface->keyPressed(ke))
 								return false;
-							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->tqparentInterface()); //try in tqparent, e.g. in combobox
+							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox
 						}
 						break;
 					}
@@ -491,13 +491,13 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 			if (tab || backtab) {
 				//the watched widget can be a subwidget of a real widget, e.g. a drop down button of image box: find it
 				while (!KexiFormPart::library()->widgetInfoForClassName(realWidget->className()))
-					realWidget = realWidget->tqparentWidget();
+					realWidget = realWidget->parentWidget();
 				if (!realWidget)
 					return true; //ignore
 				//the watched widget can be a subwidget of a real widget, e.g. autofield: find it
 				//TQWidget* realWidget = TQT_TQWIDGET(watched);
-				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface())
-					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface() );
+				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface())
+					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() );
 
 				d->setOrderedFocusWidgetsIteratorTo( realWidget );
 				kexipluginsdbg << realWidget->name() << endl;
@@ -585,7 +585,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 				TQWidget *dataItem = dynamic_cast<TQWidget*>(watched);
 				while (dataItem) {
 					while (dataItem && !dynamic_cast<KexiDataItemInterface*>(dataItem))
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 					if (!dataItem)
 						break;
 					kexipluginsdbg << "KexiDBForm: FocusIn: FOUND " << dataItem->className() << " " << dataItem->name() << endl;
@@ -600,7 +600,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						break;
 					}
 					else
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 
 					dataItem->update();
 				}
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 5f2f20e3..0e79fada 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -608,9 +608,9 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
 	if (!m_lineWidthChanged) {
 		KexiFrame::setLineWidth( ds.isEmpty() ? 0 : 1 );
 	}
-	if (!m_paletteBackgroundColorChanged && tqparentWidget()) {
+	if (!m_paletteBackgroundColorChanged && parentWidget()) {
 		KexiFrame::setPaletteBackgroundColor( 
-			dataSource().isEmpty() ? tqparentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
 	}
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h
index 4457a8d0..92a87280 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.h
+++ b/kexi/plugins/forms/widgets/kexidblineedit.h
@@ -38,7 +38,7 @@ void setLighterGrayBackgroundColor(TQWidget* widget);
 
 //! @short Line edit widget for Kexi forms
 /*! Handles many data types. User input is validated by using validators 
- and/or input tqmasks.
+ and/or input masks.
 */
 class KEXIFORMUTILS_EXPORT KexiDBLineEdit :
 	public KLineEdit,
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 8cb4f795..6fcd851a 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 *tqparentForm, TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_parentForm(tqparentForm), m_form(0), m_widget(0)
+KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name)
+: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
@@ -74,7 +74,7 @@ KexiDBSubForm::setFormName(const TQString &name)
 		return;
 	}
 
-	TQWidget *pw = tqparentWidget();
+	TQWidget *pw = parentWidget();
 	KexiFormView *view = 0;
 	TQStringList list;
 	while(pw) {
@@ -87,18 +87,18 @@ KexiDBSubForm::setFormName(const TQString &name)
 		}
 		else if(! view && pw->isA("KexiFormView"))
 			view = static_cast<KexiFormView*>(pw); // we need a KexiFormView*
-		pw = pw->tqparentWidget();
+		pw = pw->parentWidget();
 	}
 
-	if (!view || !view->tqparentDialog() || !view->tqparentDialog()->mainWin()
-		|| !view->tqparentDialog()->mainWin()->project()->dbConnection())
+	if (!view || !view->parentDialog() || !view->parentDialog()->mainWin()
+		|| !view->parentDialog()->mainWin()->project()->dbConnection())
 		return;
 
-	KexiDB::Connection *conn = view->tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = view->parentDialog()->mainWin()->project()->dbConnection();
 
 	// we check if there is a form with this name
 	int id = KexiDB::idForObjectName(*conn, name, KexiPart::FormObjectType);
-	if((id == 0) || (id == view->tqparentDialog()->id())) // == our form
+	if((id == 0) || (id == view->parentDialog()->id())) // == our form
 		return; // because of recursion when loading
 
 	// we create the container widget
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h
index ea2bdbd3..cbbc6250 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 *tqparentForm, TQWidget *tqparent, const char *name);
+		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name);
 		~KexiDBSubForm() {}
 
 		//! \return the name of the subform to display inside this widget
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index bc3efc62..3060db2a 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -329,8 +329,8 @@ if ( m_mode == Clipboard )
 		{
 			actionButton( Ok )->setEnabled( false );
 			m_cancelled = true;
-			if (tqparentWidget())
-				tqparentWidget()->raise();
+			if (parentWidget())
+				parentWidget()->raise();
 			return;
 		}
 	}
@@ -443,8 +443,8 @@ bool KexiCSVImportDialog::openData()
 			.tqarg(TQDir::convertSeparators(m_fname)) );
 		actionButton( Ok )->setEnabled( false );
 		m_cancelled = true;
-		if (tqparentWidget())
-			tqparentWidget()->raise();
+		if (parentWidget())
+			parentWidget()->raise();
 		return false;
 	}
 	return true;
@@ -1570,7 +1570,7 @@ void KexiCSVImportDialog::accept()
 	TQDialog::accept();
 	KMessageBox::information(this, i18n("Data has been successfully imported to table \"%1\".")
 		.tqarg(m_destinationTableSchema->name()));
-	tqparentWidget()->raise();
+	parentWidget()->raise();
 	m_conn = 0;
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index cc3b6754..d44b8aee 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -206,7 +206,7 @@
         <slot>close()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 578ba69b..aed4a9bd 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -96,7 +96,7 @@ void KexiMacroProperty::init()
 	m_property->setType( KEXIMACRO_PROPERTYEDITORTYPE ); // use our own propertytype
 }
 
-KoProperty::Property* KexiMacroProperty::tqparentProperty() const
+KoProperty::Property* KexiMacroProperty::parentProperty() const
 {
 	return m_property;
 }
@@ -178,15 +178,15 @@ KoProperty::CustomProperty* KexiMacroPropertyFactory::createCustomProperty(KoPro
 	kdDebug()<<"KexiMacroPropertyFactory::createCustomProperty tqparent="<<tqparent->name()<<endl;
 
 	KoProperty::CustomProperty* customproperty = tqparent->customProperty();
-	KexiMacroProperty* tqparentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
-	if(! tqparentcustomproperty) {
+	KexiMacroProperty* parentcustomproperty = dynamic_cast<KexiMacroProperty*>(customproperty);
+	if(! parentcustomproperty) {
 		kdWarning() << "KexiMacroPropertyFactory::createCustomProperty() tqparent=" << tqparent->name() << " has an invalid customproperty." << endl;
 		return 0;
 	}
 
-	KSharedPtr<KoMacro::MacroItem> macroitem = tqparentcustomproperty->macroItem();
+	KSharedPtr<KoMacro::MacroItem> macroitem = parentcustomproperty->macroItem();
 	Q_ASSERT( macroitem.data() != 0 );
-	const TQString name = tqparentcustomproperty->name();
+	const TQString name = parentcustomproperty->name();
 	Q_ASSERT(! name.isEmpty());
 
 	KexiMacroProperty* macroproperty = new KexiMacroProperty(tqparent, macroitem, name);
@@ -297,14 +297,14 @@ class EditListBoxItem : public ListBoxItem
 				kdWarning() << "EditListBoxItem::EditListBoxItem() Skipped cause there exists no action for macroproperty=" << m_macroproperty->name() << endl;
 				return;
 			}
-			KoProperty::Property* tqparentproperty = m_macroproperty->tqparentProperty();
-			if(! tqparentproperty) {
-				kdWarning() << "EditListBoxItem::EditListBoxItem() No tqparentproperty defined" << endl;
+			KoProperty::Property* parentproperty = m_macroproperty->parentProperty();
+			if(! parentproperty) {
+				kdWarning() << "EditListBoxItem::EditListBoxItem() No parentproperty defined" << endl;
 				return;
 			}
 			KSharedPtr<KoMacro::Variable> variable = m_macroproperty->variable();
 			if(! variable.data()) {
-				kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << tqparentproperty->name() << endl;
+				kdWarning() << "EditListBoxItem::EditListBoxItem() No variable defined for property=" << parentproperty->name() << endl;
 				return;
 			}
 
@@ -342,7 +342,7 @@ class EditListBoxItem : public ListBoxItem
 				variable->text(), // caption
 				TQString(), // description
 				type, // type
-				0 //tqparentproperty // tqparent
+				0 //parentproperty // tqparent
 			);
 
 			m_widget = KoProperty::FactoryManager::self()->createWidgetForProperty(m_prop);
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.h b/kexi/plugins/macros/kexipart/keximacroproperty.h
index b1c256e9..b80857d1 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.h
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.h
@@ -52,7 +52,7 @@ class KexiMacroProperty
 		virtual ~KexiMacroProperty();
 
 		/** @return the tqparent @a KoProperty::Property instance. */
-		KoProperty::Property* tqparentProperty() const;
+		KoProperty::Property* parentProperty() const;
 
 		/** This function is called by @ref KoProperty::Property::setValue() 
 		when a custom property is set.
diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
index deec9633..11d9cee5 100644
--- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp
@@ -82,7 +82,7 @@ bool KexiMacroTextView::loadData()
 
 tristate KexiMacroTextView::storeData(bool /*dontAsk*/)
 {
-	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id()).tqarg(d->editor->text()) << endl;
+	kexipluginsdbg << TQString("KexiMacroTextView::storeData() %1 [%2]\n%3").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id()).tqarg(d->editor->text()) << endl;
 	return storeDataBlock( d->editor->text() );
 }
 
diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp
index 507764a7..e13483c1 100644
--- a/kexi/plugins/macros/kexipart/keximacroview.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroview.cpp
@@ -139,7 +139,7 @@ KexiDB::SchemaData* KexiMacroView::storeNewData(const KexiDB::SchemaData& sdata,
 	if(! storeData()) {
 		kexipluginsdbg << "KexiMacroView::storeNewData() Failed to store the data." << endl;
 		//failure: remove object's schema data to avoid garbage
-		KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+		KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 		conn->removeObject( schema->id() );
 		delete schema;
 		return 0;
@@ -154,7 +154,7 @@ tristate KexiMacroView::storeData(bool /*dontAsk*/)
 	TQDomElement macroelem = d->macro->toXML();
 	domdoc.appendChild(macroelem);
 	const TQString xml = domdoc.toString(2);
-	const TQString name = TQString("%1 [%2]").tqarg(tqparentDialog()->partItem()->name()).tqarg(tqparentDialog()->id());
+	const TQString name = TQString("%1 [%2]").tqarg(parentDialog()->partItem()->name()).tqarg(parentDialog()->id());
 	kexipluginsdbg << TQString("KexiMacroView::storeData %1\n%2").tqarg(name).tqarg(xml) << endl;
 	return storeDataBlock(xml);
 }
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui
index cddfa20e..a1f28a79 100644
--- a/kexi/plugins/queries/kexiaddparamwidget.ui
+++ b/kexi/plugins/queries/kexiaddparamwidget.ui
@@ -128,7 +128,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index dd5a00d8..e7526413 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -79,7 +79,7 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index a6205222..5be54145 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -349,7 +349,7 @@ KexiRelationWidget *KexiQueryDesignerGuiEditor::relationView() const
 KexiQueryPart::TempData *
 KexiQueryDesignerGuiEditor::tempData() const
 {
-	return static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 }
 
 static TQString msgCannotSwitch_EmptyDesign() {
@@ -581,7 +581,7 @@ KexiQueryDesignerGuiEditor::beforeSwitchTo(int mode, bool &dontStore)
 //		if (!d->dataTable->dataAwareObject()->acceptRowEdit())
 	//		return cancelled;
 
-		if (!dirty() && tqparentDialog()->neverSaved()) {
+		if (!dirty() && parentDialog()->neverSaved()) {
 			KMessageBox::information(this, msgCannotSwitch_EmptyDesign());
 			return cancelled;
 		}
@@ -618,13 +618,13 @@ tristate
 KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 {
 	const bool was_dirty = dirty();
-	KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
 	if (mode==Kexi::NoViewMode || (mode==Kexi::DataViewMode && !tempData()->query())) {
 		//this is not a SWITCH but a fresh opening in this view mode
 		if (!m_dialog->neverSaved()) {
 			if (!loadLayout()) {
 				//err msg
-				tqparentDialog()->settqStatus(conn,
+				parentDialog()->settqStatus(conn,
 					i18n("Query definition loading failed."),
 					i18n("Query design may be corrupted so it could not be opened even in text view.\n"
 						"You can delete the query and create it again."));
@@ -633,13 +633,13 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 			// Invalid queries case:
 			// KexiDialogBase::switchToViewMode() first opens DesignViewMode,
 			// and then KexiQueryPart::loadSchemaData() doesn't allocate QuerySchema object
-			// do we're carefully looking at tqparentDialog()->schemaData()
-			KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+			// do we're carefully looking at parentDialog()->schemaData()
+			KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 			if (q) {
 				KexiDB::ResultInfo result;
 				showFieldsForQuery( q, result );
 				if (!result.success) {
-					tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true;
 					return false;
 				}
@@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode)
 				KexiDB::ResultInfo result;
 				showFieldsAndRelationsForQuery( tempData()->query(), result );
 				if (!result.success) {
-					tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+					parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 					return false;
 				}
 			}
@@ -813,7 +813,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 	KexiDB::BaseExpr* e = query->whereExpression();
 	KexiDB::BaseExpr* eItem = 0;
 	while (e) {
-		//eat tqparentheses because the expression can be (....) AND (... AND ... )
+		//eat parentheses because the expression can be (....) AND (... AND ... )
 		while (e && e->toUnary() && e->token()=='(')
 			e = e->toUnary()->arg();
 
@@ -826,7 +826,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal(
 			e = 0;
 		}
 
-		//eat tqparentheses
+		//eat parentheses
 		while (eItem && eItem->toUnary() && eItem->token()=='(')
 			eItem = eItem->toUnary()->arg();
 
@@ -1077,13 +1077,13 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
 		//in a case when query tqlayout was not saved, build tqlayout by hand
 		// -- dynamic cast because of a need for handling invalid queries
 		//    (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
-		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		KexiDB::QuerySchema * q =	dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 		if (q) {
 			showTablesForQuery( q );
 			KexiDB::ResultInfo result;
 			showRelationsForQuery( q, result );
 			if (!result.success) {
-				tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
+				parentDialog()->settqStatus(&result, i18n("Query definition loading failed."));
 				return false;
 			}
 		}
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 36455837..e6eb9835 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -222,7 +222,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore)
 			}
 		}
 		else {
-			const bool designViewWasVisible = tqparentDialog()->viewForMode(mode)!=0;
+			const bool designViewWasVisible = parentDialog()->viewForMode(mode)!=0;
 			//should we check SQL text?
 			if (designViewWasVisible 
 				&& !d->justSwitchedFromNoViewMode //unchanged, but we should check SQL text
@@ -274,7 +274,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore)
 	}
 
 	setDirty(true);*/
-//	if (tqparentDialog()->hasFocus())
+//	if (parentDialog()->hasFocus())
 	d->editor->setFocus();
 	return true;
 }
@@ -287,13 +287,13 @@ KexiQueryDesignerSQLView::afterSwitchFrom(int mode)
 	if (mode==Kexi::NoViewMode) {
 		//User opened text view _directly_. 
 		//This flag is set to indicate for beforeSwitchTo() that even if text has not been changed,
-		//SQL text should be tqinvalidated.
+		//SQL text should be invalidated.
 		d->justSwitchedFromNoViewMode = true;
 	}
 	KexiQueryPart::TempData * temp = tempData();
 	KexiDB::QuerySchema *query = temp->query();
 	if (!query) {//try to just get saved schema, instead of temporary one
-		query = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		query = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 	}
 
 	if (mode!=0/*failure only if it is switching from prev. view*/ && !query) {
@@ -441,7 +441,7 @@ void KexiQueryDesignerSQLView::slotSelectQuery()
 KexiQueryPart::TempData *
 KexiQueryDesignerSQLView::tempData() const
 {	
-	return dynamic_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+	return dynamic_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 }
 
 KexiDB::SchemaData*
diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp
index cf5400dc..9d7cc542 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
 	}
 	d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params);
 	if (!d->cursor) {
-		tqparentDialog()->settqStatus(tqparentDialog()->mainWin()->project()->dbConnection(), 
+		parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), 
 			i18n("Query executing failed."));
 		//todo: also provide server result and sql statement
 		return false;
@@ -108,13 +108,13 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query)
 tristate KexiQueryView::afterSwitchFrom(int mode)
 {
 	if (mode==Kexi::NoViewMode) {
-		KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData());
+		KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData());
 		const tristate result = executeQuery(querySchema);
 		if (true != result)
 			return result;
 	}
 	else if (mode==Kexi::DesignViewMode || Kexi::TextViewMode) {
-		KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData());
+		KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData());
 
 		//remember what view we should use to store data changes, if needed
 //		if (temp->queryChangedInPreviousView)
@@ -131,7 +131,7 @@ tristate KexiQueryView::afterSwitchFrom(int mode)
 
 KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel)
 {
-	KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag();
+	KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag();
 	if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view))
 		return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeNewData(sdata, cancel);
 	if (dynamic_cast<KexiQueryDesignerSQLView*>(view))
@@ -141,7 +141,7 @@ KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata,
 
 tristate KexiQueryView::storeData(bool dontAsk)
 {
-	KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag();
+	KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag();
 	if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view))
 		return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeData(dontAsk);
 	if (dynamic_cast<KexiQueryDesignerSQLView*>(view))
diff --git a/kexi/plugins/reports/kexireportfactory.h b/kexi/plugins/reports/kexireportfactory.h
index ab2ce7a1..1813fce7 100644
--- a/kexi/plugins/reports/kexireportfactory.h
+++ b/kexi/plugins/reports/kexireportfactory.h
@@ -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 &tqparentNode, TQDomDocument &tqparent) {}
+		         //TQDomElement &parentNode, TQDomDocument &tqparent) {}
 		//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 11c49c84..4e04beae 100644
--- a/kexi/plugins/reports/kexireportform.cpp
+++ b/kexi/plugins/reports/kexireportform.cpp
@@ -121,10 +121,10 @@ void
 KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.begin(this, true);
@@ -144,7 +144,7 @@ KexiReportForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp
index 913a493e..403c0277 100644
--- a/kexi/plugins/reports/kexireportview.cpp
+++ b/kexi/plugins/reports/kexireportview.cpp
@@ -187,7 +187,7 @@ KexiReportView::initForm()
 
 	// Show the form wizard if this is a new Form
 //	KexiDB::FieldList *fields = 0;
-	if(tqparentDialog()->id() < 0)
+	if(parentDialog()->id() < 0)
 	{
 #ifndef NO_DSWIZARD
 		KexiDataSourceWizard *w = new KexiDataSourceWizard(mainWin(), (TQWidget*)mainWin(), "datasource_wizard");
@@ -220,7 +220,7 @@ KexiReportView::loadForm()
 
 //@todo also load m_resizeMode !
 
-	kexipluginsdbg << "KexiReportForm::loadForm() Loading the form with id : " << tqparentDialog()->id() << endl;
+	kexipluginsdbg << "KexiReportForm::loadForm() Loading the form with id : " << parentDialog()->id() << endl;
 	// If we are previewing the Form, use the tempData instead of the form stored in the db
 	if(viewMode()==Kexi::DataViewMode && !tempData()->tempForm.isNull() ) {
 		KFormDesigner::FormIO::loadFormFromString(form(), m_reportform, tempData()->tempForm);
@@ -322,7 +322,7 @@ tristate
 KexiReportView::storeData(bool dontAsk)
 {
 	Q_UNUSED(dontAsk)
-	kexipluginsdbg << "KexiReportForm::storeData(): " << tqparentDialog()->partItem()->name() << " [" << tqparentDialog()->id() << "]" << endl;
+	kexipluginsdbg << "KexiReportForm::storeData(): " << parentDialog()->partItem()->name() << " [" << parentDialog()->id() << "]" << endl;
 	TQString data;
 	KFormDesigner::FormIO::saveFormToString(tempData()->form, data);
 	if (!storeDataBlock(data))
diff --git a/kexi/plugins/reports/kexireportview.h b/kexi/plugins/reports/kexireportview.h
index 02b4b48a..2b88c181 100644
--- a/kexi/plugins/reports/kexireportview.h
+++ b/kexi/plugins/reports/kexireportview.h
@@ -107,7 +107,7 @@ class KEXIREPORTUTILS_EXPORT KexiReportView : public KexiViewBase
 		virtual tristate storeData(bool dontAsk = false);
 
 		KexiReportPart::TempData* tempData() const {
-			return static_cast<KexiReportPart::TempData*>(tqparentDialog()->tempData()); }
+			return static_cast<KexiReportPart::TempData*>(parentDialog()->tempData()); }
 		KexiReportPart* reportPart() const { return static_cast<KexiReportPart*>(part()); }
 
 		void disableWidgetActions();
diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp
index 393beaad..c3ca65e4 100644
--- a/kexi/plugins/reports/reportwidgets.cpp
+++ b/kexi/plugins/reports/reportwidgets.cpp
@@ -145,16 +145,16 @@ KexiSubReport::setReportName(const TQString &name)
 		return;
 
 	// we need a KexiReportView*
-	TQWidget *w = tqparentWidget();
+	TQWidget *w = parentWidget();
 	while(w && !w->isA("KexiReportView"))
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	KexiReportView *view = (KexiReportView*)w;
 	if(!view)
 		return;
 
 	// we check if there is a form with this name
 	int id = KexiDB::idForObjectName(*(view->connection()), name, KexiPart::ReportObjectType);
-	if((id == 0) || (id == view->tqparentDialog()->id())) // == our form
+	if((id == 0) || (id == view->parentDialog()->id())) // == our form
 		return; // because of recursion when loading
 
 	// we create the container widget
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 0c95cb0e..39f84599 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -295,7 +295,7 @@ KexiDB::SchemaData* KexiScriptDesignView::storeNewData(const KexiDB::SchemaData&
     if(! storeData()) {
         kdWarning() << "KexiScriptDesignView::storeNewData Failed to store the data." << endl;
         //failure: remove object's schema data to avoid garbage
-        KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection();
+        KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection();
         conn->removeObject( s->id() );
         delete s;
         return 0;
@@ -306,7 +306,7 @@ KexiDB::SchemaData* KexiScriptDesignView::storeNewData(const KexiDB::SchemaData&
 
 tristate KexiScriptDesignView::storeData(bool /*dontAsk*/)
 {
-    kexipluginsdbg << "KexiScriptDesignView::storeData(): " << tqparentDialog()->partItem()->name() << " [" << tqparentDialog()->id() << "]" << endl;
+    kexipluginsdbg << "KexiScriptDesignView::storeData(): " << parentDialog()->partItem()->name() << " [" << parentDialog()->id() << "]" << endl;
 
     TQDomDocument domdoc("script");
     TQDomElement scriptelem = domdoc.createElement("script");
diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
index 3a2734aa..43fa7e25 100644
--- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
+++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py
@@ -238,19 +238,19 @@ def runGuiApp(copycenter, name):
 			f.close()
 			print "File \%s\" successfully written." % filename
 
-		def addItem(self, pluginimpl, afteritem = None, tqparentitem = None):
+		def addItem(self, pluginimpl, afteritem = None, parentitem = None):
 			#print "CopyJobWidget.addItem"
 			class ListViewItem(qt.QListViewItem):
-				def __init__(self, pluginimpl, listview, tqparentitem = None, afteritem = None):
+				def __init__(self, pluginimpl, listview, parentitem = None, afteritem = None):
 					self.pluginimpl = pluginimpl
-					if tqparentitem == None:
+					if parentitem == None:
 						qt.QListViewItem.__init__(self,listview)
 						self.setOpen(True)
 					else:
 						if afteritem == None:
-							qt.QListViewItem.__init__(self,tqparentitem)
+							qt.QListViewItem.__init__(self,parentitem)
 						else:
-							qt.QListViewItem.__init__(self,tqparentitem,afteritem)
+							qt.QListViewItem.__init__(self,parentitem,afteritem)
 						self.setRenameEnabled(1,True)
 				def startRename(self, columnindex):
 					qt.QListViewItem.startRename(self,columnindex)
@@ -274,7 +274,7 @@ def runGuiApp(copycenter, name):
 						if qt.QListViewItem.text(self,0).tqcontains("password"):
 							return "*" * len(str(qt.QListViewItem.text(self,1)))
 					return qt.QListViewItem.text(self,columnindex)
-			return ListViewItem(pluginimpl, self.listview, tqparentitem, afteritem)
+			return ListViewItem(pluginimpl, self.listview, parentitem, afteritem)
 
 		def updateItem(self,pluginname,pluginimpl):
 			#print "CopyJobWidget.updateItem"
diff --git a/kexi/plugins/tables/kexitabledesigner_dataview.cpp b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
index 2b0b3608..e1b8ddb9 100644
--- a/kexi/plugins/tables/kexitabledesigner_dataview.cpp
+++ b/kexi/plugins/tables/kexitabledesigner_dataview.cpp
@@ -73,7 +73,7 @@ tristate KexiTableDesigner_DataView::afterSwitchFrom(int mode)
 
 KexiTablePart::TempData* KexiTableDesigner_DataView::tempData() const
 {
-	return static_cast<KexiTablePart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiTablePart::TempData*>(parentDialog()->tempData());
 }
 
 #include "kexitabledesigner_dataview.moc"
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index a612453a..2f6cd21c 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -588,13 +588,13 @@ tristate KexiTableDesignerView::beforeSwitchTo(int mode, bool &dontStore)
 	else */
 	tristate res = true;
 	if (mode==Kexi::DataViewMode) {
-		if (!dirty() && tqparentDialog()->neverSaved()) {
+		if (!dirty() && parentDialog()->neverSaved()) {
 			KMessageBox::sorry(this, i18n("Cannot switch to data view, because table design is empty.\n"
 				"First, please create your design.") );
 			return cancelled;
 		}
 //<temporary>
-		else if (dirty() && !tqparentDialog()->neverSaved()) {
+		else if (dirty() && !parentDialog()->neverSaved()) {
 //			cancelled = (KMessageBox::No == KMessageBox::questionYesNo(this, i18n("Saving changes for existing table design is not yet supported.\nDo you want to discard your changes now?")));
 
 //			KexiDB::Connection *conn = mainWin()->project()->dbConnection();
@@ -1406,7 +1406,7 @@ KexiDB::SchemaData* KexiTableDesignerView::storeNewData(const KexiDB::SchemaData
 		KexiDB::Connection *conn = mainWin()->project()->dbConnection();
 		res = conn->createTable(tempData()->table);
 		if (res!=true)
-			tqparentDialog()->settqStatus(conn, "");
+			parentDialog()->settqStatus(conn, "");
 	}
 
 	if (res == true) {
@@ -1489,7 +1489,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 
 			res = conn->alterTable(*tempData()->table, *newTable);
 			if (res != true)
-				tqparentDialog()->settqStatus(conn, "");
+				parentDialog()->settqStatus(conn, "");
 		}
 		else {
 			KexiDB::AlterTableHandler::ExecutionArguments args;
@@ -1499,7 +1499,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
 				<< res.toString() << endl;
 			if (true != res) {
 				alterTableHandler->debugError();
-				tqparentDialog()->settqStatus(alterTableHandler, "");
+				parentDialog()->settqStatus(alterTableHandler, "");
 			}
 		}
 	}
@@ -1521,7 +1521,7 @@ tristate KexiTableDesignerView::simulateAlterTableExecution(TQString *debugTarge
 {
 #ifndef KEXI_NO_UNDOREDO_ALTERTABLE
 # ifdef KEXI_DEBUG_GUI
-	if (mainWin()->activeWindow() != tqparentDialog()) //to avoid executing for multiple alter table views
+	if (mainWin()->activeWindow() != parentDialog()) //to avoid executing for multiple alter table views
 		return false;
 	if (!tempData()->table || !m_dialog->schemaData())
 		return false;
@@ -1566,7 +1566,7 @@ tristate KexiTableDesignerView::executeRealAlterTable()
 
 KexiTablePart::TempData* KexiTableDesignerView::tempData() const
 {
-	return static_cast<KexiTablePart::TempData*>(tqparentDialog()->tempData());
+	return static_cast<KexiTablePart::TempData*>(parentDialog()->tempData());
 }
 
 /*void KexiTableDesignerView::slotAboutToUpdateRow(
@@ -1910,10 +1910,10 @@ void KexiTableDesignerView::propertySetSwitched()
 {
 	KexiDataTable::propertySetSwitched();
 
-	//if (tqparentDialog()!=tqparentDialog()->mainWin()->currentDialog())
+	//if (parentDialog()!=parentDialog()->mainWin()->currentDialog())
 	//	return; //this is not the current dialog's view
 	
-	static_cast<KexiTablePart*>(tqparentDialog()->part())->lookupColumnPage()
+	static_cast<KexiTablePart*>(parentDialog()->part())->lookupColumnPage()
 		->assignPropertySet(propertySet());
 }
 
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index cf98b683..c546327b 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -277,7 +277,7 @@ TQString KexiTableDesignerViewPrivate::messageForSavingChanges(bool &emptyTable,
 	return i18n("Do you want to save the design now?")
 	+ ( (emptyTable || skipWarning) ? TQString() :
 		(TQString("\n\n") + designerView->part()->i18nMessage(":additional message before saving design", 
-		designerView->tqparentDialog())) );
+		designerView->parentDialog())) );
 }
 
 void KexiTableDesignerViewPrivate::updateIconForItem(KexiTableItem &item, KoProperty::Set& set)
diff --git a/kexi/tests/altertable/1.kexi b/kexi/tests/altertable/1.kexi
index 057301a3..8c13ad39 100644
--- a/kexi/tests/altertable/1.kexi
+++ b/kexi/tests/altertable/1.kexi
diff --git a/kexi/tests/altertable/altertable.cpp b/kexi/tests/altertable/altertable.cpp
index 1c5589c4..6155eb63 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -461,7 +461,7 @@ bool AlterTableTester::closeWindow(KexiDialogBase* dlg)
 	if (!dlg)
 		return true;
 	TQString name = dlg->partItem()->name();
-	tristate result = true == win->closeDialog(dlg, true/*tqlayoutTaskBar*/, true/*doNotSaveChanges*/);
+	tristate result = true == win->closeDialog(dlg, true/*layoutTaskBar*/, true/*doNotSaveChanges*/);
 	kdDebug() << TQString("Closing window for table '%1': %2").tqarg(name)
 		.tqarg(result==true ? "OK" : (result==false ? "Failed" : "Cancelled")) << endl;
 	return result == true;
diff --git a/kexi/tests/gui/finddialog/kexifinddialogbase.ui b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
index 41e4294b..568e0781 100644
--- a/kexi/tests/gui/finddialog/kexifinddialogbase.ui
+++ b/kexi/tests/gui/finddialog/kexifinddialogbase.ui
@@ -309,7 +309,7 @@
     <tabstop>m_caseSensitive</tabstop>
     <tabstop>m_wholeWords</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kexi/tests/newapi/statements.txt b/kexi/tests/newapi/statements.txt
index c0cc8e7c..3d108ce7 100644
--- a/kexi/tests/newapi/statements.txt
+++ b/kexi/tests/newapi/statements.txt
@@ -47,7 +47,7 @@ select 2+3*4 from cars;
 select (2+3)*4 from cars;
 -- OK202: support for aliases for complex-expression columns
 select (2+3)*4 from cars;
--- ER203: column names are tqinvalidated inside a complex expressions
+-- ER203: column names are invalidated inside a complex expressions
 select one*two from persons;
 -- ER204: like ER106, but ambiguous column is inside a complex expression
 select id*2 from persons p, cars p;
diff --git a/kexi/widget/kexidbconnectionwidgetbase.ui b/kexi/widget/kexidbconnectionwidgetbase.ui
index fc488852..6dd4fbf8 100644
--- a/kexi/widget/kexidbconnectionwidgetbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetbase.ui
@@ -449,7 +449,7 @@
     <tabstop>titleEdit</tabstop>
     <tabstop>frmEngine</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
index 6c173b42..f1f161de 100644
--- a/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
+++ b/kexi/widget/kexidbconnectionwidgetdetailsbase.ui
@@ -185,7 +185,7 @@
 <Q_SLOTS>
     <slot access="protected">slotCBToggled( bool on )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kexi/widget/kexiprjtypeselectorbase.ui b/kexi/widget/kexiprjtypeselectorbase.ui
index 069a89b0..059bf080 100644
--- a/kexi/widget/kexiprjtypeselectorbase.ui
+++ b/kexi/widget/kexiprjtypeselectorbase.ui
@@ -158,5 +158,5 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index fbcf91de..f5bc4d9e 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -112,14 +112,14 @@ PixmapCollection::tqcontains(const TQString &name)
 }
 
 void
-PixmapCollection::save(TQDomNode tqparentNode)
+PixmapCollection::save(TQDomNode parentNode)
 {
 	if(m_pixmaps.isEmpty())
 		return;
 
-	TQDomDocument domDoc = tqparentNode.ownerDocument();
+	TQDomDocument domDoc = parentNode.ownerDocument();
 	TQDomElement collection = domDoc.createElement("collection");
-	tqparentNode.appendChild(collection);
+	parentNode.appendChild(collection);
 
 	PixmapMap::ConstIterator it;
 	PixmapMap::ConstIterator endIt = m_pixmaps.constEnd();
@@ -282,7 +282,7 @@ PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQW
 void
 PixmapCollectionEditor::newItemByName()
 {
-	LoadIconDialog d(tqparentWidget());
+	LoadIconDialog d(parentWidget());
 	if(d.exec()== TQDialog::Accepted)
 	{
 		if(d.iconName().isEmpty())
@@ -296,7 +296,7 @@ PixmapCollectionEditor::newItemByName()
 void
 PixmapCollectionEditor::newItemByPath()
 {
-	KURL url = KFileDialog::getImageOpenURL("::kexi", tqparentWidget());
+	KURL url = KFileDialog::getImageOpenURL("::kexi", parentWidget());
 	if(url.isEmpty())
 		return;
 	TQString name = m_collection->addPixmapPath(url);
@@ -310,7 +310,7 @@ PixmapCollectionEditor::removeItem()
 	if( !item )
 	  return;
 
-	int confirm = KMessageBox::questionYesNo(tqparentWidget(), TQString("<qt>")+
+	int confirm = KMessageBox::questionYesNo(parentWidget(), TQString("<qt>")+
 		i18n("Do you want to remove item \"%1\" from collection \"%2\"?")
 		.tqarg(item->text()).tqarg(m_collection->collectionName()) + "</qt>");
 	if(confirm == KMessageBox::No)
@@ -427,7 +427,7 @@ PixmapCollectionChooser::getPixmap(const TQString &name)
 void
 PixmapCollectionChooser::slotUser1()
 {
-	PixmapCollectionEditor dialog(m_collection, tqparentWidget());
+	PixmapCollectionEditor dialog(m_collection, parentWidget());
 	dialog.exec();
 
 	m_iconView->clear();
diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h
index 53637e28..caf11fd5 100644
--- a/kexi/widget/pixmapcollection.h
+++ b/kexi/widget/pixmapcollection.h
@@ -56,7 +56,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject
 		bool   tqcontains(const TQString &name);
 		TQPixmap  getPixmap(const TQString &name);
 
-		void save(TQDomNode tqparentNode);
+		void save(TQDomNode parentNode);
 		void load(TQDomNode node);
 
 		TQString collectionName() {return m_name; }
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index ae35334b..2be89bb0 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -81,7 +81,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 		this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
-//	tqinvalidateActions();
+//	invalidateActions();
 
 #if 0
 
@@ -91,7 +91,7 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name)
 	m_removeSelectedTableQueryAction->plug( m_popup );
 	m_removeSelectedConnectionAction->plug( m_popup );
 
-	tqinvalidateActions();
+	invalidateActions();
 #endif
 
 	tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true);
@@ -334,7 +334,7 @@ KexiRelationView::setReadOnly(bool b)
 {
 	m_readOnly=b;
 //TODO
-//	tqinvalidateActions();
+//	invalidateActions();
 /*	TableList::Iterator it, end( m_tables.end() );	
  	for ( it=m_tables.begin(); it != end; ++it)
 	{
@@ -381,7 +381,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev)
 		updateContents(cview->connectionRect());
 		m_selectedConnection = cview;
 		emit connectionViewGotFocus();
-//		tqinvalidateActions();
+//		invalidateActions();
 
 		if(ev->button() == Qt::RightButton) {//show popup
 			kdDebug() << "KexiRelationView::contentsMousePressEvent(): context" << endl;
@@ -395,7 +395,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev)
 	}
 	//connection not found
 	clearSelection();
-//	tqinvalidateActions();
+//	invalidateActions();
 	if(ev->button() == Qt::RightButton) {//show popup on view background area
 //		TQPopupMenu m;
 //			m_removeSelectedConnectionAction->plug( &m );
@@ -415,13 +415,13 @@ void KexiRelationView::clearSelection()
 		m_focusedTableView->unsetFocus();
 		m_focusedTableView = 0;
 //		setFocus();
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 	if (m_selectedConnection) {
 		m_selectedConnection->setSelected(false);
 		updateContents(m_selectedConnection->connectionRect());
 		m_selectedConnection = 0;
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 }
 
@@ -516,7 +516,7 @@ KexiRelationView::removeSelectedObject()
 #endif
 		delete m_selectedConnection;
 		m_selectedConnection = 0;
-//		tqinvalidateActions();
+//		invalidateActions();
 	}
 	else if (m_focusedTableView) {
 		KexiRelationViewTableContainer *tmp = m_focusedTableView;
@@ -580,7 +580,7 @@ void KexiRelationView::slotTableViewGotFocus()
 //	if (m_focusedTableView)
 //		m_focusedTableView->unsetFocus();
 	m_focusedTableView = (KexiRelationViewTableContainer*)sender();
-//	tqinvalidateActions();
+//	invalidateActions();
 	emit tableViewGotFocus();
 }
 
@@ -614,12 +614,12 @@ void KexiRelationView::tableHeaderContextMenuRequest(const TQPoint& pos)
 	if (m_focusedTableView != sender())
 		return;
 	kdDebug() << "HEADER CTXT MENU!" <<endl;
-	tqinvalidateActions();
+	invalidateActions();
 	m_tableQueryPopup->exec(pos);	
 }
 
 //! Invalidates all actions availability
-void KexiRelationView::tqinvalidateActions()
+void KexiRelationView::invalidateActions()
 {
 	setAvailable("edit_delete", m_selectedConnection || m_focusedTableView);
 }
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index b5d1785d..dcf78834 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -151,7 +151,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView
 
 		void recalculateSize(int width, int height);
 		void stretchExpandSize();
-//		void		tqinvalidateActions();
+//		void		invalidateActions();
 //		void clearTableSelection();
 //		void clearConnSelection();
 
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index c850d722..2145cf20 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -214,7 +214,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 			diffY=TQT_TQMOUSEEVENT(ev)->globalPos().y()-m_grabY;
 			if ((abs(diffX)>2) || (abs(diffY)>2))
 			{
-				TQPoint newPos=tqparentWidget()->pos()+TQPoint(diffX,diffY);
+				TQPoint newPos=parentWidget()->pos()+TQPoint(diffX,diffY);
 //correct the x position
 				if (newPos.x()<0) {
 					m_offsetX+=newPos.x();
@@ -244,7 +244,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 				}
 //move and update helpers
 
-				tqparentWidget()->move(newPos);
+				parentWidget()->move(newPos);
 				m_grabX=TQT_TQMOUSEEVENT(ev)->globalPos().x();
 				m_grabY=TQT_TQMOUSEEVENT(ev)->globalPos().y();
 //				kdDebug()<<"HEADER:emitting moved"<<endl;
@@ -258,7 +258,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev)
 
 void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) {
 	kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Press Event"<<endl;
-	tqparentWidget()->setFocus();
+	parentWidget()->setFocus();
 	ev->accept();
 	if (ev->button()==Qt::LeftButton) {
 		m_dragging=true;
@@ -270,7 +270,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) {
 		return;
 	}
 	if (ev->button()==Qt::RightButton) {
-		emit static_cast<KexiRelationViewTableContainer*>(tqparentWidget())
+		emit static_cast<KexiRelationViewTableContainer*>(parentWidget())
 			->contextMenuRequest(ev->globalPos());
 	}
 //	TQLabel::mousePressEvent(ev);
@@ -410,11 +410,11 @@ KexiRelationViewTable::slotContentsMoving(int,int)
 
 void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 {
-	tqparentWidget()->setFocus();
+	parentWidget()->setFocus();
 	setFocus();
 	KListView::contentsMousePressEvent(ev);
 //	if (ev->button()==Qt::RightButton)
-//		static_cast<KexiRelationView*>(tqparentWidget())->executePopup(ev->pos());
+//		static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos());
 }
 
 TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item)
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 7ef5a961..e48a5d00 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -129,7 +129,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent,
 		TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable()));
 #endif
 
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 KexiRelationWidget::~KexiRelationWidget()
@@ -228,39 +228,39 @@ void KexiRelationWidget::tableViewGotFocus()
 //	if (m_focusedTableView)
 //		m_focusedTableView->unsetFocus();
 //	m_focusedTableView = (KexiRelationViewTableContainer*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::connectionViewGotFocus()
 {
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::emptyAreaGotFocus()
 {
-	tqinvalidateActions();
+	invalidateActions();
 }
 
 void KexiRelationWidget::tableContextMenuRequest(const TQPoint& pos)
 {
-	tqinvalidateActions();
+	invalidateActions();
 	executePopup( pos );
 }
 
 void KexiRelationWidget::connectionContextMenuRequest(const TQPoint& pos)
 {
-	tqinvalidateActions();
+	invalidateActions();
 	executePopup( pos );
 //	m_connectionPopup->exec(pos);
 }
 
 void KexiRelationWidget::emptyAreaContextMenuRequest( const TQPoint& /*pos*/ )
 {
-	tqinvalidateActions();
+	invalidateActions();
 	//TODO
 }
 
-void KexiRelationWidget::tqinvalidateActions()
+void KexiRelationWidget::invalidateActions()
 {
 	setAvailable("edit_delete", m_relationView->selectedConnection() || m_relationView->focusedTableView());
 }
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 869dbf11..20a70174 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -115,7 +115,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 		void executePopup( TQPoint pos = TQPoint(-1,-1) );
 
 		//! Invalidates all actions availability.
-		void tqinvalidateActions();
+		void invalidateActions();
 
 		//! Fills table's combo box with all available table names.
 		void fillTablesCombo();
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 4352c260..dbf95ad6 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -88,7 +88,7 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqpa
 //	m_proc = 0;
 //	m_content = 0;
 	m_hasFocusableWidget = false;
-	d->button = new KexiDropDownButton( tqparentWidget() /*usually a viewport*/ );
+	d->button = new KexiDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	TQToolTip::add(d->button, i18n("Click to show available actions for this cell"));
 
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 19cf0b99..89ba63cf 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -482,7 +482,7 @@ void KexiComboBoxBase::slotItemSelected(KexiTableItem*)
 		if (valueToSet.toString().isEmpty() && !m_insideCreatePopup) {
 			clear();
 			TQWidget* thisWidget = dynamic_cast<TQWidget*>(this);
-			thisWidget->tqparentWidget()->setFocus();
+			thisWidget->parentWidget()->setFocus();
 			return;
 		}
 	}
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 65edd806..4fe8b940 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -298,9 +298,9 @@ void KexiComboBoxPopup::updateSize(int minWidth)
 
 	d->tv->adjustColumnWidthToContents(-1);
 
-	KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(tqparentWidget());
+	KexiTableEdit *te = dynamic_cast<KexiTableEdit*>(parentWidget());
 	const int width = TQMAX( d->tv->tableSize().width(), 
-		(te ? te->totalSize().width() : (tqparentWidget()?tqparentWidget()->width():0/*sanity*/)) );
+		(te ? te->totalSize().width() : (parentWidget()?parentWidget()->width():0/*sanity*/)) );
 	kexidbg << "KexiComboBoxPopup::updateSize(): size=" << size() << endl;
 	resize( TQMAX(minWidth, width)/*+(d->tv->columns()>1?2:0)*/ /*(d->updateSizeCalled?0:1)*/, d->tv->rowHeight() * rows +2 );
 	kexidbg << "KexiComboBoxPopup::updateSize(): size after=" << size() << endl;
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index ba61e305..4695dbf8 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -68,7 +68,7 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
 {
 	setName("KexiComboBoxTableEdit");
 	m_setVisibleValueOnSetValueInternal = true;
-	d->button = new KexiComboBoxDropDownButton( tqparentWidget() /*usually a viewport*/ );
+	d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ );
 	d->button->hide();
 	d->button->setFocusPolicy( TQ_NoFocus );
 	connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked()));
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 799a1a8b..9fc319ff 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -128,7 +128,7 @@ KexiTableViewCellToolTip::KexiTableViewCellToolTip( KexiTableView * tableView )
 
 KexiTableViewCellToolTip::~KexiTableViewCellToolTip()
 {
-	remove(tqparentWidget());
+	remove(parentWidget());
 }
 
 void KexiTableViewCellToolTip::maybeTip( const TQPoint & p )
@@ -718,8 +718,8 @@ void KexiTableView::paintCell(TQPainter* p, KexiTableItem *item, int col, int ro
 	int x2 = w - 1;
 	int y2 = h - 1;
 
-/*	if (0==qstrcmp("KexiComboBoxPopup",tqparentWidget()->className())) {
-	  kexidbg  << tqparentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl;
+/*	if (0==qstrcmp("KexiComboBoxPopup",parentWidget()->className())) {
+	  kexidbg  << parentWidget()->className() << " >>>>>> KexiTableView::paintCell(col=" << col <<"row="<<row<<") w="<<w<<endl;
 	}*/
 
 	//	Draw our lines
@@ -923,7 +923,7 @@ TQPoint KexiTableView::viewportToContents2( const TQPoint& vp )
 
 void KexiTableView::paintEmptyArea( TQPainter *p, int cx, int cy, int cw, int ch )
 {
-//  qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)tqparentWidget()->caption(),cx,cy,cw,ch);
+//  qDebug("%s: paintEmptyArea(x:%d y:%d w:%d h:%d)", (const char*)parentWidget()->caption(),cx,cy,cw,ch);
 
 	// Regions work with shorts, so avoid an overflow and adjust the
 	// table size to the visible size
diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h
index 56241fcb..b22d619d 100644
--- a/kexi/widget/tableview/kexitableviewdata.h
+++ b/kexi/widget/tableview/kexitableviewdata.h
@@ -285,7 +285,7 @@ public:
 	inline bool isDBAware() { return m_cursor; }
 
 	/*! For db-aware data set only: table name is returned;
-	 equivalent to cursor()->query()->tqparentTable()->name(). */
+	 equivalent to cursor()->query()->parentTable()->name(). */
 	TQString dbTableName() const;
 
 	inline KexiDB::Cursor* cursor() const { return m_cursor; }
diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 05212dd1..f6a839e3 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -31,8 +31,8 @@
 class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy
 {
 	public:
-		KexiTableViewHeaderStyle(TQStyle *tqparentStyle, TQWidget *widget)
-		 : KexiUtils::StyleProxy(tqparentStyle)
+		KexiTableViewHeaderStyle(TQStyle *parentStyle, TQWidget *widget)
+		 : KexiUtils::StyleProxy(parentStyle)
 		{
 			setBackgroundColor( widget->tqpalette().active().background() );
 		}
diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp
index a805f5e3..2c6f86aa 100644
--- a/kexi/widget/utils/kexiarrowtip.cpp
+++ b/kexi/widget/utils/kexiarrowtip.cpp
@@ -50,13 +50,13 @@ KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent)
 	setAutoMask( false );
 
 	//generate tqmask
-	TQPixmap tqmaskPm(size());
-	tqmaskPm.fill( black );
-	TQPainter tqmaskPainter(&tqmaskPm);
-	drawFrame(tqmaskPainter);
-	TQImage tqmaskImg( tqmaskPm.convertToImage() );
+	TQPixmap maskPm(size());
+	maskPm.fill( black );
+	TQPainter maskPainter(&maskPm);
+	drawFrame(maskPainter);
+	TQImage maskImg( maskPm.convertToImage() );
 	TQBitmap bm;
-	bm = tqmaskImg.createHeuristicMask();
+	bm = maskImg.createHeuristicMask();
 	setMask( bm );
 }
 
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index d7150c6b..e5f98aee 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -244,7 +244,7 @@ KexiFlowLayout::doHorizontalLayout(const TQRect &r, bool testOnly)
 		}
 
 //		kdDebug() << "- doHorizontalLayout(): " << o->widget()->className() << " " << o->widget()->name() << endl;
-		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child tqlayouts)
+		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if ((x + oSizeHint.width()) > r.right() && h > 0) {
 			// do the tqlayout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
@@ -360,7 +360,7 @@ KexiFlowLayout::doVerticalLayout(const TQRect &r, bool testOnly)
 			continue;
 		}
 
-		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child tqlayouts)
+		TQSize oSizeHint = o->tqsizeHint(); // we cache these ones because it can take a while to get it (eg for child layouts)
 		if (y + oSizeHint.height() > r.bottom() && w > 0) {
 			// do the tqlayout of current line
 			TQPtrListIterator<TQLayoutItem> it2(currentLine);
diff --git a/kformula/DESIGN b/kformula/DESIGN
index 326cfb55..d457695f 100644
--- a/kformula/DESIGN
+++ b/kformula/DESIGN
@@ -57,7 +57,7 @@ except SequenceElements if they contains a SequenceElement they merge
 it in the list
 
 They can handle splitting of the sequence to allow "select an put selected item
-between tqparenthesis" i.e. as content child of a delimiterelement) 
+between parenthesis" i.e. as content child of a delimiterelement) 
 
 
 FormulaElement from SequenceElement
@@ -91,7 +91,7 @@ contains one char and no tqchildren at all.
 
 
 Might have its own font and size. But preferes to use a reasonalbe
-font and size that are calculated from its tqparents font and a given
+font and size that are calculated from its parents font and a given
 scheme (see below).
 
 
diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc
index 5b605e60..330e6c51 100644
--- a/kformula/kformula_doc.cc
+++ b/kformula/kformula_doc.cc
@@ -55,8 +55,8 @@
 #include <kformuladocument.h>
 
 
-KFormulaDoc::KFormulaDoc(TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode)
-        : KoDocument(tqparentWidget, widgetName, tqparent, name, singleViewMode)
+KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode)
+        : KoDocument(parentWidget, widgetName, tqparent, name, singleViewMode)
 {
     setInstance(KFormulaFactory::global(), false);
     //kdDebug(39001) << "General Settings" << endl;
@@ -206,7 +206,7 @@ void KFormulaDoc::documentRestored()
 }
 
 
-bool KFormulaDoc::initDoc(InitDocFlags /*flags*/, TQWidget* /*tqparentWidget*/)
+bool KFormulaDoc::initDoc(InitDocFlags /*flags*/, TQWidget* /*parentWidget*/)
 {
     // If nothing is loaded, do initialize here
     return TRUE;
diff --git a/kformula/kformula_doc.h b/kformula/kformula_doc.h
index ab775bc2..81ba62a7 100644
--- a/kformula/kformula_doc.h
+++ b/kformula/kformula_doc.h
@@ -53,7 +53,7 @@ class KFormulaDoc : public KoDocument
 
 public:
 
-    KFormulaDoc(TQWidget *tqparentWidget = 0,
+    KFormulaDoc(TQWidget *parentWidget = 0,
                 const char *widgetName = 0,
                 TQObject* tqparent = 0,
                 const char* name = 0,
@@ -62,7 +62,7 @@ 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* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
     virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false);
     virtual bool showEmbedInitDialog(TQWidget* tqparent);
     virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc
index 2f26fefc..de1a17b0 100644
--- a/kformula/kformula_factory.cc
+++ b/kformula/kformula_factory.cc
@@ -41,11 +41,11 @@ KFormulaFactory::~KFormulaFactory()
   s_global = 0L;
 }
 
-KParts::Part* KFormulaFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KFormulaFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
   bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-  KFormulaDoc *doc = new KFormulaDoc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+  KFormulaDoc *doc = new KFormulaDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
   if ( !bWantKoDocument )
     doc->setReadWrite( false );
diff --git a/kformula/kformula_factory.h b/kformula/kformula_factory.h
index 61f4fc99..5e7979e0 100644
--- a/kformula/kformula_factory.h
+++ b/kformula/kformula_factory.h
@@ -16,7 +16,7 @@ public:
     KFormulaFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KFormulaFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 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 *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index cf0327ab..f30b256e 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 *tqparentWidget, const char* widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-: KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+KivioDoc::KivioDoc( TQWidget *parentWidget, const char* widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+: KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
 {
   dcop = 0;
   if (!s_docs)
@@ -172,7 +172,7 @@ TQPtrList<KivioDoc>& KivioDoc::documents()
   return *s_docs;
 }
 
-bool KivioDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KivioDoc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
   KivioPage *t = createPage();
   m_pMap->addPage( t );
@@ -196,7 +196,7 @@ bool KivioDoc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
   }
 
   ret = KoTemplateChooseDia::choose( KivioFactory::global(), f,
-                                     dlgtype, "kivio_template", tqparentWidget );
+                                     dlgtype, "kivio_template", parentWidget );
 
   if( ret == KoTemplateChooseDia::File ) {
     KURL url(f);
@@ -305,9 +305,9 @@ bool KivioDoc::saveOasis(KoStore* store, KoXmlWriter* manifestWriter)
     KoGenStyles styles;
 
     KoGenStyle pageLayout = Kivio::Config::defaultPageLayout().saveOasis();
-    TQString tqlayoutName = styles.lookup(pageLayout, "PL");
+    TQString layoutName = styles.lookup(pageLayout, "PL");
     KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
-    masterPage.addAttribute("style:page-tqlayout-name", tqlayoutName);
+    masterPage.addAttribute("style:page-tqlayout-name", layoutName);
     styles.lookup(masterPage, "Standard", false);
 
     if(!store->open("content.xml")) {
diff --git a/kivio/kiviopart/kivio_doc.h b/kivio/kiviopart/kivio_doc.h
index 441e8376..496a5fa8 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 *tqparentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KivioDoc( TQWidget *parentWidget = 0, const char* widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
     ~KivioDoc();
 
     virtual DCOPObject* dcopObject();
@@ -79,7 +79,7 @@ class KIVIO_EXPORT KivioDoc : public KoDocument
     virtual bool loadXML( TQIODevice *, const TQDomDocument& doc );
     virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
 
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
     virtual TQCString mimeType() const { return MIME_TYPE; }
 
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index 39a367ab..9badd432 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -43,11 +43,11 @@ KivioFactory::~KivioFactory()
   s_global = 0L;
 }
 
-KParts::Part* KivioFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KivioFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
   bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-  KivioDoc *doc = new KivioDoc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+  KivioDoc *doc = new KivioDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
   if ( !bWantKoDocument )
     doc->setReadWrite( false );
diff --git a/kivio/kiviopart/kivio_factory.h b/kivio/kiviopart/kivio_factory.h
index 1883be87..4fe5ed1a 100644
--- a/kivio/kiviopart/kivio_factory.h
+++ b/kivio/kiviopart/kivio_factory.h
@@ -31,7 +31,7 @@ public:
   KivioFactory( TQObject* tqparent = 0, const char* name = 0 );
   ~KivioFactory();
 
-  virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 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 *tqparent = 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_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 4a8fd51b..6e799f93 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -154,8 +154,8 @@ TQDomElement KivioPage::save( TQDomDocument& doc )
     page.setAttribute( "hide", (int)m_bPageHide );
 
     // Create a child element for the page tqlayout
-    TQDomElement tqlayoutE = saveLayout( doc );
-    page.appendChild( tqlayoutE );
+    TQDomElement layoutE = saveLayout( doc );
+    page.appendChild( layoutE );
 
     // Save guides
     TQDomElement guidesElement = doc.createElement("GuidesLayout");
@@ -191,10 +191,10 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle
     docWriter->addAttribute("draw:master-page-name", "Standard");
   } else {
     KoGenStyle pageLayout = m_pPageLayout.saveOasis();
-    TQString tqlayoutName = styles->lookup(pageLayout, "PL");
+    TQString layoutName = styles->lookup(pageLayout, "PL");
 
     KoGenStyle masterPage(KoGenStyle::STYLE_MASTER);
-    masterPage.addAttribute("style:page-tqlayout-name", tqlayoutName);
+    masterPage.addAttribute("style:page-tqlayout-name", layoutName);
     TQString masterName = styles->lookup(masterPage, "MP");
 
     docWriter->addAttribute("draw:master-page-name", masterName);
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 7d050b86..d38690d9 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -257,7 +257,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
   TQWidget::setFocusPolicy( TQ_StrongFocus );
   setFocusProxy( m_pCanvas );
 
-  connect( TQT_TQOBJECT(this), TQT_SIGNAL( tqinvalidated() ), m_pCanvas, TQT_SLOT( update() ) );
+  connect( TQT_TQOBJECT(this), TQT_SIGNAL( invalidated() ), m_pCanvas, TQT_SLOT( update() ) );
   connect( TQT_TQOBJECT(this), TQT_SIGNAL( regionInvalidated( const TQRegion&, bool ) ), m_pCanvas, TQT_SLOT( tqrepaint( const TQRegion&, bool ) ) );
 
   setInstance(KivioFactory::global());
diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui
index 80041d21..27f8c3b3 100644
--- a/kivio/kiviopart/ui/aligndialog.ui
+++ b/kivio/kiviopart/ui/aligndialog.ui
@@ -28,7 +28,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <widget class="TQWidget">
                 <property name="name">
@@ -48,7 +48,7 @@
                         <property name="title">
                             <string>Horizontal</string>
                         </property>
-                        <property name="tqlayoutMargin" stdset="0">
+                        <property name="layoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -224,7 +224,7 @@
                         <property name="title">
                             <string>Vertical</string>
                         </property>
-                        <property name="tqlayoutMargin" stdset="0">
+                        <property name="layoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -347,9 +347,9 @@
                         <property name="title">
                             <string></string>
                         </property>
-                        <property name="tqlayoutMargin" stdset="0">
+                        <property name="layoutMargin" stdset="0">
                         </property>
-                        <property name="tqlayoutSpacing" stdset="0">
+                        <property name="layoutSpacing" stdset="0">
                         </property>
                         <vbox>
                             <property name="name">
@@ -389,7 +389,7 @@
                         <property name="title">
                             <string>Vertical</string>
                         </property>
-                        <property name="tqlayoutMargin" stdset="0">
+                        <property name="layoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -485,7 +485,7 @@
                         <property name="title">
                             <string>Horizontal</string>
                         </property>
-                        <property name="tqlayoutMargin" stdset="0">
+                        <property name="layoutMargin" stdset="0">
                         </property>
                         <grid>
                             <property name="name">
@@ -627,6 +627,6 @@
      <include location="global" impldecl="in implementation">kdialog.h</include>
  </includes>
 
- <tqlayoutdefaults spacing="6" margin="11"/>
- <tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+ <layoutdefaults spacing="6" margin="11"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kivio/kiviopart/ui/export_page_dialog_base.ui b/kivio/kiviopart/ui/export_page_dialog_base.ui
index 0935d1bf..bc993ed8 100644
--- a/kivio/kiviopart/ui/export_page_dialog_base.ui
+++ b/kivio/kiviopart/ui/export_page_dialog_base.ui
@@ -170,6 +170,6 @@ Places a blank border around the edges of the image. This can be used if for one
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
index 5ede3845..8b2cf4c0 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui
@@ -20,9 +20,9 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -104,5 +104,5 @@
     <slot>zoomPlus()</slot>
 </Q_SLOTS>
 <pixmapfunction>BarIcon</pixmapfunction>
-<tqlayoutdefaults spacing="2" margin="0"/>
+<layoutdefaults spacing="2" margin="0"/>
 </UI>
diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
index f6e73ae8..0438d261 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui
@@ -12,9 +12,9 @@
             <height>268</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -92,7 +92,7 @@
     <slot access="protected">itemClicked(TQListViewItem*,const QPoint&amp;,int)</slot>
     <slot access="protected">updateButtons(TQListViewItem*)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktoolbar.h</includehint>
 </includehints>
diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
index 19bd2a6e..55fe9888 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui
+++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui
@@ -124,5 +124,5 @@
     <tabstop>m_checkYPosition</tabstop>
     <tabstop>m_checkDeletion</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="2" margin="0"/>
+<layoutdefaults spacing="2" margin="0"/>
 </UI>
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index f6950f13..136b7deb 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -111,14 +111,14 @@ void KivioOptionsDialog::initPage()
   m_unitCombo->insertStringList(KoUnit::listOfUnitName());
   m_unitCombo->setCurrentItem(unit);
   unitLbl->setBuddy(m_unitCombo);
-  TQLabel* tqlayoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
+  TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page);
   m_layoutTxtLbl = new TQLabel(page);
   m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken);
   m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy(
     TQSizePolicy::Minimum, TQSizePolicy::Fixed));
   setLayoutText(m_layout);
-  KPushButton* tqlayoutBtn = new KPushButton(i18n("Change..."), page);
-  tqlayoutBtn->tqsetSizePolicy(TQSizePolicy(
+  KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page);
+  layoutBtn->tqsetSizePolicy(TQSizePolicy(
     TQSizePolicy::Fixed, TQSizePolicy::Fixed));
   TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page);
   m_fontTxtLbl = new TQLabel(page);
@@ -127,7 +127,7 @@ void KivioOptionsDialog::initPage()
     TQSizePolicy::Minimum, TQSizePolicy::Fixed));
   setFontText(m_font);
   KPushButton* fontBtn = new KPushButton(i18n("Change..."), page);
-  tqlayoutBtn->tqsetSizePolicy(TQSizePolicy(
+  layoutBtn->tqsetSizePolicy(TQSizePolicy(
     TQSizePolicy::Fixed, TQSizePolicy::Fixed));
   m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page);
   m_marginsChBox->setChecked(view->isShowPageMargins());
@@ -138,9 +138,9 @@ void KivioOptionsDialog::initPage()
   gl->setSpacing(KDialog::spacingHint());
   gl->addWidget(unitLbl, 0, 0);
   gl->addMultiCellWidget(m_unitCombo, 0, 0, 1, 2);
-  gl->addWidget(tqlayoutLbl, 1, 0);
+  gl->addWidget(layoutLbl, 1, 0);
   gl->addWidget(m_layoutTxtLbl, 1, 1);
-  gl->addWidget(tqlayoutBtn, 1, 2);
+  gl->addWidget(layoutBtn, 1, 2);
   gl->addWidget(fontLbl, 2, 0);
   gl->addWidget(m_fontTxtLbl, 2, 1);
   gl->addWidget(fontBtn, 2, 2);
@@ -148,7 +148,7 @@ void KivioOptionsDialog::initPage()
   gl->addMultiCellWidget(m_rulersChBox, 4, 4, 0, 2);
   gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2);
 
-  connect(tqlayoutBtn, TQT_SIGNAL(clicked()), TQT_SLOT(pageLayoutDlg()));
+  connect(layoutBtn, TQT_SIGNAL(clicked()), TQT_SLOT(pageLayoutDlg()));
   connect(fontBtn, TQT_SIGNAL(clicked()), TQT_SLOT(fontDlg()));
   connect(m_unitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(unitChanged(int)));
 }
diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
index 63467798..48de8cc4 100644
--- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui
+++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui
@@ -157,8 +157,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
index 1042746f..cfa2f317 100644
--- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
+++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui
@@ -243,8 +243,8 @@ You should have received a copy of the GNU General Public License along with thi
     <tabstop>m_fontSizeCombo</tabstop>
     <tabstop>m_textColorButton</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp
index 83e8d18d..d8d5550f 100644
--- a/koshell/iconsidepane.cpp
+++ b/koshell/iconsidepane.cpp
@@ -298,7 +298,7 @@ void Navigator::calculateMinWidth()
       mMinWidth = item->width( this );
   }
   //kdDebug() << "minWidth:" << mMinWidth << endl;
-  tqparentWidget()->setFixedWidth( mMinWidth );
+  parentWidget()->setFixedWidth( mMinWidth );
   triggerUpdate(true);
 }
 
@@ -308,7 +308,7 @@ int Navigator::insertItem(const TQString &_text, const TQString & _pix)
   if (item->width( this ) > mSidePane->minWidth() )
   {
     mMinWidth = item->width( this );
-    tqparentWidget()->setMinimumWidth( mMinWidth );
+    parentWidget()->setMinimumWidth( mMinWidth );
     //kdDebug() << "minWidth:" << mMinWidth << endl;
   }
   return item->id();
diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc
index 21af38c7..1f1743af 100644
--- a/kounavail/kounavail.cc
+++ b/kounavail/kounavail.cc
@@ -30,8 +30,8 @@
 #include <kglobalsettings.h>
 #include <tqapplication.h>
 
-KoUnavailPart::KoUnavailPart( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name )
-    : KoDocument( tqparentWidget, widgetName, tqparent, name, false /*singleViewMode*/ )
+KoUnavailPart::KoUnavailPart( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name )
+    : KoDocument( parentWidget, widgetName, tqparent, name, false /*singleViewMode*/ )
 {
     setReadWrite( false );
 }
@@ -144,9 +144,9 @@ KoUnavailFactory::~KoUnavailFactory()
     s_global = 0L;
 }
 
-KParts::Part* KoUnavailFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char*, const TQStringList & )
+KParts::Part* KoUnavailFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char*, const TQStringList & )
 {
-    return new KoUnavailPart( tqparentWidget, widgetName, tqparent, name );
+    return new KoUnavailPart( parentWidget, widgetName, tqparent, name );
 }
 
 KAboutData* KoUnavailFactory::aboutData()
diff --git a/kounavail/kounavail.h b/kounavail/kounavail.h
index 1dbe522d..41d2f77f 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 *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0 );
+    KoUnavailPart( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0 );
 
     virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 );
 
@@ -96,7 +96,7 @@ public:
     KoUnavailFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KoUnavailFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 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 *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui
index 71e08516..e76a6129 100644
--- a/kplato/kptaccountspanelbase.ui
+++ b/kplato/kptaccountspanelbase.ui
@@ -123,7 +123,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kplato/kptaccountsviewconfigurepanelbase.ui b/kplato/kptaccountsviewconfigurepanelbase.ui
index 97c097b3..61e55316 100644
--- a/kplato/kptaccountsviewconfigurepanelbase.ui
+++ b/kplato/kptaccountsviewconfigurepanelbase.ui
@@ -61,7 +61,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdatewidget.h</includehint>
 </includehints>
diff --git a/kplato/kptcalendar.h b/kplato/kptcalendar.h
index b5a7c1cc..6607ea67 100644
--- a/kplato/kptcalendar.h
+++ b/kplato/kptcalendar.h
@@ -239,17 +239,17 @@ public:
     const TQPtrList<CalendarDay> &days() const { return m_days; }
     
     /**
-     * Returns the state of definition for tqparents day date in it.
-     * Also checks the tqparents recursively.
+     * Returns the state of definition for parents day date in it.
+     * Also checks the parents recursively.
      */
-    int tqparentDayState(const TQDate &date) const;
+    int parentDayState(const TQDate &date) const;
     
     IntMap weekdaysMap() { return m_weekdays->map(); }
     void setWeekday(IntMap::iterator it, int state) { m_weekdays->setWeekday(it, state); }
     CalendarWeekdays *weekdays() { return m_weekdays; }
     CalendarDay *weekday(int day) const { return m_weekdays->weekday(day); }
 
-    TQString tqparentId() const { return m_parentId; }
+    TQString parentId() const { return m_parentId; }
     void setParentId(TQString id) { m_parentId = id; }
 
     bool hasParent(Calendar *cal);
diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui
index 32ef8452..04f86757 100644
--- a/kplato/kptcalendarlistpanel.ui
+++ b/kplato/kptcalendarlistpanel.ui
@@ -122,7 +122,7 @@
     <tabstop>bDelete</tabstop>
     <tabstop>baseCalendar</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc
index 95bf6888..bb3ab2ea 100644
--- a/kplato/kptcanvasitem.cc
+++ b/kplato/kptcanvasitem.cc
@@ -298,15 +298,15 @@ void PertRelationItem::draw()
 	hgap = m_view->horizontalGap();
 
 	// could not use ...rect() here, don't know why
-	tqparentTop = (int)(m_parentItem->y());
-	tqparentBottom = tqparentTop + (int)(m_parentItem->height());
+	parentTop = (int)(m_parentItem->y());
+	parentBottom = parentTop + (int)(m_parentItem->height());
 	childTop = (int)(m_childItem->y());
 
 	childRow = m_childItem->row();
 	childCol =  m_childItem->column();
-	tqparentRow = m_parentItem->row();
-	tqparentCol =  m_parentItem->column();
-    //kdDebug()<<k_funcinfo<<"Parent="<<m_parentItem->node().name()<<" ("<<tqparentRow<<","<<tqparentCol<<") Child="<<m_childItem->node().name()<<" ("<<childRow<<","<<childCol<<")"<<endl;
+	parentRow = m_parentItem->row();
+	parentCol =  m_parentItem->column();
+    //kdDebug()<<k_funcinfo<<"Parent="<<m_parentItem->node().name()<<" ("<<parentRow<<","<<parentCol<<") Child="<<m_childItem->node().name()<<" ("<<childRow<<","<<childCol<<")"<<endl;
 
 	switch (type())
 	{
@@ -347,76 +347,76 @@ void PertRelationItem::draw()
 
 void PertRelationItem::setFinishStartPoints()
 {
-	TQPoint tqparentPoint = m_parentItem->exitPoint(Relation::FinishStart);
+	TQPoint parentPoint = m_parentItem->exitPoint(Relation::FinishStart);
 	TQPoint childPoint = m_childItem->entryPoint(Relation::FinishStart);
 
 	TQPointArray a;
-	a.putPoints(0, 1, tqparentPoint.x(), tqparentPoint.y());
+	a.putPoints(0, 1, parentPoint.x(), parentPoint.y());
 
-	if ( tqparentRow == childRow )
+	if ( parentRow == childRow )
 	{
-	    if (tqparentCol == childCol - 1 || rowFree(tqparentRow, tqparentCol+1, childCol-1))
+	    if (parentCol == childCol - 1 || rowFree(parentRow, parentCol+1, childCol-1))
 		{
         	a.putPoints(1, 1, childPoint.x(), childPoint.y());
 		}
 		else // go around below
 		{
     	    a.putPoints(1, 9,
-			        tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),                // stop short
-			        tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3,                // right/down
-					tqparentPoint.x()+(wgap/2), tqparentBottom+(hgap/2)-3,  // stop short
-    	            tqparentPoint.x()+(wgap/2)+3, tqparentBottom+(hgap/2),  // right/down
-    	            childPoint.x()-(wgap/2)-3, tqparentBottom+(hgap/2),      // stop short
-    	            childPoint.x()-(wgap/2), tqparentBottom+(hgap/2)-3,      // right/up
+			        parentPoint.x()+(wgap/2)-3, parentPoint.y(),                // stop short
+			        parentPoint.x()+(wgap/2), parentPoint.y()+3,                // right/down
+					parentPoint.x()+(wgap/2), parentBottom+(hgap/2)-3,  // stop short
+    	            parentPoint.x()+(wgap/2)+3, parentBottom+(hgap/2),  // right/down
+    	            childPoint.x()-(wgap/2)-3, parentBottom+(hgap/2),      // stop short
+    	            childPoint.x()-(wgap/2), parentBottom+(hgap/2)-3,      // right/up
     	            childPoint.x()-(wgap/2), childPoint.y()+3,                      // stop short
     	            childPoint.x()-(wgap/2)+3, childPoint.y(),                      // right/up
     	            childPoint.x(), childPoint.y());
 		}
 	}
-	else if ( tqparentRow > childRow )
+	else if ( parentRow > childRow )
 	{
-	    if (tqparentCol == childCol - 1)
+	    if (parentCol == childCol - 1)
 		{
             a.putPoints(1, 5,
-			        tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-			        tqparentPoint.x()+(wgap/2), tqparentPoint.y()-3,
-                    tqparentPoint.x()+wgap/2, childPoint.y()+3,
-    	            tqparentPoint.x()+(wgap/2)+3, childPoint.y(),
+			        parentPoint.x()+(wgap/2)-3, parentPoint.y(),
+			        parentPoint.x()+(wgap/2), parentPoint.y()-3,
+                    parentPoint.x()+wgap/2, childPoint.y()+3,
+    	            parentPoint.x()+(wgap/2)+3, childPoint.y(),
                     childPoint.x(), childPoint.y());
 		}
 		else // go around above
 		{
             a.putPoints(1, 9,
-			        tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-                    tqparentPoint.x()+(wgap/2), tqparentPoint.y()-3,
-                    tqparentPoint.x()+wgap/2, tqparentTop-(hgap/2)+3,
-                    tqparentPoint.x()+(wgap/2)+3, tqparentTop-(hgap/2),
-                    childPoint.x()-(wgap/2)-3, tqparentTop-hgap/2,
-                    childPoint.x()-(wgap/2), tqparentTop-(hgap/2)-3,
+			        parentPoint.x()+(wgap/2)-3, parentPoint.y(),
+                    parentPoint.x()+(wgap/2), parentPoint.y()-3,
+                    parentPoint.x()+wgap/2, parentTop-(hgap/2)+3,
+                    parentPoint.x()+(wgap/2)+3, parentTop-(hgap/2),
+                    childPoint.x()-(wgap/2)-3, parentTop-hgap/2,
+                    childPoint.x()-(wgap/2), parentTop-(hgap/2)-3,
                     childPoint.x()-wgap/2, childPoint.y()+3,
 				    childPoint.x()-(wgap/2)+3, childPoint.y(),
     	            childPoint.x(), childPoint.y());
 		}
 	}
-	else if ( tqparentRow < childRow )
+	else if ( parentRow < childRow )
 	{
-	    if (tqparentCol == childCol - 1)
+	    if (parentCol == childCol - 1)
 		{
 		    a.putPoints(1, 5,
-			        tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-			        tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3,
-		            tqparentPoint.x()+wgap/2, childPoint.y()-3,
-    	            tqparentPoint.x()+(wgap/2)+3, childPoint.y(),
+			        parentPoint.x()+(wgap/2)-3, parentPoint.y(),
+			        parentPoint.x()+(wgap/2), parentPoint.y()+3,
+		            parentPoint.x()+wgap/2, childPoint.y()-3,
+    	            parentPoint.x()+(wgap/2)+3, childPoint.y(),
     	            childPoint.x(), childPoint.y());
 
 	    }
 		else
 		{
 	        a.putPoints(1, 9,
-			        tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-			        tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3,
-					tqparentPoint.x()+wgap/2, childTop-(hgap/2)-3,
-					tqparentPoint.x()+(wgap/2)+3, childTop-(hgap/2),
+			        parentPoint.x()+(wgap/2)-3, parentPoint.y(),
+			        parentPoint.x()+(wgap/2), parentPoint.y()+3,
+					parentPoint.x()+wgap/2, childTop-(hgap/2)-3,
+					parentPoint.x()+(wgap/2)+3, childTop-(hgap/2),
 	                childPoint.x()-(wgap/2)-3, childTop-(hgap/2),
 	                childPoint.x()-(wgap/2), childTop-(hgap/2)+3,
 	                childPoint.x()-wgap/2, childPoint.y()-3,
@@ -430,64 +430,64 @@ void PertRelationItem::setFinishStartPoints()
 void PertRelationItem::setFinishFinishPoints()
 {
     //kdDebug()<<k_funcinfo<<endl;
-	TQPoint tqparentPoint = m_parentItem->exitPoint(Relation::FinishFinish);
+	TQPoint parentPoint = m_parentItem->exitPoint(Relation::FinishFinish);
 	TQPoint childPoint = m_childItem->entryPoint(Relation::FinishFinish);
 
 	TQPointArray a;
-	a.putPoints(0, 1, tqparentPoint.x(), tqparentPoint.y());
+	a.putPoints(0, 1, parentPoint.x(), parentPoint.y());
 
 
-    if ( tqparentRow >= childRow )
+    if ( parentRow >= childRow )
 	{
-	    if (tqparentCol == childCol)
+	    if (parentCol == childCol)
 		{
 		    a.putPoints(1, 5,
-			        childPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-			        childPoint.x()+(wgap/2), tqparentPoint.y()-3,
+			        childPoint.x()+(wgap/2)-3, parentPoint.y(),
+			        childPoint.x()+(wgap/2), parentPoint.y()-3,
 		            childPoint.x()+wgap/2, childPoint.y()+3,
     	            childPoint.x()+(wgap/2)-3, childPoint.y(),
     	            childPoint.x(), childPoint.y());
 		}
-		else if (tqparentCol < childCol)
+		else if (parentCol < childCol)
 		{
 			a.putPoints(1, 9,
-					tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),                // stop short
-					tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3,                // right/down
-					tqparentPoint.x()+(wgap/2), tqparentBottom+(hgap/2)-3,  // stop short
-					tqparentPoint.x()+(wgap/2)+3, tqparentBottom+(hgap/2),  // right/down
-					childPoint.x()+(wgap/2)-3, tqparentBottom+(hgap/2),      // stop short
-					childPoint.x()+(wgap/2), tqparentBottom+(hgap/2)-3,      // right/up
+					parentPoint.x()+(wgap/2)-3, parentPoint.y(),                // stop short
+					parentPoint.x()+(wgap/2), parentPoint.y()+3,                // right/down
+					parentPoint.x()+(wgap/2), parentBottom+(hgap/2)-3,  // stop short
+					parentPoint.x()+(wgap/2)+3, parentBottom+(hgap/2),  // right/down
+					childPoint.x()+(wgap/2)-3, parentBottom+(hgap/2),      // stop short
+					childPoint.x()+(wgap/2), parentBottom+(hgap/2)-3,      // right/up
 					childPoint.x()+(wgap/2), childPoint.y()+3,                      // stop short
 					childPoint.x()+(wgap/2)-3, childPoint.y(),                      // left/up
 					childPoint.x(), childPoint.y());
 		}
 	}
-	else // tqparentRow < choldRow
+	else // parentRow < choldRow
 	{
-	    if (tqparentCol == childCol)
+	    if (parentCol == childCol)
 		{
 		    a.putPoints(1, 5,
-			        tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-			        tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3,
-		            tqparentPoint.x()+wgap/2, childPoint.y()-3,
-    	            tqparentPoint.x()+(wgap/2)-3, childPoint.y(),
+			        parentPoint.x()+(wgap/2)-3, parentPoint.y(),
+			        parentPoint.x()+(wgap/2), parentPoint.y()+3,
+		            parentPoint.x()+wgap/2, childPoint.y()-3,
+    	            parentPoint.x()+(wgap/2)-3, childPoint.y(),
     	            childPoint.x(), childPoint.y());
 		}
-		else if (tqparentCol < childCol)
+		else if (parentCol < childCol)
 		{
-		    if (rowFree(tqparentRow, tqparentCol+1, childCol))
+		    if (rowFree(parentRow, parentCol+1, childCol))
 				a.putPoints(1, 5,
-						childPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-						childPoint.x()+(wgap/2), tqparentPoint.y()+3,
+						childPoint.x()+(wgap/2)-3, parentPoint.y(),
+						childPoint.x()+(wgap/2), parentPoint.y()+3,
 						childPoint.x()+(wgap/2), childPoint.y()-3,
 						childPoint.x()+(wgap/2)-3, childPoint.y(),
 						childPoint.x(), childPoint.y());
 			else
 				a.putPoints(1, 9,
-						tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-						tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3,
-						tqparentPoint.x()+wgap/2, childTop-(hgap/2)-3,
-						tqparentPoint.x()+(wgap/2)+3, childTop-(hgap/2),
+						parentPoint.x()+(wgap/2)-3, parentPoint.y(),
+						parentPoint.x()+(wgap/2), parentPoint.y()+3,
+						parentPoint.x()+wgap/2, childTop-(hgap/2)-3,
+						parentPoint.x()+(wgap/2)+3, childTop-(hgap/2),
 						childPoint.x()+(wgap/2)-3, childTop-(hgap/2),
 						childPoint.x()+(wgap/2), childTop-(hgap/2)+3,
 						childPoint.x()+(wgap/2), childPoint.y()-3,
@@ -497,10 +497,10 @@ void PertRelationItem::setFinishFinishPoints()
 		else
 		{
 	        a.putPoints(1, 9,
-			        tqparentPoint.x()+(wgap/2)-3, tqparentPoint.y(),
-			        tqparentPoint.x()+(wgap/2), tqparentPoint.y()+3,
-					tqparentPoint.x()+wgap/2, childTop-(hgap/2)-3,
-					tqparentPoint.x()+(wgap/2)+3, childTop-(hgap/2),
+			        parentPoint.x()+(wgap/2)-3, parentPoint.y(),
+			        parentPoint.x()+(wgap/2), parentPoint.y()+3,
+					parentPoint.x()+wgap/2, childTop-(hgap/2)-3,
+					parentPoint.x()+(wgap/2)+3, childTop-(hgap/2),
 	                childPoint.x()+(wgap/2)-3, childTop-(hgap/2),
 	                childPoint.x()+(wgap/2), childTop-(hgap/2)+3,
 	                childPoint.x()+wgap/2, childPoint.y()-3,
@@ -514,31 +514,31 @@ void PertRelationItem::setFinishFinishPoints()
 void PertRelationItem::setStartStartPoints()
 {
     //kdDebug()<<k_funcinfo<<endl;
-	TQPoint tqparentPoint = m_parentItem->exitPoint(Relation::StartStart);
+	TQPoint parentPoint = m_parentItem->exitPoint(Relation::StartStart);
 	TQPoint childPoint = m_childItem->entryPoint(Relation::StartStart);
 
 	TQPointArray a;
-	a.putPoints(0, 1, tqparentPoint.x(), tqparentPoint.y());
+	a.putPoints(0, 1, parentPoint.x(), parentPoint.y());
 
-    if ( tqparentRow > childRow )
+    if ( parentRow > childRow )
 	{
-	    if (tqparentCol == childCol) // go up
+	    if (parentCol == childCol) // go up
 		{
     		a.putPoints(1, 4,
-			    tqparentPoint.x()-(wgap/2)+3, tqparentPoint.y(),
-				tqparentPoint.x()-(wgap/2), tqparentPoint.y()-3,
-				tqparentPoint.x()-(wgap/2), childPoint.y()+3,
-    		    tqparentPoint.x()-(wgap/2)+3, childPoint.y());
+			    parentPoint.x()-(wgap/2)+3, parentPoint.y(),
+				parentPoint.x()-(wgap/2), parentPoint.y()-3,
+				parentPoint.x()-(wgap/2), childPoint.y()+3,
+    		    parentPoint.x()-(wgap/2)+3, childPoint.y());
 		}
 		else // go above myself
 		{
     		a.putPoints(1, 8,
-			    tqparentPoint.x()-(wgap/2)+3, tqparentPoint.y(),
-			    tqparentPoint.x()-(wgap/2), tqparentPoint.y()-3,
-    		    tqparentPoint.x()-(wgap/2), tqparentTop-(hgap/2)+3,
-    		    tqparentPoint.x()-(wgap/2)+3, tqparentTop-(hgap/2),
-    		    childPoint.x()-(wgap/2)-3, tqparentTop-(hgap/2),
-    		    childPoint.x()-(wgap/2), tqparentTop-(hgap/2)-3,
+			    parentPoint.x()-(wgap/2)+3, parentPoint.y(),
+			    parentPoint.x()-(wgap/2), parentPoint.y()-3,
+    		    parentPoint.x()-(wgap/2), parentTop-(hgap/2)+3,
+    		    parentPoint.x()-(wgap/2)+3, parentTop-(hgap/2),
+    		    childPoint.x()-(wgap/2)-3, parentTop-(hgap/2),
+    		    childPoint.x()-(wgap/2), parentTop-(hgap/2)-3,
     		    childPoint.x()-(wgap/2), childPoint.y()+3,
     		    childPoint.x()-(wgap/2)+3, childPoint.y());
 		}
@@ -546,32 +546,32 @@ void PertRelationItem::setStartStartPoints()
 	else // go left/down
 	{
 		a.putPoints(1, 2,
-		    tqparentPoint.x()-(wgap/2)+3, tqparentPoint.y(),
-		    tqparentPoint.x()-(wgap/2), tqparentPoint.y()+3);
+		    parentPoint.x()-(wgap/2)+3, parentPoint.y(),
+		    parentPoint.x()-(wgap/2), parentPoint.y()+3);
 
-	    if (tqparentCol == childCol)
+	    if (parentCol == childCol)
 		{
 		    a.putPoints(3, 2,
-			    tqparentPoint.x()-(wgap/2), childPoint.y()-3,
-		        tqparentPoint.x()-(wgap/2)+3, childPoint.y());
+			    parentPoint.x()-(wgap/2), childPoint.y()-3,
+		        parentPoint.x()-(wgap/2)+3, childPoint.y());
 		}
 		else // go below myself
 		{
-            if (tqparentRow == childRow) // go up
+            if (parentRow == childRow) // go up
 			{
 				a.putPoints(3, 6,
-					tqparentPoint.x()-(wgap/2), tqparentBottom+hgap/2-3,
-					tqparentPoint.x()-(wgap/2)+3, tqparentBottom+hgap/2,
-					childPoint.x()-(wgap/2)-3, tqparentBottom+hgap/2,
-				    childPoint.x()-(wgap/2), tqparentBottom+hgap/2-3,
+					parentPoint.x()-(wgap/2), parentBottom+hgap/2-3,
+					parentPoint.x()-(wgap/2)+3, parentBottom+hgap/2,
+					childPoint.x()-(wgap/2)-3, parentBottom+hgap/2,
+				    childPoint.x()-(wgap/2), parentBottom+hgap/2-3,
 				    childPoint.x()-(wgap/2), childPoint.y()+3,
 				    childPoint.x()-(wgap/2)+3, childPoint.y());
 			}
 			else // go down
 			{
 				a.putPoints(3, 6,
-					tqparentPoint.x()-(wgap/2), childTop-(hgap/2)-3,
-					tqparentPoint.x()-(wgap/2)+3, childTop-hgap/2,
+					parentPoint.x()-(wgap/2), childTop-(hgap/2)-3,
+					parentPoint.x()-(wgap/2)+3, childTop-hgap/2,
 					childPoint.x()-(wgap/2)-3, childTop-hgap/2,
 				    childPoint.x()-(wgap/2), childTop-(hgap/2)+3,
 				    childPoint.x()-(wgap/2), childPoint.y()-3,
diff --git a/kplato/kptcanvasitem.h b/kplato/kptcanvasitem.h
index 81d0dc0f..3ce3ec96 100644
--- a/kplato/kptcanvasitem.h
+++ b/kplato/kptcanvasitem.h
@@ -191,14 +191,14 @@ private:
     PertNodeItem *m_childItem;
 	int left, top, right, bottom;
 
-	int tqparentTop;
-	int tqparentBottom;
+	int parentTop;
+	int parentBottom;
 	int childTop;
 
 	int childRow;
 	int childCol;
-	int tqparentRow;
-	int tqparentCol;
+	int parentRow;
+	int parentCol;
 
 	int wgap;
 	int hgap;
diff --git a/kplato/kptconfigbehaviorpanelbase.ui b/kplato/kptconfigbehaviorpanelbase.ui
index 007e4c0d..eb329c71 100644
--- a/kplato/kptconfigbehaviorpanelbase.ui
+++ b/kplato/kptconfigbehaviorpanelbase.ui
@@ -98,5 +98,5 @@
 <Q_SLOTS>
     <slot>slotChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kplato/kptconfigtaskpanelbase.ui b/kplato/kptconfigtaskpanelbase.ui
index e972c5c1..31e07542 100644
--- a/kplato/kptconfigtaskpanelbase.ui
+++ b/kplato/kptconfigtaskpanelbase.ui
@@ -348,7 +348,7 @@ The estimation can be either effort based or duration based. If it is effort bas
     <tabstop>pessimisticValue</tabstop>
     <tabstop>descriptionfield</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kplato/kptdurationwidget.ui b/kplato/kptdurationwidget.ui
index 19273780..d87befbb 100644
--- a/kplato/kptdurationwidget.ui
+++ b/kplato/kptdurationwidget.ui
@@ -416,5 +416,5 @@
     <function access="private" specifier="non virtual" returnType="double">power( double m, int e )</function>
     <function access="private" specifier="non virtual" returnType="double">fraction( TQString number, int * exp )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc
index 4c31ef79..0828ec03 100644
--- a/kplato/kptfactory.cc
+++ b/kplato/kptfactory.cc
@@ -48,7 +48,7 @@ Factory::~Factory()
     s_global = 0L;
 }
 
-KParts::Part *Factory::createPartObject(TQWidget *tqparentWidget,
+KParts::Part *Factory::createPartObject(TQWidget *parentWidget,
 					   const char *widgetName,
 					   TQObject* tqparent, const char* name,
 					   const char* classname,
@@ -59,9 +59,9 @@ KParts::Part *Factory::createPartObject(TQWidget *tqparentWidget,
     // and single view.
     bool bWantKoDocument = (strcmp(classname, "KoDocument") == 0);
 
-    // tqparentWidget and widgetName are used by KoDocument for the
+    // parentWidget and widgetName are used by KoDocument for the
     // "readonly+singleView" case.
-    Part *part = new Part(tqparentWidget, widgetName, tqparent, name,
+    Part *part = new Part(parentWidget, widgetName, tqparent, name,
 				!bWantKoDocument);
 
     if (!bWantKoDocument)
diff --git a/kplato/kptfactory.h b/kplato/kptfactory.h
index a8126835..8a8022af 100644
--- a/kplato/kptfactory.h
+++ b/kplato/kptfactory.h
@@ -35,7 +35,7 @@ public:
     Factory( TQObject* tqparent = 0, const char* name = 0 );
     ~Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 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 *tqparent = 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 1e32a092..37695320 100644
--- a/kplato/kptganttview.cc
+++ b/kplato/kptganttview.cc
@@ -239,7 +239,7 @@ void GanttView::drawOnPainter(TQPainter* painter, const TQRect rect)
 //        m_taskView->setSizes(sizes);
 //    }
 //    else
-//        kdWarning() << "Aptqparently the task view splitter contains less than 2 parts!" << endl;
+//        kdWarning() << "Apparently the task view splitter contains less than 2 parts!" << endl;
 
 //    bool showlistview = m_gantt->showListView();
 //    int listviewwidth = m_gantt->listViewWidth();
@@ -401,10 +401,10 @@ KDGanttViewItem *GanttView::correctParent(KDGanttViewItem *item, Node *node)
     return newItem;
 }
 
-void GanttView::updateChildren(Node *tqparentNode)
+void GanttView::updateChildren(Node *parentNode)
 {
     //kdDebug()<<k_funcinfo<<endl;
-    TQPtrListIterator<Node> nit(tqparentNode->childNodeIterator());
+    TQPtrListIterator<Node> nit(parentNode->childNodeIterator());
     for (; nit.current(); ++nit )
     {
         updateNode(nit.current());
@@ -728,33 +728,33 @@ void GanttView::modifyMilestone(KDGanttViewItem *item, Task *task)
     setDrawn(item, true);
 }
 
-KDGanttViewItem *GanttView::addNode( KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after)
+KDGanttViewItem *GanttView::addNode( KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after)
 {
     //kdDebug()<<k_funcinfo<<endl;
     if (node->type() == Node::Type_Project) {
-        return addProject(tqparentItem, node, after);
+        return addProject(parentItem, node, after);
     }
     if (node->type() == Node::Type_Subproject) {
-        return addSubProject(tqparentItem, node, after);
+        return addSubProject(parentItem, node, after);
     }
     if (node->type() == Node::Type_Summarytask) {
-        return addSummaryTask(tqparentItem, static_cast<Task *>(node), after);
+        return addSummaryTask(parentItem, static_cast<Task *>(node), after);
     }
     if (node->type() == Node::Type_Task) {
-        return addTask(tqparentItem, static_cast<Task *>(node), after);
+        return addTask(parentItem, static_cast<Task *>(node), after);
     }
     if (node->type() == Node::Type_Milestone) {
-        return addMilestone(tqparentItem, static_cast<Task *>(node), after);
+        return addMilestone(parentItem, static_cast<Task *>(node), after);
     }
     return 0;
 }
 
-KDGanttViewItem *GanttView::addProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after)
+KDGanttViewItem *GanttView::addProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after)
 {
     //kdDebug()<<k_funcinfo<<endl;
     GanttViewSummaryItem *item;
-    if ( tqparentItem) {
-        item = new GanttViewSummaryItem(tqparentItem, node);
+    if ( parentItem) {
+        item = new GanttViewSummaryItem(parentItem, node);
     } else {
         // we are on the top level
         item = new GanttViewSummaryItem(m_gantt, node);
@@ -765,19 +765,19 @@ KDGanttViewItem *GanttView::addProject(KDGanttViewItem *tqparentItem, Node *node
     return item;
 }
 
-KDGanttViewItem *GanttView::addSubProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after)
+KDGanttViewItem *GanttView::addSubProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after)
 {
     //kdDebug()<<k_funcinfo<<endl;    
-    return addProject(tqparentItem, node, after);
+    return addProject(parentItem, node, after);
 }
 
-KDGanttViewItem *GanttView::addSummaryTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after)
+KDGanttViewItem *GanttView::addSummaryTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after)
 {
     //kdDebug()<<k_funcinfo<<endl;
     // display summary item
     GanttViewSummaryItem *item;
-    if ( tqparentItem) {
-        item = new GanttViewSummaryItem(tqparentItem, task);
+    if ( parentItem) {
+        item = new GanttViewSummaryItem(parentItem, task);
     } else {
         // we are on the top level
         item = new GanttViewSummaryItem(m_gantt, task);
@@ -788,13 +788,13 @@ KDGanttViewItem *GanttView::addSummaryTask(KDGanttViewItem *tqparentItem, Task *
     return item;
 }
 
-KDGanttViewItem *GanttView::addTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after)
+KDGanttViewItem *GanttView::addTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after)
 {
     //kdDebug()<<k_funcinfo<<endl;
     // display task item
     GanttViewTaskItem *item;
-    if ( tqparentItem ) {
-        item = new GanttViewTaskItem(tqparentItem, task);
+    if ( parentItem ) {
+        item = new GanttViewTaskItem(parentItem, task);
     }
     else {
         // we are on the top level
@@ -806,12 +806,12 @@ KDGanttViewItem *GanttView::addTask(KDGanttViewItem *tqparentItem, Task *task, K
     return item;
 }
 
-KDGanttViewItem *GanttView::addMilestone(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after)
+KDGanttViewItem *GanttView::addMilestone(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after)
 {
     //kdDebug()<<k_funcinfo<<endl;
     GanttViewEventItem *item;
-    if ( tqparentItem ) {
-        item = new GanttViewEventItem(tqparentItem, task);
+    if ( parentItem ) {
+        item = new GanttViewEventItem(parentItem, task);
     } else {
         // we are on the top level
         item = new GanttViewEventItem(m_gantt, task);
@@ -822,26 +822,26 @@ KDGanttViewItem *GanttView::addMilestone(KDGanttViewItem *tqparentItem, Task *ta
     return item;
 }
 
-void GanttView::drawChildren(KDGanttViewItem *tqparentItem, Node &tqparentNode)
+void GanttView::drawChildren(KDGanttViewItem *parentItem, Node &parentNode)
 {
     //kdDebug()<<k_funcinfo<<endl;
-	TQPtrListIterator<Node> nit(tqparentNode.childNodeIterator());
+	TQPtrListIterator<Node> nit(parentNode.childNodeIterator());
 	for ( nit.toLast(); nit.current(); --nit )
 	{
 		Node *n = nit.current();
 		if (n->type() == Node::Type_Project)
-	        drawProject(tqparentItem, n);
+	        drawProject(parentItem, n);
 		else if (n->type() == Node::Type_Subproject)
-		    drawSubProject(tqparentItem, n);
+		    drawSubProject(parentItem, n);
 		else if (n->type() == Node::Type_Summarytask) {
             Task *t = dynamic_cast<Task *>(n);
-		    drawSummaryTask(tqparentItem, t);
+		    drawSummaryTask(parentItem, t);
 		} else if (n->type() == Node::Type_Task) {
             Task *t = dynamic_cast<Task *>(n);
-		    drawTask(tqparentItem, t);
+		    drawTask(parentItem, t);
         } else if (n->type() == Node::Type_Milestone) {
             Task *t = dynamic_cast<Task *>(n);
-			drawMilestone(tqparentItem, t);
+			drawMilestone(parentItem, t);
         }
 		else
 		    kdDebug()<<k_funcinfo<<"Node type "<<n->type()<<" not implemented yet"<<endl;
@@ -850,37 +850,37 @@ void GanttView::drawChildren(KDGanttViewItem *tqparentItem, Node &tqparentNode)
 }
 
 
-void GanttView::drawProject(KDGanttViewItem *tqparentItem, Node *node)
+void GanttView::drawProject(KDGanttViewItem *parentItem, Node *node)
 {
     //kdDebug()<<k_funcinfo<<endl;
-    GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addProject(tqparentItem, node));
+    GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addProject(parentItem, node));
     drawChildren(item, *node);
 }
 
-void GanttView::drawSubProject(KDGanttViewItem *tqparentItem, Node *node)
+void GanttView::drawSubProject(KDGanttViewItem *parentItem, Node *node)
 {
     //kdDebug()<<k_funcinfo<<endl;
-    GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSubProject(tqparentItem, node));
+    GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSubProject(parentItem, node));
     drawChildren(item, *node);
 }
 
-void GanttView::drawSummaryTask(KDGanttViewItem *tqparentItem, Task *task)
+void GanttView::drawSummaryTask(KDGanttViewItem *parentItem, Task *task)
 {
     //kdDebug()<<k_funcinfo<<endl;
-    GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSummaryTask(tqparentItem, task));
+    GanttViewSummaryItem *item = dynamic_cast<GanttViewSummaryItem*>(addSummaryTask(parentItem, task));
     drawChildren(item, *task);
 }
 
-void GanttView::drawTask(KDGanttViewItem *tqparentItem, Task *task)
+void GanttView::drawTask(KDGanttViewItem *parentItem, Task *task)
 {
     //kdDebug()<<k_funcinfo<<endl;
-    addTask(tqparentItem, task);
+    addTask(parentItem, task);
 }
 
-void GanttView::drawMilestone(KDGanttViewItem *tqparentItem, Task *task)
+void GanttView::drawMilestone(KDGanttViewItem *parentItem, Task *task)
 {
     //kdDebug()<<k_funcinfo<<endl;
-    addMilestone(tqparentItem, task);
+    addMilestone(parentItem, task);
 }
 
 void GanttView::addTaskLink(KDGanttViewTaskLink *link) {
diff --git a/kplato/kptganttview.h b/kplato/kptganttview.h
index b6d0b8a4..42f1ac1d 100644
--- a/kplato/kptganttview.h
+++ b/kplato/kptganttview.h
@@ -163,20 +163,20 @@ private:
     void modifyTask(KDGanttViewItem *item, Task *task);
     void modifyMilestone(KDGanttViewItem *item, Task *task);
     
-    KDGanttViewItem *addNode(KDGanttViewItem *tqparentItem, Node *node,KDGanttViewItem *after=0);
+    KDGanttViewItem *addNode(KDGanttViewItem *parentItem, Node *node,KDGanttViewItem *after=0);
     
-    KDGanttViewItem *addProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after=0);
-    KDGanttViewItem *addSubProject(KDGanttViewItem *tqparentItem, Node *node, KDGanttViewItem *after=0);
-    KDGanttViewItem *addSummaryTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after=0);
-    KDGanttViewItem *addTask(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after=0);
-    KDGanttViewItem *addMilestone(KDGanttViewItem *tqparentItem, Task *task, KDGanttViewItem *after=0);
+    KDGanttViewItem *addProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after=0);
+    KDGanttViewItem *addSubProject(KDGanttViewItem *parentItem, Node *node, KDGanttViewItem *after=0);
+    KDGanttViewItem *addSummaryTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after=0);
+    KDGanttViewItem *addTask(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after=0);
+    KDGanttViewItem *addMilestone(KDGanttViewItem *parentItem, Task *task, KDGanttViewItem *after=0);
     
     void drawChildren(KDGanttViewItem *item, Node &node);
-    void drawProject(KDGanttViewItem *tqparentItem, Node *node);
-    void drawSubProject(KDGanttViewItem *tqparentItem, Node *node);
-    void drawSummaryTask(KDGanttViewItem *tqparentItem, Task *task);
-    void drawTask(KDGanttViewItem *tqparentItem, Task *task);
-    void drawMilestone(KDGanttViewItem *tqparentItem, Task *task);
+    void drawProject(KDGanttViewItem *parentItem, Node *node);
+    void drawSubProject(KDGanttViewItem *parentItem, Node *node);
+    void drawSummaryTask(KDGanttViewItem *parentItem, Task *task);
+    void drawTask(KDGanttViewItem *parentItem, Task *task);
+    void drawMilestone(KDGanttViewItem *parentItem, Task *task);
 
     void drawRelations();
     void drawRelations(KDGanttViewItem *item);
diff --git a/kplato/kptintervaleditbase.ui b/kplato/kptintervaleditbase.ui
index 78580d56..76b00dc4 100644
--- a/kplato/kptintervaleditbase.ui
+++ b/kplato/kptintervaleditbase.ui
@@ -120,5 +120,5 @@
     <tabstop>bAddInterval</tabstop>
     <tabstop>intervalList</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kplato/kptmainprojectpanelbase.ui b/kplato/kptmainprojectpanelbase.ui
index 712f691d..f6622781 100644
--- a/kplato/kptmainprojectpanelbase.ui
+++ b/kplato/kptmainprojectpanelbase.ui
@@ -275,7 +275,7 @@ Here you can enter any additional text you want to be stored with the project. T
     <tabstop>descriptionfield</tabstop>
     <tabstop>idfield</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kplato/kptmilestoneprogresspanelbase.ui b/kplato/kptmilestoneprogresspanelbase.ui
index 27e295d0..97a06f4d 100644
--- a/kplato/kptmilestoneprogresspanelbase.ui
+++ b/kplato/kptmilestoneprogresspanelbase.ui
@@ -54,7 +54,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdatetimewidget.h</includehint>
     <includehint>kdatewidget.h</includehint>
diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc
index 48135a71..e8c25312 100644
--- a/kplato/kptnode.cc
+++ b/kplato/kptnode.cc
@@ -964,7 +964,7 @@ void Node::printDebug(bool tqchildren, TQCString indent) {
     kdDebug()<<indent<<"  Level: "<<level()<<endl;
     kdDebug()<<indent<<"  No of predecessors: "<<m_dependParentNodes.count()<<endl;
     TQPtrListIterator<Relation> pit(m_dependParentNodes);
-    //kdDebug()<<indent<<"  Dependant tqparents="<<pit.count()<<endl;
+    //kdDebug()<<indent<<"  Dependant parents="<<pit.count()<<endl;
     if (pit.count() > 0) {
         for ( ; pit.current(); ++pit ) {
             pit.current()->printDebug(indent);
diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc
index 459f0854..f3075f37 100644
--- a/kplato/kptpart.cc
+++ b/kplato/kptpart.cc
@@ -48,11 +48,11 @@
 namespace KPlato
 {
 
-Part::Part(TQWidget *tqparentWidget, const char *widgetName,
+Part::Part(TQWidget *parentWidget, const char *widgetName,
 		 TQObject *tqparent, const char *name, bool singleViewMode)
-    : KoDocument(tqparentWidget, widgetName, tqparent, name, singleViewMode),
-      m_project(0), m_projectDialog(0), m_parentWidget(tqparentWidget), m_view(0),
-      m_embeddedGanttView(new GanttView(tqparentWidget)),
+    : KoDocument(parentWidget, widgetName, tqparent, 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),
       m_context(0), m_xmlLoader()
 {
@@ -90,7 +90,7 @@ Part::~Part() {
 }
 
 
-bool Part::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) {
+bool Part::initDoc(InitDocFlags flags, TQWidget* parentWidget) {
     bool result = true;
 
     if (flags==KoDocument::InitDocEmpty)
@@ -113,7 +113,7 @@ bool Part::initDoc(InitDocFlags flags, TQWidget* tqparentWidget) {
     ret = KoTemplateChooseDia::choose(Factory::global(), templateDoc,
                                       dlgtype,
                                       "kplato_template",
-                                      tqparentWidget);
+                                      parentWidget);
     if (ret == KoTemplateChooseDia::Template) {
         resetURL();
         result = loadNativeFormat(templateDoc);
diff --git a/kplato/kptpart.h b/kplato/kptpart.h
index 6aafea3e..25ba542e 100644
--- a/kplato/kptpart.h
+++ b/kplato/kptpart.h
@@ -49,7 +49,7 @@ class Part : public KoDocument, public KoTextZoomHandler {
   TQ_OBJECT
 
 public:
-    Part(TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+    Part(TQWidget *parentWidget = 0, const char *widgetName = 0,
 	    TQObject* tqparent = 0, const char* name = 0,
 	    bool singleViewMode = false);
     ~Part();
@@ -58,7 +58,7 @@ public:
 			      bool transparent = FALSE,
 			      double zoomX = 1.0, double zoomY = 1.0);
 
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
     /**
      * Edit the settings of the project
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index 910ec600..198d4593 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -125,23 +125,23 @@ PertNodeItem *PertCanvas::createNodeItem(Node *node)
     return item;
 }
 
-void PertCanvas::createChildItems(PertNodeItem *tqparentItem)
+void PertCanvas::createChildItems(PertNodeItem *parentItem)
 {
-    //kdDebug()<<k_funcinfo<<"tqparentItem="<<(tqparentItem ? tqparentItem->node().name() : "nil")<<endl;
-    if (!tqparentItem)
+    //kdDebug()<<k_funcinfo<<"parentItem="<<(parentItem ? parentItem->node().name() : "nil")<<endl;
+    if (!parentItem)
         return;
 
-    TQPtrListIterator<Relation> it(tqparentItem->node().dependChildNodes());
+    TQPtrListIterator<Relation> it(parentItem->node().dependChildNodes());
     for (; it.current(); ++it)
     {
         PertNodeItem *childItem = createNodeItem(it.current()->child());
         if (childItem)
-            tqparentItem->addChildRelation(it.current(), childItem);
+            parentItem->addChildRelation(it.current(), childItem);
             m_relations.append(it.current());
     }
 
     // Now my tqchildren
-	TQPtrListIterator<Node> nit(tqparentItem->node().childNodeIterator());
+	TQPtrListIterator<Node> nit(parentItem->node().childNodeIterator());
     for ( ; nit.current(); ++nit ) {
         createChildItems(createNodeItem(nit.current()));
 	}
@@ -153,11 +153,11 @@ void PertCanvas::drawRelations()
     TQPtrListIterator<Relation> it(m_relations);
     for (; it.current(); ++it)
     {
-        PertNodeItem *tqparentItem = m_nodes.tqfind(it.current()->tqparent());
+        PertNodeItem *parentItem = m_nodes.tqfind(it.current()->tqparent());
         PertNodeItem *childItem = m_nodes.tqfind(it.current()->child());
-        if (tqparentItem && childItem)
+        if (parentItem && childItem)
         {
-            PertRelationItem *item = new PertRelationItem(this, tqparentItem, childItem, it.current());
+            PertRelationItem *item = new PertRelationItem(this, parentItem, childItem, it.current());
             item->show();
         }
     }
@@ -174,20 +174,20 @@ void PertCanvas::mapNode(PertNodeItem *item)
     m_rows.at(item->row())->at(item->column()) = true;
 }
 
-void PertCanvas::mapChildNode(PertNodeItem *tqparentItem, PertNodeItem *childItem, Relation::Type type)
+void PertCanvas::mapChildNode(PertNodeItem *parentItem, PertNodeItem *childItem, Relation::Type type)
 {
-	//kdDebug()<<k_funcinfo<<"Parent: "<<tqparentItem->node().name()<<" to child: "<<(childItem ? childItem->node().name() : "None")<<endl;
+	//kdDebug()<<k_funcinfo<<"Parent: "<<parentItem->node().name()<<" to child: "<<(childItem ? childItem->node().name() : "None")<<endl;
     if (!childItem)
     {   // shouldn't happen...
         kdError()<<k_funcinfo<<"No childItem"<<endl;
         return;
     }
-    int row = tqparentItem->row();
-    int col = tqparentItem->column();
+    int row = parentItem->row();
+    int col = parentItem->column();
     int chRow = childItem->row();
     int chCol = childItem->column();
     bool chMapped = (chRow > -1 && chCol > -1);
-	//kdDebug()<<k_funcinfo<<"Parent: "<<tqparentItem->node().name()<<" at ("<<row<<","<<col<<"): Moving "<<childItem->node().name()<<" from: "<<chRow<<","<<chCol<<endl;
+	//kdDebug()<<k_funcinfo<<"Parent: "<<parentItem->node().name()<<" at ("<<row<<","<<col<<"): Moving "<<childItem->node().name()<<" from: "<<chRow<<","<<chCol<<endl;
 
     if (type == Relation::StartStart ||
         type == Relation::FinishFinish)
diff --git a/kplato/kptpertcanvas.h b/kplato/kptpertcanvas.h
index 19f0408a..437bb6fa 100644
--- a/kplato/kptpertcanvas.h
+++ b/kplato/kptpertcanvas.h
@@ -59,7 +59,7 @@ public:
     void setColumn(int row, int col) { m_rows.at(row)[col] = true; }
 
     void mapNode(PertNodeItem *item);
-    void mapChildNode(PertNodeItem *tqparentItem, PertNodeItem *childItem, Relation::Type type);
+    void mapChildNode(PertNodeItem *parentItem, PertNodeItem *childItem, Relation::Type type);
     
     Node *selectedNode();
 
diff --git a/kplato/kptproject.cc b/kplato/kptproject.cc
index 85992dcf..3a15ce2f 100644
--- a/kplato/kptproject.cc
+++ b/kplato/kptproject.cc
@@ -440,11 +440,11 @@ bool Project::load(TQDomElement &element) {
     // calendars references calendars in arbritary saved order
     TQPtrListIterator<Calendar> calit(m_calendars);
     for (; calit.current(); ++calit) {
-        if (calit.current()->id() == calit.current()->tqparentId()) {
+        if (calit.current()->id() == calit.current()->parentId()) {
             kdError()<<k_funcinfo<<"Calendar want itself as tqparent"<<endl;
             continue;
         }
-        calit.current()->setParent(calendar(calit.current()->tqparentId()));
+        calit.current()->setParent(calendar(calit.current()->parentId()));
     }
     //kdDebug()<<k_funcinfo<<"Project schedules--->"<<endl;
     TQIntDictIterator<Schedule> it = m_schedules;
@@ -569,18 +569,18 @@ bool Project::addTask( Node* task, Node* position )
 	}
 	// find the position
 	// we have to tell the tqparent that we want to delete one of its tqchildren
-	Node* tqparentNode = position->getParent();
-	if ( !tqparentNode ) {
+	Node* parentNode = position->getParent();
+	if ( !parentNode ) {
 		kdDebug()<<k_funcinfo<<"tqparent node not found???"<<endl;
 		return false;
 	}
-	int index = tqparentNode->findChildNode( position );
+	int index = parentNode->findChildNode( position );
 	if ( -1 == index ) {
 		// ok, it does not exist
 		kdDebug()<<k_funcinfo<<"Task not found???"<<endl;
 		return false;
 	}
-	return addSubTask(task, index+1, tqparentNode);
+	return addSubTask(task, index+1, parentNode);
 }
 
 bool Project::addSubTask( Node* task, Node* position )
@@ -637,11 +637,11 @@ bool Project::canIndentTask(Node* node)
         return false;
     }
     // we have to find the tqparent of task to manipulate its list of tqchildren
-    Node* tqparentNode = node->getParent();
-    if ( !tqparentNode ) {
+    Node* parentNode = node->getParent();
+    if ( !parentNode ) {
         return false;
     }
-    if (tqparentNode->findChildNode(node) == -1) {
+    if (parentNode->findChildNode(node) == -1) {
         kdError()<<k_funcinfo<<"Tasknot found???"<<endl;
         return false;
     }
@@ -681,16 +681,16 @@ bool Project::canUnindentTask( Node* node )
     }
     // we have to find the tqparent of task to manipulate its list of tqchildren
     // and we need the tqparent's tqparent too
-    Node* tqparentNode = node->getParent();
-    if ( !tqparentNode ) {
+    Node* parentNode = node->getParent();
+    if ( !parentNode ) {
         return false;
     }
-    Node* grandParentNode = tqparentNode->getParent();
+    Node* grandParentNode = parentNode->getParent();
     if ( !grandParentNode ) {
         //kdDebug()<<k_funcinfo<<"This node already is at the top level"<<endl;
         return false;
     }
-    int index = tqparentNode->findChildNode( node );
+    int index = parentNode->findChildNode( node );
     if ( -1 == index ) {
         kdError()<<k_funcinfo<<"Tasknot found???"<<endl;
         return false;
@@ -701,10 +701,10 @@ bool Project::canUnindentTask( Node* node )
 bool Project::unindentTask( Node* node )
 {
     if (canUnindentTask(node)) {
-        Node *tqparentNode = node->getParent();
-        Node *grandParentNode = tqparentNode->getParent();
-        tqparentNode->delChildNode(node, false/*do not delete objekt*/);
-        grandParentNode->addChildNode(node,tqparentNode);
+        Node *parentNode = node->getParent();
+        Node *grandParentNode = parentNode->getParent();
+        parentNode->delChildNode(node, false/*do not delete objekt*/);
+        grandParentNode->addChildNode(node,parentNode);
         return true;
     }
     return false;
@@ -715,12 +715,12 @@ 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
-    Node* tqparentNode = node->getParent();
-    if (!tqparentNode) {
+    Node* parentNode = node->getParent();
+    if (!parentNode) {
         //kdDebug()<<k_funcinfo<<"No tqparent found"<<endl;
         return false;
     }
-    if (tqparentNode->findChildNode(node) == -1) {
+    if (parentNode->findChildNode(node) == -1) {
         kdError()<<k_funcinfo<<"Tasknot found???"<<endl;
         return false;
     }
@@ -743,11 +743,11 @@ 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
-    Node* tqparentNode = node->getParent();
-    if (!tqparentNode) {
+    Node* parentNode = node->getParent();
+    if (!parentNode) {
         return false;
     }
-    if (tqparentNode->findChildNode(node) == -1) {
+    if (parentNode->findChildNode(node) == -1) {
         kdError()<<k_funcinfo<<"Tasknot found???"<<endl;
         return false;
     }
@@ -987,7 +987,7 @@ void Project::setStandardWorktime(StandardWorktime * worktime) {
 }
 
 bool Project::legalToLink(Node *par, Node *child) {
-    //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" tqparents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<endl;
+    //kdDebug()<<k_funcinfo<<par.name()<<" ("<<par.numDependParentNodes()<<" parents) "<<child.name()<<" ("<<child.numDependChildNodes()<<" tqchildren)"<<endl;
     
     if (!child || par->isDependChildOf(child)) {
         return false;
@@ -1007,7 +1007,7 @@ bool Project::legalToLink(Node *par, Node *child) {
 
 bool Project::legalParents(Node *par, Node *child) {
     bool legal = true;
-    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" tqparents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl;
+    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl;
     for (int i=0; i < par->numDependParentNodes() && legal; ++i) {
         Node *pNode = par->getDependParentNode(i)->tqparent();
         if (child->isParentOf(pNode) || pNode->isParentOf(child)) {
@@ -1024,7 +1024,7 @@ bool Project::legalParents(Node *par, Node *child) {
 
 bool Project::legalChildren(Node *par, Node *child) {
     bool legal = true;
-    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" tqparents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl;
+    //kdDebug()<<k_funcinfo<<par->name()<<" ("<<par->numDependParentNodes()<<" parents) "<<child->name()<<" ("<<child->numDependChildNodes()<<" tqchildren)"<<endl;
     for (int j=0; j < child->numDependChildNodes() && legal; ++j) {
         Node *cNode = child->getDependChildNode(j)->child();
         if (par->isParentOf(cNode) || cNode->isParentOf(par)) {
diff --git a/kplato/kptprojectdialogbase.ui b/kplato/kptprojectdialogbase.ui
index 4bffc0e2..2dab71fe 100644
--- a/kplato/kptprojectdialogbase.ui
+++ b/kplato/kptprojectdialogbase.ui
@@ -252,7 +252,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdatepicker.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kplato/kptsummarytaskgeneralpanelbase.ui b/kplato/kptsummarytaskgeneralpanelbase.ui
index 715770c6..57dd2654 100644
--- a/kplato/kptsummarytaskgeneralpanelbase.ui
+++ b/kplato/kptsummarytaskgeneralpanelbase.ui
@@ -240,7 +240,7 @@ This is not limited to persons available in a resource group but can be anyone.
     <tabstop>idfield</tabstop>
     <tabstop>wbsfield</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>ktextedit.h</includehint>
diff --git a/kplato/kpttask.cc b/kplato/kpttask.cc
index f4b29f79..7b00740b 100644
--- a/kplato/kpttask.cc
+++ b/kplato/kpttask.cc
@@ -893,7 +893,7 @@ DateTime Task::scheduleForward(const DateTime &earliest, int use) {
         cs->startTime = time;
         //kdDebug()<<k_funcinfo<<m_name<<" new startime="<<cs->startTime<<endl;
     }
-    // Then my tqparents
+    // Then my parents
     time = schedulePredeccessors(m_parentProxyRelations, use);
     if (time.isValid() && time > cs->startTime) {
         cs->startTime = time;
@@ -1087,7 +1087,7 @@ DateTime Task::scheduleBackward(const DateTime &latest, int use) {
     if (time.isValid() && time < cs->endTime) {
         cs->endTime = time;
     }
-    // Then my tqparents
+    // Then my parents
     time = scheduleSuccessors(m_childProxyRelations, use);
     if (time.isValid() && time < cs->endTime) {
         cs->endTime = time;
diff --git a/kplato/kpttaskcostpanelbase.ui b/kplato/kpttaskcostpanelbase.ui
index cc5c6e08..38250f2b 100644
--- a/kplato/kpttaskcostpanelbase.ui
+++ b/kplato/kpttaskcostpanelbase.ui
@@ -223,7 +223,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kplato/kpttaskgeneralpanelbase.ui b/kplato/kpttaskgeneralpanelbase.ui
index 2d047b50..1d153a02 100644
--- a/kplato/kpttaskgeneralpanelbase.ui
+++ b/kplato/kpttaskgeneralpanelbase.ui
@@ -537,7 +537,7 @@ The estimation can be either effort based or duration based. If it is effort bas
     <tabstop>idfield</tabstop>
     <tabstop>wbsfield</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kplato/kpttasknotespanelbase.ui b/kplato/kpttasknotespanelbase.ui
index ea543d1e..90f413ff 100644
--- a/kplato/kpttasknotespanelbase.ui
+++ b/kplato/kpttasknotespanelbase.ui
@@ -47,5 +47,5 @@
 <Q_SLOTS>
     <slot>scheduling_clicked( int schedulingType )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kplato/kpttaskprogresspanelbase.ui b/kplato/kpttaskprogresspanelbase.ui
index 1acf3556..00d23dda 100644
--- a/kplato/kpttaskprogresspanelbase.ui
+++ b/kplato/kpttaskprogresspanelbase.ui
@@ -411,7 +411,7 @@
     <tabstop>finishTime</tabstop>
     <tabstop>startTime</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdatetimewidget.h</includehint>
     <includehint>kdatewidget.h</includehint>
diff --git a/kplato/kpttaskresourcespanelbase.ui b/kplato/kpttaskresourcespanelbase.ui
index 5183181c..dfa3b818 100644
--- a/kplato/kpttaskresourcespanelbase.ui
+++ b/kplato/kpttaskresourcespanelbase.ui
@@ -107,5 +107,5 @@
 <includes>
     <include location="local" impldecl="in implementation">kpttaskresourcespanelbase.ui.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kplato/kptwbsdefinitionpanelbase.ui b/kplato/kptwbsdefinitionpanelbase.ui
index 5180c73b..4656ce4e 100644
--- a/kplato/kptwbsdefinitionpanelbase.ui
+++ b/kplato/kptwbsdefinitionpanelbase.ui
@@ -181,5 +181,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kplato/relationpanel.ui b/kplato/relationpanel.ui
index 73d3c491..409a52f9 100644
--- a/kplato/relationpanel.ui
+++ b/kplato/relationpanel.ui
@@ -277,7 +277,7 @@
         <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kptdurationwidget.h</includehint>
 </includehints>
diff --git a/kplato/resourcedialogbase.ui b/kplato/resourcedialogbase.ui
index ecf68c35..8107e9ac 100644
--- a/kplato/resourcedialogbase.ui
+++ b/kplato/resourcedialogbase.ui
@@ -385,7 +385,7 @@
     <tabstop>rateEdit</tabstop>
     <tabstop>overtimeEdit</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdatetimewidget.h</includehint>
     <includehint>kdatewidget.h</includehint>
diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui
index e169b156..8428e29c 100644
--- a/kplato/resourcespanelbase.ui
+++ b/kplato/resourcespanelbase.ui
@@ -188,7 +188,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui
index 4119f46f..61f4fddb 100644
--- a/kplato/standardworktimedialogbase.ui
+++ b/kplato/standardworktimedialogbase.ui
@@ -281,7 +281,7 @@ when there is no calendar defined for a resource.</string>
     <tabstop>month</tabstop>
     <tabstop>week</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 88f0fd3a..0b33a507 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 *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name,
+KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name,
                               bool singleViewMode )
-    : KoDocument( tqparentWidget,widgetName, tqparent, name, singleViewMode ),
+    : KoDocument( parentWidget,widgetName, tqparent, name, singleViewMode ),
       _gradientCollection(), m_customListTest( 0L ),
       m_childCountBeforeInsert( 0 )
 {
@@ -3297,7 +3297,7 @@ void KPrDocument::updateHeaderFooterPosition( )
     tqrepaint(_footer);
 }
 
-bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
 
     if (flags==KoDocument::InitDocEmpty)
@@ -3323,7 +3323,7 @@ bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
             dlgtype = KoTemplateChooseDia::OnlyTemplates;
 
     ret = KoTemplateChooseDia::choose( KPrFactory::global(), file,
-                                       dlgtype, "kpresenter_template", tqparentWidget );
+                                       dlgtype, "kpresenter_template", parentWidget );
     if ( ret == KoTemplateChooseDia::Template ) {
         _clean = true; //was a parameter called "clean", but unused
         bool ok = loadNativeFormat( file );
@@ -3605,12 +3605,12 @@ TQString KPrDocument::templateFileName( bool chooseTemplate, const TQString &the
         else
             fileName = theFile;
     } else {
-        // TODO: pass tqparentWidget as parameter to this method
-        TQWidget* tqparentWidget = 0;
+        // TODO: pass parentWidget as parameter to this method
+        TQWidget* parentWidget = 0;
         TQString _template;
         if ( KoTemplateChooseDia::choose( KPrFactory::global(), _template,
                                           KoTemplateChooseDia::OnlyTemplates,
-                                          "kpresenter_template", tqparentWidget ) == KoTemplateChooseDia::Cancel )
+                                          "kpresenter_template", parentWidget ) == KoTemplateChooseDia::Cancel )
             return TQString();
         TQFileInfo fileInfo( _template );
         fileName = fileInfo.dirPath( true ) + "/" + fileInfo.baseName() + ".kpt";
@@ -4410,11 +4410,11 @@ void KPrDocument::applyStyleChange( KoStyleChangeDefMap changed )
     m_masterPage->applyStyleChange( changed );
 }
 
-void KPrDocument::saveStyle( KoParagStyle *sty, TQDomElement tqparentElem )
+void KPrDocument::saveStyle( KoParagStyle *sty, TQDomElement parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement styleElem = doc.createElement( "STYLE" );
-    tqparentElem.appendChild( styleElem );
+    parentElem.appendChild( styleElem );
 
     sty->saveStyle( styleElem );
     TQDomElement formatElem = doc.createElement("FORMAT");
diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h
index 749b7441..c472c3a3 100644
--- a/kpresenter/KPrDocument.h
+++ b/kpresenter/KPrDocument.h
@@ -128,7 +128,7 @@ class KPrDocument : public KoDocument
 
   public:
     // constructor - destructor
-    KPrDocument( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* doc = 0,
+    KPrDocument( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* doc = 0,
                    const char* name = 0, bool singleViewMode = false );
     ~KPrDocument();
 
@@ -160,7 +160,7 @@ class KPrDocument : public KoDocument
 
     virtual int supportedSpecialFormats() const;
 
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
     virtual void setEmpty();
 
     virtual void addView( KoView *_view );
@@ -557,7 +557,7 @@ protected:
     virtual bool saveChildren( KoStore* _store );
 
     void loadStyleTemplates( const TQDomElement &styles );
-    void saveStyle( KoParagStyle *sty, TQDomElement tqparentElem );
+    void saveStyle( KoParagStyle *sty, TQDomElement parentElem );
 
     TQDomDocumentFragment saveBackground( TQDomDocument& );
     TQDomElement saveObjects( TQDomDocument &doc );
diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp
index 96f71348..076c1ce8 100644
--- a/kpresenter/KPrFactory.cpp
+++ b/kpresenter/KPrFactory.cpp
@@ -43,12 +43,12 @@ KPrFactory::~KPrFactory()
     s_global=0;
 }
 
-KParts::Part* KPrFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent,
+KParts::Part* KPrFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent,
                                                    const char* name, const char* classname, const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KPrDocument *doc = new KPrDocument( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    KPrDocument *doc = new KPrDocument( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
         doc->setReadWrite( false );
diff --git a/kpresenter/KPrFactory.h b/kpresenter/KPrFactory.h
index 6735ac15..be83fc84 100644
--- a/kpresenter/KPrFactory.h
+++ b/kpresenter/KPrFactory.h
@@ -32,7 +32,7 @@ public:
     KPrFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KPrFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0,
+    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() );
 
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index 6cbb97a7..6a3f8592 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -86,6 +86,6 @@ int KPrGotoPage::page() const {
 }
 
 void KPrGotoPage::resetCursor() {
-    if ( tqparentWidget() )
-        tqparentWidget()->setCursor( TQt::blankCursor );
+    if ( parentWidget() )
+        parentWidget()->setCursor( TQt::blankCursor );
 }
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 4d1a94c4..c696a8e5 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -970,7 +970,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma
     return format;
 }
 
-KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDocument *doc, bool findStyle)
+KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocument *doc, bool findStyle)
 {
     KoParagLayout tqlayout;
 
@@ -980,7 +980,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDo
         KoParagStyle *style;
         // Name of the style. If there is no style, then we do not supply
         // any default!
-        TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+        TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
         if ( !element.isNull() )
         {
             TQString styleName = element.attribute( "value" );
@@ -1001,7 +1001,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDo
         tqlayout.style = style;
     }
 
-    TQDomElement element = tqparentElem.namedItem( "INDENTS" ).toElement();
+    TQDomElement element = parentElem.namedItem( "INDENTS" ).toElement();
     if ( !element.isNull() )
     {
         double val=0.0;
@@ -1019,7 +1019,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDo
             val=TQMAX(0, element.attribute("right").toDouble());
         tqlayout.margins[TQStyleSheetItem::MarginRight] = val;
     }
-    element = tqparentElem.namedItem( "LINESPACING" ).toElement();
+    element = parentElem.namedItem( "LINESPACING" ).toElement();
     if ( !element.isNull() )
     {
         //compatibility with koffice 1.1
@@ -1073,7 +1073,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDo
         }
     }
 
-    element = tqparentElem.namedItem( "OFFSETS" ).toElement();
+    element = parentElem.namedItem( "OFFSETS" ).toElement();
     if ( !element.isNull() )
     {
         double val =0.0;
@@ -1087,31 +1087,31 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDo
     }
 
 
-    element = tqparentElem.namedItem( "LEFTBORDER" ).toElement();
+    element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.leftBorder = KoBorder::loadBorder( element );
     else
         tqlayout.leftBorder.setPenWidth( 0);
 
-    element = tqparentElem.namedItem( "RIGHTBORDER" ).toElement();
+    element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.rightBorder = KoBorder::loadBorder( element );
     else
         tqlayout.rightBorder.setPenWidth( 0);
 
-    element = tqparentElem.namedItem( "TOPBORDER" ).toElement();
+    element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.topBorder = KoBorder::loadBorder( element );
     else
         tqlayout.topBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "BOTTOMBORDER" ).toElement();
+    element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.bottomBorder = KoBorder::loadBorder( element );
     else
         tqlayout.bottomBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "COUNTER" ).toElement();
+    element = parentElem.namedItem( "COUNTER" ).toElement();
     if ( !element.isNull() )
     {
         tqlayout.counter = new KoParagCounter;
@@ -1119,7 +1119,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDo
     }
 
     KoTabulatorList tabList;
-    element = tqparentElem.firstChild().toElement();
+    element = parentElem.firstChild().toElement();
     for ( ; !element.isNull() ; element = element.nextSibling().toElement() )
     {
         if ( element.tagName() == "TABULATOR" )
@@ -1146,11 +1146,11 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & tqparentElem, KPrDo
     return tqlayout;
 }
 
-void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & tqparentElem )
+void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     if ( tqlayout.style )
         element.setAttribute( "value", tqlayout.style->name() );
     else
@@ -1162,7 +1162,7 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement
          tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
     {
         element = doc.createElement( "INDENTS" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
             element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] );
         if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 )
@@ -1176,7 +1176,7 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement
          tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
     {
         element = doc.createElement( "OFFSETS" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 )
             element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] );
         if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
@@ -1186,7 +1186,7 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement
     if ( tqlayout.lineSpacingType != KoParagLayout::LS_SINGLE )
     {
         element = doc.createElement( "LINESPACING" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )
             element.setAttribute( "type", "oneandhalf" );
         else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE )
@@ -1213,32 +1213,32 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement
     if ( tqlayout.leftBorder.penWidth() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.leftBorder.save( element );
     }
     if ( tqlayout.rightBorder.penWidth() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.rightBorder.save( element );
     }
     if ( tqlayout.topBorder.penWidth() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.topBorder.save( element );
     }
     if ( tqlayout.bottomBorder.penWidth() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.bottomBorder.save( element );
     }
 
     if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE )
     {
         element = doc.createElement( "COUNTER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if (tqlayout.counter )
             tqlayout.counter->save( element );
     }
@@ -1248,7 +1248,7 @@ void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement
     for ( ; it != tabList.end() ; it++ )
     {
         element = doc.createElement( "TABULATOR" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "type", (*it).type );
         element.setAttribute( "ptpos", (*it).ptPos );
         element.setAttribute( "filling", (*it).filling );
@@ -1328,9 +1328,9 @@ void KPrTextObject::drawParags( TQPainter *painter, KoTextZoomHandler* zoomHandl
         if ( !parag->isValid() )
             parag->format();
         if ( i == from )
-            r.setTop( m_doc->zoomHandler()->tqlayoutUnitToPixelY( parag->rect().top() ) );
+            r.setTop( m_doc->zoomHandler()->layoutUnitToPixelY( parag->rect().top() ) );
         if ( i == to ) {
-            r.setBottom( m_doc->zoomHandler()->tqlayoutUnitToPixelY( parag->rect().bottom() ) );
+            r.setBottom( m_doc->zoomHandler()->layoutUnitToPixelY( parag->rect().bottom() ) );
             break;
         }
         ++i;
@@ -1361,11 +1361,11 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV
     TQPoint topLeft = parag->rect().topLeft();         // in TQRT coords
     int lineY;
     // Cursor height, in pixels
-    int cursorHeight = zh->tqlayoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
+    int cursorHeight = zh->layoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
     TQPoint iPoint( topLeft.x() + cursor->x(),
                    topLeft.y() + lineY );
     // from now on, iPoint will be in pixels
-    iPoint = zh->tqlayoutUnitToPixel( iPoint );
+    iPoint = zh->layoutUnitToPixel( iPoint );
 
     TQPoint vPoint = iPoint; // vPoint and iPoint are the same currently
                             // do not simplify this, will be useful with viewmodes.
@@ -1483,7 +1483,7 @@ void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length
         }
         // Now ensure text is fully visible
         TQRect rect = m_doc->zoomHandler()->zoomRect( getRect() );
-        TQRect expose = m_doc->zoomHandler()->tqlayoutUnitToPixel( parag->rect() );
+        TQRect expose = m_doc->zoomHandler()->layoutUnitToPixel( parag->rect() );
         expose.moveBy( rect.x(), rect.y() );
         canvas->ensureVisible( (expose.left()+expose.right()) / 2,  // point = center of the rect
                                (expose.top()+expose.bottom()) / 2,
@@ -1578,7 +1578,7 @@ void KPrTextObject::applyStyleChange( KoStyleChangeDefMap changed )
 void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted, bool* abort)
 {
     recalcVerticalAlignment();
-    int availHeight = availableHeight() - m_doc->zoomHandler()->ptToLayoutUnitPixY(tqalignmentValue());
+    int availHeight = availableHeight() - m_doc->zoomHandler()->ptToLayoutUnitPixY(alignmentValue());
     if ( ( bottom > availHeight ) ||   // this parag is already below the avail height
          ( lastFormatted && (bottom + lastFormatted->rect().height() > availHeight) ) ) // or next parag will be below it
     {
@@ -1601,7 +1601,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted,
         // We only auto-grow. We don't auto-shrink.
         if(difference > 0 && !isProtect())
         {
-            double wantedPosition = m_doc->zoomHandler()->tqlayoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( difference ) )
+            double wantedPosition = m_doc->zoomHandler()->layoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( difference ) )
                                     + getRect().bottom();
             const KoPageLayout& p = m_doc->pageLayout();
             double pageBottom = p.ptHeight - p.ptBottom;
@@ -1611,7 +1611,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted,
             if ( getRect().bottom() != newBottom )
             {
                 // We resize the text object, but skipping the KPrTextObject::setSize code
-                // (which tqinvalidates everything etc.)
+                // (which invalidates everything etc.)
                 KPrObject::setSize( getSize().width(), newBottom - getOrig().y() );
                 // Do recalculate the new available height though
                 slotAvailableHeightNeeded();
@@ -1652,7 +1652,7 @@ KCommand * KPrTextObject::textContentsToHeight()
         }
     }
 
-    double textHeight = m_doc->zoomHandler()->tqlayoutUnitPtToPt( textHeightLU );
+    double textHeight = m_doc->zoomHandler()->layoutUnitPtToPt( textHeightLU );
     double lineSpacing = ( innerHeight() - textHeight ) /  numLines; // this gives the linespacing diff to apply, in pt
     //kdDebug(33001) << k_funcinfo << "lineSpacing=" << lineSpacing << endl;
 
@@ -1681,11 +1681,11 @@ KCommand * KPrTextObject::textObjectToContents()
     KoTextParag * parag = textDocument()->firstParag();
     double txtWidth = 10;
     for ( ; parag ; parag = parag->next() )
-        txtWidth = TQMAX( txtWidth, m_doc->zoomHandler()->tqlayoutUnitPtToPt( parag->widthUsed() ));
+        txtWidth = TQMAX( txtWidth, m_doc->zoomHandler()->layoutUnitPtToPt( parag->widthUsed() ));
 
     // Calculate text height
     int heightLU = textDocument()->height();
-    double txtHeight = m_doc->zoomHandler()->tqlayoutUnitPtToPt( heightLU );
+    double txtHeight = m_doc->zoomHandler()->layoutUnitPtToPt( heightLU );
 
     // Compare with current object's size
     KoSize sizeDiff = KoSize( txtWidth, txtHeight ) - innerRect().size();
@@ -1732,7 +1732,7 @@ void KPrTextObject::setVerticalAligment( VerticalAlignmentType _type)
 
 void KPrTextObject::recalcVerticalAlignment()
 {
-    double txtHeight = m_doc->zoomHandler()->tqlayoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( textDocument()->height() ) ) + btop + bbottom;
+    double txtHeight = m_doc->zoomHandler()->layoutUnitPtToPt( m_doc->zoomHandler()->pixelYToPt( textDocument()->height() ) ) + btop + bbottom;
     double diffy = getSize().height() - txtHeight;
 
     //kdDebug(33001) << k_funcinfo << "txtHeight: " << txtHeight << " rectHeight:" << getSize().height() << " -> diffy=" << diffy << endl;
@@ -1763,9 +1763,9 @@ TQPoint KPrTextObject::cursorPos(KPrCanvas *canvas, KoTextCursor *cursor) const
   TQPoint topLeft = parag->rect().topLeft();         // in TQRT coords
   int lineY = 0;
     // Cursor height, in pixels
-  //int cursorHeight = zh->tqlayoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
+  //int cursorHeight = zh->layoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
   TQPoint iPoint( topLeft.x() + cursor->x(), topLeft.y() + lineY );
-  iPoint = zh->tqlayoutUnitToPixel( iPoint );
+  iPoint = zh->layoutUnitToPixel( iPoint );
   iPoint.rx() -= canvas->diffx();
   iPoint.ry() -= canvas->diffy();
   return origPix+iPoint;
@@ -1943,12 +1943,12 @@ void KPrTextView::ensureCursorVisible()
     int w = 1;
     KPrDocument *doc= m_kptextobj->kPresenterDocument();
     KoPoint pt= kpTextObject()->getOrig();
-    pt.setX( doc->zoomHandler()->tqlayoutUnitPtToPt( doc->zoomHandler()->pixelXToPt( x) ) +pt.x());
-    pt.setY( doc->zoomHandler()->tqlayoutUnitPtToPt( doc->zoomHandler()->pixelYToPt( y ))+pt.y() );
+    pt.setX( doc->zoomHandler()->layoutUnitPtToPt( doc->zoomHandler()->pixelXToPt( x) ) +pt.x());
+    pt.setY( doc->zoomHandler()->layoutUnitPtToPt( doc->zoomHandler()->pixelYToPt( y ))+pt.y() );
 
     TQPoint p = m_kptextobj->kPresenterDocument()->zoomHandler()->zoomPoint( pt );
-    w = m_kptextobj->kPresenterDocument()->zoomHandler()->tqlayoutUnitToPixelX( w );
-    h = m_kptextobj->kPresenterDocument()->zoomHandler()->tqlayoutUnitToPixelY( h );
+    w = m_kptextobj->kPresenterDocument()->zoomHandler()->layoutUnitToPixelX( w );
+    h = m_kptextobj->kPresenterDocument()->zoomHandler()->layoutUnitToPixelY( h );
     m_canvas->ensureVisible( p.x(), p.y() + h / 2, w, h / 2 + 2 );
 }
 
@@ -2515,7 +2515,7 @@ void KPrTextView::dropEvent( TQDropEvent * e )
     }
 }
 
-void KPrTextObject::saveParagraph( TQDomDocument& doc,KoTextParag * parag,TQDomElement &tqparentElem,
+void KPrTextObject::saveParagraph( TQDomDocument& doc,KoTextParag * parag,TQDomElement &parentElem,
                                   int from /* default 0 */,
                                   int to /* default length()-2 */ )
 {
@@ -2566,7 +2566,7 @@ void KPrTextObject::saveParagraph( TQDomDocument& doc,KoTextParag * parag,TQDomE
     else
         paragraph.appendChild(saveHelper(tmpText, parag->string()->at(0).format(), doc));
 
-    tqparentElem.appendChild(paragraph);
+    parentElem.appendChild(paragraph);
 }
 
 KoPen KPrTextObject::defaultPen() const
@@ -2579,7 +2579,7 @@ TQPoint KPrTextObject::viewToInternal( const TQPoint & pos, KPrCanvas* canvas )
     KoTextZoomHandler* zh = kPresenterDocument()->zoomHandler();
     TQPoint iPoint = pos - zh->zoomPoint(
         getOrig() + KoPoint( bLeft(),
-                             bTop() + tqalignmentValue()) );
+                             bTop() + alignmentValue()) );
     iPoint = zh->pixelToLayoutUnit(
         TQPoint( iPoint.x() + canvas->diffx(), iPoint.y() + canvas->diffy() ) );
     return iPoint;
diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h
index 141062d1..41dbe91e 100644
--- a/kpresenter/KPrTextObject.h
+++ b/kpresenter/KPrTextObject.h
@@ -121,10 +121,10 @@ public:
 
     void saveParagraph( TQDomDocument& doc,
                         KoTextParag * parag,
-                        TQDomElement &tqparentElem,
+                        TQDomElement &parentElem,
                         int from /* default 0 */,
                         int to /* default length()-2 */ );
-    KoParagLayout loadParagLayout( TQDomElement & tqparentElem, KPrDocument *doc, bool useRefStyle);
+    KoParagLayout loadParagLayout( TQDomElement & parentElem, KPrDocument *doc, bool useRefStyle);
 
     static KoTextFormat loadFormat( TQDomElement &n, KoTextFormat * refFormat, const TQFont & defaultFont,
                                     const TQString & defaultLanguage, bool hyphen );
@@ -169,7 +169,7 @@ public:
 
     VerticalAlignmentType verticalAlignment() const { return m_textVertAlign; }
     void setVerticalAligment( VerticalAlignmentType _type) ;
-    double tqalignmentValue() const {  return alignVertical; }
+    double alignmentValue() const {  return alignVertical; }
     virtual KPrTextObject *nextTextObject() { return this;}
     static void saveFormat( TQDomElement & element, KoTextFormat*lastFormat );
 
@@ -194,7 +194,7 @@ protected:
     virtual void loadKTextObject( const TQDomElement &e );
     void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged );
     void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to );
-    void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & tqparentElem );
+    void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem );
     void tqinvalidate();
     void recalcVerticalAlignment();
     virtual KoPen defaultPen() const;
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 7382cc5e..9577bc7d 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -4819,15 +4819,15 @@ TQPopupMenu * KPrView::popupMenu( const TQString& name )
 }
 
 void KPrView::addVariableActions( int type, const TQStringList & texts,
-                                         KActionMenu * tqparentMenu, const TQString & menuText )
+                                         KActionMenu * parentMenu, const TQString & menuText )
 {
-    // Single items go directly into tqparentMenu.
+    // Single items go directly into parentMenu.
     // For multiple items we create a submenu.
     if ( texts.count() > 1 && !menuText.isEmpty() )
     {
         KActionMenu * subMenu = new KActionMenu( menuText, actionCollection() );
-        tqparentMenu->insert( subMenu );
-        tqparentMenu = subMenu;
+        parentMenu->insert( subMenu );
+        parentMenu = subMenu;
     }
     TQStringList::ConstIterator it = texts.begin();
     for ( int i = 0; it != texts.end() ; ++it, ++i )
@@ -4840,7 +4840,7 @@ void KPrView::addVariableActions( int type, const TQStringList & texts,
             KAction * act = new KAction( (*it), 0, TQT_TQOBJECT(this), TQT_SLOT( insertVariable() ),
                                          actionCollection(), "var-action" );
             m_variableDefMap.insert( act, v );
-            tqparentMenu->insert( act );
+            parentMenu->insert( act );
         }
     }
 }
diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h
index f50816ba..ecfb736e 100644
--- a/kpresenter/KPrView.h
+++ b/kpresenter/KPrView.h
@@ -781,7 +781,7 @@ protected:
     virtual void updateReadWrite( bool readwrite );
 
     void addVariableActions( int type, const TQStringList & texts,
-                             KActionMenu * tqparentMenu, const TQString & menuText );
+                             KActionMenu * parentMenu, const TQString & menuText );
 
     void showParagraphDialog( int initialPage = -1, double initialTabPos = 0.0 );
 
diff --git a/kpresenter/brushpropertyui.ui b/kpresenter/brushpropertyui.ui
index 58d680cb..4defb83d 100644
--- a/kpresenter/brushpropertyui.ui
+++ b/kpresenter/brushpropertyui.ui
@@ -78,7 +78,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui
index 4a89074d..eec430f1 100644
--- a/kpresenter/generalpropertyui.ui
+++ b/kpresenter/generalpropertyui.ui
@@ -189,5 +189,5 @@
         <data format="PNG" length="1008">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b749444154388db59541681d551486bf49aef55c4965061b98815a5e20a5790b912c0d66d12c0381361004219bae0a45041111a92d28086a4110eaa68a8bd8b8a97121348b96b810cca6988281111a9c27446720afcc8516efa94e3b2e665e6244832e3c70b8cce5f2cf77cffc734e50d735830882600818060c3004046d1e14759b8f800a7858d7f5a360207cfe8df34f7627ba679d7367f27e7ea27425168bc71fb896ae24bd936eaddf5a5fa6e213e02ef0c00c48af5dbd76364a7837390e9d4a5b98128c0025d608e0f7f6d97b4eefc8389f8617d66f3a0b7c0894a63d395cf48b33d1d390f5bf40ef65f84ab116fcefe00a212f1441b04760ec38882854a0801c866854015e00aeee1203a6ec97273c0ebd57e02b873d1c926dc0daaab271ab400c68a5880989c785d98588a9698fd0ec872302e83120fa33f150ee7226517c95636dc8b73794e52b0e2a08432119174420ef29bd2de5a3b7338ac598f9451069c4dbb0c0a18170608d05147b58c83660a5159d3d1573720e92c482f1a846acad7a56ae3856967ac4719799d316314a53188681606820ec2b0f08dec3f5af1c5a29b3a762e6cf4094286a72dc8ee5fa9725b30b112fbe148211969772b4bfcf7e01100c88b1c682297145447a3b230c1b5291e68aee7ec2e5f74bb24d47b903e75e4b58bfe1c87e50d2d423b2dfdc03627ce5b146c88b120c241d884641519c8bb8fc564ebae99050989a8e60a4a43b19a295926f8356ff20dcd41804814a0947da8fb29370f99d926cb3b157382224472112c08018412b90bf20ef2306b047001392f61455cbda4ddf908e08f1d1905eafe0d2c59c742322cf14ad94b18e853d5734fedd4f5cd23d0e9d8e50f494b555cffc6244b9a34c9d8c4862b874117a5b05e75fced1fb8e380ee94e425e1c50631010657641d04a59b9e2585b2d39f74ac2e4b4a733e979f5cd84380e71fd022a989a0b199bd8e7e3bf23f6500953d3506cc7ac2cf558fe00d66f38bacf846020cf4a5c5f9bdaa2a4df28e96d4b2842ebe37dc275d92fdb7f5f11607e5188e32e2b9fe7a49b4a7abbd79cae203c1232733ae4bbaf95fcbe43ab88a2bf2b5a03f5ae707a27dd4a331997a821110333739ea9e98434f5e4db8d68d2b17427616c02d2390b5502a624fb1e805f8087401dd4754d100416c3ebcf3d2f17a2a4b194aa3270bdb4af17d37633da9b19c139483794bc505cc155e063e047da46ff18700c780ff889bda9f06ff367e033e034f02c303a201ea2e94a11f054bb5ada86c2c151b7d7f73413e02e50ee8ea620080cf038f0442b7a88ff36f37e6bc57f051e04ffd730fd03ef8bd61b5b2ca6900000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui
index 488550d6..bc7f0707 100644
--- a/kpresenter/gradientpropertyui.ui
+++ b/kpresenter/gradientpropertyui.ui
@@ -169,7 +169,7 @@
     <tabstop>xSlider</tabstop>
     <tabstop>ySlider</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui
index fcdee80c..430bfac8 100644
--- a/kpresenter/imageEffectBase.ui
+++ b/kpresenter/imageEffectBase.ui
@@ -1458,7 +1458,7 @@
         <slot>raiseWidget(int)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kpresenter/insertpagedia.ui b/kpresenter/insertpagedia.ui
index 1984d518..9d7372cf 100644
--- a/kpresenter/insertpagedia.ui
+++ b/kpresenter/insertpagedia.ui
@@ -72,7 +72,7 @@
             <property name="title">
                 <string></string>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
             <vbox>
                 <property name="name">
@@ -181,5 +181,5 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpresenter/marginui.ui b/kpresenter/marginui.ui
index ac7ab85e..b4e1bd1e 100644
--- a/kpresenter/marginui.ui
+++ b/kpresenter/marginui.ui
@@ -163,5 +163,5 @@
 <tabstops>
     <tabstop>synchronize</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpresenter/penstyle.ui b/kpresenter/penstyle.ui
index a945aff4..bcbcca09 100644
--- a/kpresenter/penstyle.ui
+++ b/kpresenter/penstyle.ui
@@ -186,8 +186,8 @@
     <tabstop>lineBeginCombo</tabstop>
     <tabstop>lineEndCombo</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kpresenter/picturepropertyui.ui b/kpresenter/picturepropertyui.ui
index 471a9d91..6812256c 100644
--- a/kpresenter/picturepropertyui.ui
+++ b/kpresenter/picturepropertyui.ui
@@ -173,7 +173,7 @@
     <tabstop>grayscale</tabstop>
     <tabstop>brightnessInput</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kpresenter/piepropertyui.ui b/kpresenter/piepropertyui.ui
index 69300a3a..854e3168 100644
--- a/kpresenter/piepropertyui.ui
+++ b/kpresenter/piepropertyui.ui
@@ -139,7 +139,7 @@
 <tabstops>
     <tabstop>typeCombo</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui
index e5b7ef56..2b1b87dd 100644
--- a/kpresenter/polygonpropertyui.ui
+++ b/kpresenter/polygonpropertyui.ui
@@ -140,7 +140,7 @@
         <data format="PNG" length="826">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000030149444154388db59531681b5718c77f0e377c070e3c810a3a70e0041eac51852e0a19e45134830a1d9a4c69a04bc8928e990a693a640e1d0c8642b08742321894c1507991b484c890902bb8701a047760c3bd21701fe4201dde49b6a41a32b8df72dcbbeffdbefffbbfefbd5b1b0c07cce266ebe667ae2006c3c1dada0cdc3be87d6e6c35b0d692a409d9c7ec8b20d65ae29398d19b1114e7e3de4ce98b3f5e10dc0053cf0951b4506496e1b964bf7ce6c585d9054c62d01d617ca48be0596553cf496d8f2c8b01c5f795fc93904e85ec4c01a152857a5d9175d0b2805c872080f18595ccc1499a10a225d4e2fbc2877786fe81253ab6c04c8d106e09db5d43ab0d146e5c64d1a23938fb98a185cea1c33eecfd9eba49eb427dcb201e245365f2b7b2fb5b4a3a31dcb927178afe07d86901df870fefa4842aed6f6b74ba42e52b4014d580e1eb9cbd9d94de7e4aad16d2f9be02d805f0b5e532f927a1ffcacea1777f122a8105b164a7c25faf323a5d9f1f1fd600e1e5bec59e2d4b5c7ef5209d0ad17b8b31864e57c0b3e0815ac3ee33253ab664a770ff5185d1a1cb8d2267d3e58aa1dc7d2508cbe597d0e74fdd269aaaf0f52d414c4ea3e9762c996869e42560d7a72e41c4799a2586e74f95e8d8151481fa86efbe7b3398ac58b1a2b8527589f15451ad303ac2293542ad6648a796278f13a27185e4c4754310facb98c53a79e19a3fdc1426ff28c3d7399d1f7cb25343eb96106cf83c790ce9c4f2eb831855c55485663327992eb6dc8a6259874ed700b0b793323cccb9ffa842b30d6133e3e75fea989ac15a8b16ca76b746b0b92278d919774c5b6d48a78697fb29bbcf52468742a32120909c24e899ce67beed5be2db01e22d1e9485bb620e47f9ee9e606a21bd3f5d3744c7e7c54d55e87443867d8b554515ac5db4620e8e4f62263170fd1cdee90aad7640141992891b0f367c9adfe4049bb07d3b7022bd8c687c0978f46684ee084150b65ac1fcca94591b7a90a496e4c095164fb016a2b192a497795cc0f84817aebe25f7bf70ccc54a575c555c03f78ffa5fc0570d1f0c076bff0232285a09643cc7ce0000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui
index 4b13a474..ce16ef61 100644
--- a/kpresenter/rectpropertyui.ui
+++ b/kpresenter/rectpropertyui.ui
@@ -177,5 +177,5 @@
         <data format="PNG" length="824">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000002ff49444154388db59531681c4714863f992dde820cb370815b50600f54e8ca0ba43970712a8fb838438a3895634813d238a5ab80e314ae4d0a812060a4226017c27221c8a9da6b8c4fe0e00d28b0571cec82043b85611f78c12966efa4bb8bc085f29a6567df7cef9f7fdeccaec571cc2cbaddee47ae21e2385e5b9b815f1ebcfcd8de6a63ad25cb338af7c52741acb5a4a729a3d723a82ec6bd99d267bf3f23fc1c4cab2442d14a915986e792fdfa59569766573049417784f1b12e8267954dab24b78714450a28beaf941f847c2a14e70a0841035a2d45d641eb027213c210c69756320767794684d6508bef0befde1a860796e4c402333542b4256c0f0cdd1e50b97191458be6e0e27d81563a87c643d8fb2d7793d685d696413cc8a6cae46f65f7d79c7c62b87b4f2e15fd0fb0d302be0fefde4a0d557a5f35e90f84e0334014d590f855c9de4ecee17e4eb319d1ff3a00ec02f8c67299f283307c61e7d06fbf1782d082588a33e1cf1705fd81cf773f3601e1f9bec59e2f4b5c7ef5209f0ac95f16630cfd818067c103b586dd274a726229cee0fe8380d191cb4d1267d3d58aa1de7d258ceae5d7d0a78fdd269a86f0c52d414c49bbe3762c9b686de41560d7a72e41c4795a6486a78f95e4c4151481d686efbe7b3398ac58b1a23868b8c474aaa8068c8e714a8dd06c1af2a9e5d1c38c641c909dba6e08237f19b358a7ac5cf3479bc2e41f257e55d2ffc6a73833746f09e186cfa387904f2cbffc90a2aa9886d0e99464d3c5965b512cebd01f1800f67672e2a392fb0f023a3d883a053ffddcc2340dd65ab452b6074dc2cd15c1cbceb863daed413e353cdfcfd97d92333a12da6d0181ec3443cf753ef3cdd092de0e116ff1a02cdc157338ca9d7b8269461cfee1ba2139b9286e1a427f10110f2d561555b076d18a39383d4d99a4c0cd0b787f20747b214962c8266e3cdcf0e97c59126ec2f6edd089f40a92f115e0d1eb11ba238461dd6a15f32b53666de841965bb203575a3cc15a48c64a965fe57105e3635db8fa96dcffc431172b5d715d7103dc3fea7f015f373c8ee3b57f0135105a0fae7717960000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui
index 08a877cb..ea998478 100644
--- a/kpresenter/rotationpropertyui.ui
+++ b/kpresenter/rotationpropertyui.ui
@@ -158,7 +158,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui
index 733ebbd5..44fc0e02 100644
--- a/kpresenter/shadowdialog.ui
+++ b/kpresenter/shadowdialog.ui
@@ -492,7 +492,7 @@
     <slot access="protected">applyClicked()</slot>
     <slot access="protected">okClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui
index eef5c847..2314d8b9 100644
--- a/kpresenter/slidetransitionwidget.ui
+++ b/kpresenter/slidetransitionwidget.ui
@@ -299,7 +299,7 @@
     <tabstop>previewButton</tabstop>
     <tabstop>automaticTransitionInput</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kpresenter/textpropertyui.ui b/kpresenter/textpropertyui.ui
index 2e171cff..0d10315c 100644
--- a/kpresenter/textpropertyui.ui
+++ b/kpresenter/textpropertyui.ui
@@ -54,7 +54,7 @@
         <data format="PNG" length="826">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b00000301494441541895b59531681b5718c77f0e377c070e3c810a3a70e0041eac51852e0a19e45134830a1d9a4c69a04bc8928e990a693a640e1d0c8642b08742321894c1507991b484c890902bb8701a047760c3bd21701fe4201dde49b6a41a32b8df72dcbbeffdbefffbbfefbd5b1b0c07cce266ebe667ae2006c3c1dada0cdc3be87d6e6c35b0d692a409d9c7ec8b20d65ae29398d19b1114e7e3de4ce98b3f5e10dc0053cf0951b4506496e1b964bf7ce6c585d9054c62d01d617ca48be0596553cf496d8f2c8b01c5f795fc93904e85ec4c01a152857a5d9175d0b2805c872080f18595ccc1499a10a225d4e2fbc2877786fe81253ab6c04c8d106e09db5d43ab0d146e5c64d1a23938fb98a185cea1c33eecfd9eba49eb427dcb201e245365f2b7b2fb5b4a3a31dcb927178afe07d86901df870fefa4842aed6f6b74ba42e52b4014d580e1eb9cbd9d94de7e4aad16d2f9be02d805f0b5e532f927a1ffcacea1777f122a8105b164a7c25faf323a5d9f1f1fd600e1e5bec59e2d4b5c7ef5209d0ad17b8b31864e57c0b3e0815ac3ee33253ab664a770ff5185d1a1cb8d2267d3e58aa1dc7d2508cbe597d0e74fdd269aaaf0f52d414c4ea3e9762c996869e42560d7a72e41c4799a2586e74f95e8d8151481fa86efbe7b3398ac58b1a2b8527589f15451ad303ac2293542ad6648a796278f13a27185e4c4754310facb98c53a79e19a3fdc1426ff28c3d7399d1f7cb25343eb96106cf83c790ce9c4f2eb831855c55485663327992eb6dc8a6259874ed700b0b793323cccb9ffa842b30d6133e3e75fea989ac15a8b16ca76b746b0b92278d919774c5b6d48a78697fb29bbcf52468742a32120909c24e899ce67beed5be2db01e22d1e9485bb620e47f9ee9e606a21bd3f5d3744c7e7c54d55e87443867d8b554515ac5db4620e8e4f62263170fd1cdee90aad7640141992891b0f367c9adfe4049bb07d3b7022bd8c687c0978f46684ee084150b65ac1fcca94591b7a90a496e4c095164fb016a2b192a497795cc0f84817aebe25f7bf70ccc54a575c555c03f78ffa5fc0570d1f0c076bff0232285a09283782c80000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpmarginwidget.h</includehint>
 </includehints>
diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html
index 586c9d68..0bfb8a3b 100644
--- a/kspread/DESIGN.html
+++ b/kspread/DESIGN.html
@@ -353,7 +353,7 @@ to follow its algorithm from there.</p>
 based on Polish notation. Instead of ordering the tokens in suffix Polish
 form, the parser (which is also the code generator) simply outputs
 byte codes. In its operation, the parser requires the knowledge of operator
-precedence to correctly translate untqparenthesized infix expression and
+precedence to correctly translate unparenthesized infix expression and
 thus requires the use of a syntax stack.</p>
 
 <p>The parser algorithm is given as follows:</p>
@@ -376,7 +376,7 @@ Step 4: If it is an operator<br>
 <p>The reduce rules are:</p>
 
 <p>Rule A: <i>function argument</i>:
-if token is semicolon or right tqparenthesis,
+if token is semicolon or right parenthesis,
 if syntax stack looks as:
 <ul type="square">
 <li>non-operator &lt;--- top</li>
@@ -422,7 +422,7 @@ then reduce to:<br>
 </ul>
 </p>
 
-<p>Rule D: tqparenthesis removal<br>
+<p>Rule D: parenthesis removal<br>
 if syntax stack looks as:<br>
 <ul type="square">
 <li>operator (</li>
diff --git a/kspread/KSpreadViewIface.cc b/kspread/KSpreadViewIface.cc
index 95eeda3a..fab646f9 100644
--- a/kspread/KSpreadViewIface.cc
+++ b/kspread/KSpreadViewIface.cc
@@ -442,9 +442,9 @@ void ViewIface::sortDec()
     m_view->sortDec();
 }
 
-void ViewIface::tqlayoutDlg()
+void ViewIface::layoutDlg()
 {
-    m_view->tqlayoutDlg();
+    m_view->layoutDlg();
 }
 
 
diff --git a/kspread/KSpreadViewIface.h b/kspread/KSpreadViewIface.h
index f41a5217..090e8967 100644
--- a/kspread/KSpreadViewIface.h
+++ b/kspread/KSpreadViewIface.h
@@ -132,7 +132,7 @@ k_dcop:
     void subtotals();
     void sortInc();
     void sortDec();
-    void tqlayoutDlg();
+    void layoutDlg();
     void increaseFontSize();
     void decreaseFontSize();
 
diff --git a/kspread/commands.cc b/kspread/commands.cc
index 9a7ceda4..a4788bda 100644
--- a/kspread/commands.cc
+++ b/kspread/commands.cc
@@ -269,7 +269,7 @@ SheetPropertiesCommand::SheetPropertiesCommand( Doc* d, Sheet* s )
 {
     sheet = s;
     doc = d;
-    oldDirection = newDirection = sheet->tqlayoutDirection();
+    oldDirection = newDirection = sheet->layoutDirection();
     oldAutoCalc = newAutoCalc = sheet->getAutoCalc();
     oldShowGrid = newShowGrid = sheet->getShowGrid();
     oldShowPageBorders = newShowPageBorders = sheet->isShowPageBorders();
diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui
index 525b83f3..6e0b3c0d 100644
--- a/kspread/dialogs/SheetSelectWidget.ui
+++ b/kspread/dialogs/SheetSelectWidget.ui
@@ -254,7 +254,7 @@ It is even possible to print a sheet more than once. Just insert the desired she
     <tabstop>ButtonMoveDown</tabstop>
     <tabstop>ButtonMoveBottom</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui
index 3bb6b78a..6e7f7403 100644
--- a/kspread/dialogs/font_cell_format.ui
+++ b/kspread/dialogs/font_cell_format.ui
@@ -219,7 +219,7 @@ The default font is set for all cells in the Format -&gt; Style Manager menu wit
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index 6b5c233b..fcbb734e 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -182,7 +182,7 @@ GeneralTab::GeneralTab( TQWidget* tqparent, CellFormatDialog * dlg )
   m_parentBox->insertStringList( tmp );
 
   if ( m_dlg->getStyle()->tqparent() )
-    m_parentBox->setCurrentText( m_dlg->getStyle()->tqparentName() );
+    m_parentBox->setCurrentText( m_dlg->getStyle()->parentName() );
   else
   {
     m_parentBox->setCurrentText( i18n( "<None>" ) );
@@ -219,16 +219,16 @@ void GeneralTab::slotNameChanged()
   checkName();
 }
 
-void GeneralTab::slotNewParent( const TQString & tqparentName )
+void GeneralTab::slotNewParent( const TQString & parentName )
 {
   kdDebug() << "New Parent" << endl;
-  if ( !checkParent( tqparentName ) )
+  if ( !checkParent( parentName ) )
     return;
 
-  if ( tqparentName.isEmpty() || tqparentName == i18n( "<None>" ) )
+  if ( parentName.isEmpty() || parentName == i18n( "<None>" ) )
     m_dlg->getStyle()->setParent( 0 );
   else
-    m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( tqparentName ) );
+    m_dlg->getStyle()->setParent( m_dlg->getStyleManager()->style( parentName ) );
 
   // Set difference to new tqparent, set GUI to tqparent values, add changes made before
   //  m_dlg->initGUI();
@@ -248,17 +248,17 @@ bool GeneralTab::checkName()
   return true;
 }
 
-bool GeneralTab::checkParent( const TQString & tqparentName )
+bool GeneralTab::checkParent( const TQString & parentName )
 {
-  if ( m_dlg->getStyle()->tqparentName() != tqparentName
-       && m_parentBox->isEnabled() && tqparentName != i18n( "<None>" ) && !tqparentName.isEmpty() )
+  if ( m_dlg->getStyle()->parentName() != parentName
+       && m_parentBox->isEnabled() && parentName != i18n( "<None>" ) && !parentName.isEmpty() )
   {
-    if ( m_nameEdit->text() == tqparentName )
+    if ( m_nameEdit->text() == parentName )
     {
       KMessageBox::sorry( this, i18n( "A style cannot inherit from itself." ) );
       return false;
     }
-    if ( !m_dlg->checkCircle( m_nameEdit->text(), tqparentName ) )
+    if ( !m_dlg->checkCircle( m_nameEdit->text(), parentName ) )
     {
       KMessageBox::sorry( this,
                           i18n( "The style cannot inherit from '%1' because of recursive references." )
@@ -266,7 +266,7 @@ bool GeneralTab::checkParent( const TQString & tqparentName )
       return false;
     }
 
-    CustomStyle * p = m_dlg->getStyleManager()->style( tqparentName );
+    CustomStyle * p = m_dlg->getStyleManager()->style( parentName );
 
     if ( !p )
     {
diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h
index a16e409d..ddb364e7 100644
--- a/kspread/dialogs/kspread_dlg_layout.h
+++ b/kspread/dialogs/kspread_dlg_layout.h
@@ -145,7 +145,7 @@ class GeneralTab : public TQWidget
   bool apply( CustomStyle * style );
 
  protected slots:
-  void slotNewParent( const TQString & tqparentName );
+  void slotNewParent( const TQString & parentName );
   void slotNameChanged();
 
  private:
@@ -156,7 +156,7 @@ class GeneralTab : public TQWidget
   TQString m_name;
   TQString m_parent;
 
-  bool checkParent( const TQString & tqparentName );
+  bool checkParent( const TQString & parentName );
   bool checkName();
 };
 
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.h b/kspread/dialogs/kspread_dlg_paperlayout.h
index a7316f22..cd3537a3 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.h
+++ b/kspread/dialogs/kspread_dlg_paperlayout.h
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kspread_dlg_papertqlayout__
-#define __kspread_dlg_papertqlayout__
+#ifndef __kspread_dlg_paperlayout__
+#define __kspread_dlg_paperlayout__
 
 #include <kdialogbase.h>
 #include <KoPageLayoutDia.h>
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index ac7cd187..3b94da54 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -79,10 +79,10 @@ SortDialog::SortDialog( View * tqparent,  const char * name,
 //---------------- Sort Layout & Header Row/Column Toggle
 
   //Sort orientation selector (for selecting Left-To-Right or Top-To-Bottom sorting of the selection)
-  TQGroupBox* tqlayoutGroup = new TQGroupBox(2 , Qt::Vertical,  m_page1, "tqlayoutGroup");
-  tqlayoutGroup->setTitle( i18n("Layout") );
+  TQGroupBox* layoutGroup = new TQGroupBox(2 , Qt::Vertical,  m_page1, "layoutGroup");
+  layoutGroup->setTitle( i18n("Layout") );
   
-  TQHButtonGroup * orientationGroup = new TQHButtonGroup( tqlayoutGroup, "orientationGroup" );
+  TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" );
   orientationGroup->setLineWidth(0);
   orientationGroup->setMargin(0);
   orientationGroup->tqlayout()->setMargin(0);
@@ -94,10 +94,10 @@ SortDialog::SortDialog( View * tqparent,  const char * name,
   m_sortRow->setText( i18n( "Sort &Columns" ) );
     
   //First row / column contains header toggle
-  m_firstRowOrColHeader = new TQCheckBox( tqlayoutGroup, "m_copyLayout" );
+  m_firstRowOrColHeader = new TQCheckBox( layoutGroup, "m_copyLayout" );
   //m_firstRowOrColHeader->setText( i18n( "&First row contains headers" ) );
   m_firstRowOrColHeader->setChecked(true);
-  page1Layout->addWidget(tqlayoutGroup,0,0);
+  page1Layout->addWidget(layoutGroup,0,0);
 
 //----------------
 
diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui
index 9cfb871a..cb73b12d 100644
--- a/kspread/dialogs/kspreadsubtotal.ui
+++ b/kspread/dialogs/kspreadsubtotal.ui
@@ -218,5 +218,5 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui
index 6438278e..df2ff211 100644
--- a/kspread/dialogs/position_cell_format.ui
+++ b/kspread/dialogs/position_cell_format.ui
@@ -407,5 +407,5 @@ When a merged cell is selected and when you uncheck this, then all cells come ba
         <slot>setValue(int)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui
index bdf9bf77..0768d4f7 100644
--- a/kspread/dialogs/protection_cell_format.ui
+++ b/kspread/dialogs/protection_cell_format.ui
@@ -176,5 +176,5 @@ Note that you can print it even if the cell is protected</string>
     <slot>setDisabled(bool)</slot>
   </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index efd30b03..2f345103 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -63,7 +63,7 @@ void SheetPropertiesDialog::slotDefault()
   setCapitalizeFirstLetter( false );
 }
 
-Sheet::LayoutDirection SheetPropertiesDialog::tqlayoutDirection() const
+Sheet::LayoutDirection SheetPropertiesDialog::layoutDirection() const
 {
   if( d->directionComboBox->currentText() == i18n( "Left to Right" ) )
     return Sheet::LeftToRight;
diff --git a/kspread/dialogs/sheet_properties.h b/kspread/dialogs/sheet_properties.h
index b2f364f4..6ab51a40 100644
--- a/kspread/dialogs/sheet_properties.h
+++ b/kspread/dialogs/sheet_properties.h
@@ -41,7 +41,7 @@ public:
 
     virtual void slotDefault();
     
-    Sheet::LayoutDirection tqlayoutDirection() const;
+    Sheet::LayoutDirection layoutDirection() const;
     
     void setLayoutDirection( Sheet::LayoutDirection dir );
 
diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui
index f1fe56c8..0750b8a9 100644
--- a/kspread/dialogs/sheet_properties_base.ui
+++ b/kspread/dialogs/sheet_properties_base.ui
@@ -250,8 +250,8 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment>
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/kspread/formula.cc b/kspread/formula.cc
index 17b95497..efeec46e 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cc
@@ -966,7 +966,7 @@ void Formula::compile( const Tokens& tokens ) const
           }
         }
 
-        // rule for function call with tqparentheses, but without argument
+        // rule for function call with parentheses, but without argument
         // e.g. "2*PI()"
         if( !ruleFound )
         if( syntaxStack.itemCount() >= 3 )
@@ -987,7 +987,7 @@ void Formula::compile( const Tokens& tokens ) const
           }
         }
 
-        // rule for tqparenthesis:  ( Y ) -> Y
+        // rule for parenthesis:  ( Y ) -> Y
         if( !ruleFound )
         if( syntaxStack.itemCount() >= 3 )
         {
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 84c84fca..96d4836a 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -635,7 +635,7 @@ void Canvas::scrollToCell(TQPoint location) const
   // xpos is the position of the cell in the current window in unzoomed
   // document coordinates.
   double xpos;
-  if ( sheet->tqlayoutDirection()==Sheet::LeftToRight )
+  if ( sheet->layoutDirection()==Sheet::LeftToRight )
     xpos = sheet->dblColumnPos( location.x() ) - xOffset();
   else
     xpos = unzoomedWidth - sheet->dblColumnPos( location.x() ) + xOffset();
@@ -648,7 +648,7 @@ void Canvas::scrollToCell(TQPoint location) const
   //kdDebug(36001) << "Canvas::scrollToCell : height=" << height() << endl;
   //kdDebug(36001) << "Canvas::scrollToCell : width=" << width() << endl;
 
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft ) {
+  if ( sheet->layoutDirection()==Sheet::RightToLeft ) {
     // Right to left sheet.
 
     double minX = unzoomedWidth - 100.0; // less than that, we scroll
@@ -730,7 +730,7 @@ void Canvas::slotScrollHorz( int _value )
   kdDebug(36001) << "slotScrollHorz: value = " << _value << endl;
   //kdDebug(36001) << kdBacktrace() << endl;
 
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
     _value = horzScrollBar()->maxValue() - _value;
 
   double unzoomedValue = d->view->doc()->unzoomItX( _value );
@@ -778,7 +778,7 @@ void Canvas::slotScrollHorz( int _value )
   kdDebug(36001) << "slotScrollHorz(): XOffset after setting: "
 		 << d->xOffset << endl;
 
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
     dx = -dx;
 
   scroll( dx, 0 );
@@ -855,7 +855,7 @@ void Canvas::slotMaxColumn( int _max_column )
 
   horzScrollBar()->setRange( 0, d->view->doc()->zoomItX( xpos + xOffset() ) );
 
-  if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( activeSheet()->layoutDirection()==Sheet::RightToLeft )
     horzScrollBar()->setValue( horzScrollBar()->maxValue() - oldValue );
 }
 
@@ -1023,7 +1023,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
 
   double dwidth = d->view->doc()->unzoomItX( width() );
   double ev_PosX;
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset();
   }
@@ -1059,7 +1059,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
   //tqshape to a resize arrow
   if (highlightRangeSizeGripAt(ev_PosX,ev_PosY))
   {
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
       setCursor( sizeBDiagCursor );
     else
       setCursor( sizeFDiagCursor );
@@ -1090,7 +1090,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
   {
     Cell *cell = sheet->visibleCellAt( col, row );
     TQString anchor;
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
     {
       anchor = cell->testAnchor( d->view->doc()->zoomItX( cell->dblWidth() - ev_PosX + xpos ),
                                  d->view->doc()->zoomItY( ev_PosY - ypos ) );
@@ -1120,7 +1120,7 @@ void Canvas::mouseMoveEvent( TQMouseEvent * _ev )
 
     if ( !sheet->isProtected() )
     {
-      if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+      if ( sheet->layoutDirection()==Sheet::RightToLeft )
         setCursor( sizeBDiagCursor );
       else
         setCursor( sizeFDiagCursor );
@@ -1381,7 +1381,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev )
 
   double dwidth = d->view->doc()->unzoomItX( width() );
   double ev_PosX;
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset();
   }
@@ -1649,7 +1649,7 @@ void Canvas::paintEvent( TQPaintEvent* _ev )
 
   double dwidth = d->view->doc()->unzoomItX( width() );
   KoRect rect = d->view->doc()->unzoomRect( _ev->rect() & TQWidget::rect() );
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
     rect.moveBy( -xOffset(), yOffset() );
   else
     rect.moveBy( xOffset(), yOffset() );
@@ -1662,7 +1662,7 @@ void Canvas::paintEvent( TQPaintEvent* _ev )
   int right_col;
   //Philipp: I don't know why we need the +1, but otherwise we don't get it correctly
   //Testcase: Move a dialog slowly up left. Sometimes the top/left most points are not painted
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     right_col = sheet->leftColumn( dwidth - tl.x(), tmp );
     left_col  = sheet->rightColumn( dwidth - br.x() + 1.0 );
@@ -1731,7 +1731,7 @@ void Canvas::dragMoveEvent( TQDragMoveEvent * _ev )
   TQRect r1 ((int) xpos - 1, (int) ypos - 1, (int) width + 3, (int) height + 3);
 
   double ev_PosX;
-  if (sheet->tqlayoutDirection()==Sheet::RightToLeft)
+  if (sheet->layoutDirection()==Sheet::RightToLeft)
     ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset();
   else
     ev_PosX = d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset();
@@ -1769,7 +1769,7 @@ void Canvas::dropEvent( TQDropEvent * _ev )
   TQRect r1 ((int) xpos - 1, (int) ypos - 1, (int) width + 3, (int) height + 3);
 
   double ev_PosX;
-  if (sheet->tqlayoutDirection()==Sheet::RightToLeft)
+  if (sheet->layoutDirection()==Sheet::RightToLeft)
     ev_PosX = dwidth - d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset();
   else
     ev_PosX = d->view->doc()->unzoomItX( _ev->pos().x() ) + xOffset();
@@ -1855,12 +1855,12 @@ void Canvas::resizeEvent( TQResizeEvent* _ev )
     // workaround to allow horizontal resizing and zoom changing when sheet
     // direction and interface direction don't match (e.g. an RTL sheet on an
     // LTR interface)
-    if ( activeSheet() && activeSheet()->tqlayoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() )
+    if ( activeSheet() && activeSheet()->layoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() )
     {
         int dx = _ev->size().width() - _ev->oldSize().width();
         scroll(dx, 0);
     }
-    else if ( activeSheet() && activeSheet()->tqlayoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() )
+    else if ( activeSheet() && activeSheet()->layoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() )
     {
         int dx = _ev->size().width() - _ev->oldSize().width();
         scroll(-dx, 0);
@@ -1875,7 +1875,7 @@ void Canvas::resizeEvent( TQResizeEvent* _ev )
                d->view->doc()->zoomItX( activeSheet()->sizeMaxX() ) )
         {
             horzScrollBar()->setRange( 0, d->view->doc()->zoomItX( activeSheet()->sizeMaxX() - ev_Width ) );
-            if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft )
+            if ( activeSheet()->layoutDirection()==Sheet::RightToLeft )
                 horzScrollBar()->setValue( horzScrollBar()->maxValue() - oldValue );
         }
     }
@@ -1888,7 +1888,7 @@ void Canvas::resizeEvent( TQResizeEvent* _ev )
              int( d->view->doc()->zoomItX( activeSheet()->sizeMaxX() ) - ev_Width ) )
         {
             horzScrollBar()->setRange( 0, d->view->doc()->zoomItX( activeSheet()->sizeMaxX() - ev_Width ) );
-            if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft )
+            if ( activeSheet()->layoutDirection()==Sheet::RightToLeft )
                 horzScrollBar()->setValue( horzScrollBar()->maxValue() - oldValue );
         }
     }
@@ -2092,13 +2092,13 @@ void Canvas::processArrowKey( TQKeyEvent *event)
     direction = KSpread::Top;
     break;
   case Key_Left:
-    if (activeSheet()->tqlayoutDirection()==Sheet::RightToLeft)
+    if (activeSheet()->layoutDirection()==Sheet::RightToLeft)
       direction = KSpread::Right;
     else
       direction = KSpread::Left;
     break;
   case Key_Right:
-    if (activeSheet()->tqlayoutDirection()==Sheet::RightToLeft)
+    if (activeSheet()->layoutDirection()==Sheet::RightToLeft)
       direction = KSpread::Left;
     else
       direction = KSpread::Right;
@@ -2541,7 +2541,7 @@ bool Canvas::processControlArrowKey( TQKeyEvent *event )
   //Ctrl+Key_Left
   case Key_Left:
 
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     cell = sheet->cellAt( marker.x(), marker.y() );
     if ( (cell != NULL) && (!cell->isEmpty()) && (marker.x() != KS_colMax))
@@ -2635,7 +2635,7 @@ bool Canvas::processControlArrowKey( TQKeyEvent *event )
   //Ctrl+Key_Right
   case Key_Right:
 
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     cell = sheet->cellAt( marker.x(), marker.y() );
     if ( (cell != NULL) && (!cell->isEmpty()) && (marker.x() != 1))
@@ -3209,7 +3209,7 @@ void Canvas::speakCell(TQWidget* w, const TQPoint& p, uint flags)
     TQPoint wp = w->mapFromGlobal(p);
     double tmp;
     double posX;
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
     {
       double dwidth = d->view->doc()->unzoomItX( width() );
       posX = dwidth - d->view->doc()->unzoomItX( wp.x() );
@@ -3752,7 +3752,7 @@ bool Canvas::createEditor( EditorType ed, bool addFocus, bool captureArrowKeys )
 
     double xpos = sheet->dblColumnPos( markerColumn() ) - xOffset();
 
-    Sheet::LayoutDirection sheetDir = sheet->tqlayoutDirection();
+    Sheet::LayoutDirection sheetDir = sheet->layoutDirection();
     bool rtlText = cell->strOutText().isRightToLeft();
 
     // if sheet and cell direction don't match, then the editor's location
@@ -4113,7 +4113,7 @@ void Canvas::paintUpdates()
         if (!cell->isDefault())
         {
           if (cell->calcDirtyFlag()) cell->calc();
-          if (cell->tqlayoutDirtyFlag()) cell->makeLayout( painter, x, y );
+          if (cell->layoutDirtyFlag()) cell->makeLayout( painter, x, y );
         }
 
        /* bool paintBordersBottom = false;
@@ -4406,7 +4406,7 @@ void Canvas::paintNormalMarker(TQPainter& painter, const KoRect &viewRect)
       painter.drawLine( d->view->doc()->zoomItX( left ) - l,      d->view->doc()->zoomItY( top ),
                         d->view->doc()->zoomItX( right ) + l, d->view->doc()->zoomItY( top ) );
     }
-    if ( activeSheet()->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( activeSheet()->layoutDirection()==Sheet::RightToLeft )
     {
       if ( paintRight )
       {
@@ -4437,7 +4437,7 @@ void Canvas::paintNormalMarker(TQPainter& painter, const KoRect &viewRect)
         }
       }
     }
-    else // activeSheet()->tqlayoutDirection()==Sheet::LeftToRight
+    else // activeSheet()->layoutDirection()==Sheet::LeftToRight
     {
       if ( paintLeft )
       {
@@ -4475,7 +4475,7 @@ void Canvas::sheetAreaToRect(const TQRect& sheetArea, KoRect& rect)
 {
 	Sheet* sheet=activeSheet();
 
-	if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+	if ( sheet->layoutDirection()==Sheet::RightToLeft )
 	{
 		rect.setLeft(sheet->dblColumnPos( sheetArea.right()+1 ) );
 		rect.setRight(sheet->dblColumnPos( sheetArea.left() ));
@@ -4503,7 +4503,7 @@ void Canvas::sheetAreaToVisibleRect( const TQRect& sheetArea,
 	double xpos;
 	double x;
 
-	if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+	if ( sheet->layoutDirection()==Sheet::RightToLeft )
 	{
 		xpos = dwidth - sheet->dblColumnPos( sheetArea.right() ) + xOffset();
 		x    = dwidth - sheet->dblColumnPos( sheetArea.left() ) + xOffset();
@@ -4526,7 +4526,7 @@ void Canvas::sheetAreaToVisibleRect( const TQRect& sheetArea,
 	double h = ( y - ypos ) + th;
 
 	/* left, top, right, bottom */
-	if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+	if ( sheet->layoutDirection()==Sheet::RightToLeft )
 	{
 		visibleRect.setLeft(xpos - tw );
 		visibleRect.setRight(xpos - tw + w );
@@ -4562,7 +4562,7 @@ void Canvas::retrieveMarkerInfo( const TQRect &marker,
 
   double xpos;
   double x;
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     xpos = dWidth - sheet->dblColumnPos( marker.right() ) + xOffset();
     x    = dWidth - sheet->dblColumnPos( marker.left() ) + xOffset();
@@ -4584,7 +4584,7 @@ void Canvas::retrieveMarkerInfo( const TQRect &marker,
   double h = ( y - ypos ) + th;
 
 	//left, top, right, bottom
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     positions[0] = xpos - tw;
     positions[2] = xpos - tw + w;
@@ -4608,7 +4608,7 @@ void Canvas::retrieveMarkerInfo( const TQRect &marker,
                 (bottom >= viewRect.top()) && (top <= viewRect.bottom());
   paintSides[1] = (viewRect.top() <= top) && (top <= viewRect.bottom())
                && (right >= viewRect.left()) && (left <= viewRect.right());
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
     paintSides[2] = (viewRect.left() <= right ) &&
                     (right - 1 <= viewRect.right()) &&
                     (bottom >= viewRect.top()) && (top <= viewRect.bottom());
@@ -5051,7 +5051,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
     {
           m_lSize = new TQLabel( m_pCanvas );
 
-          if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+          if ( sheet->layoutDirection()==Sheet::RightToLeft )
             m_lSize->setGeometry( m_pCanvas->width() - len - 5,
                                                   y + 3, len + 2, hei + 2 );
           else
@@ -5064,7 +5064,7 @@ void VBorder::paintSizeIndicator( int mouseY, bool firstTime )
     }
     else
     {
-          if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+          if ( sheet->layoutDirection()==Sheet::RightToLeft )
             m_lSize->setGeometry( m_pCanvas->width() - len - 5,
                                                   y + 3, len + 2, hei + 2 );
           else
@@ -5239,7 +5239,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev )
 
   double ev_PosX;
   double dWidth = m_pCanvas->d->view->doc()->unzoomItX( width() );
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
     ev_PosX = dWidth - m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset();
   else
     ev_PosX = m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset();
@@ -5250,7 +5250,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev )
   double x;
 
   const double unzoomedPixel = m_pCanvas->d->view->doc()->unzoomItX( 1 );
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     int tmpCol = sheet->leftColumn( m_pCanvas->xOffset(), x );
 
@@ -5319,7 +5319,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev )
   {
     // Determine the column to resize
     double tmp;
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
     {
       m_iResizedColumn = sheet->leftColumn( ev_PosX - 1, tmp );
       // kdDebug() << "RColumn: " << m_iResizedColumn << ", PosX: " << ev_PosX << endl;
@@ -5424,7 +5424,7 @@ void HBorder::mouseReleaseEvent( TQMouseEvent * _ev )
         double width = 0.0;
         double x;
 
-        if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+        if ( sheet->layoutDirection()==Sheet::RightToLeft )
           ev_PosX = dWidth - m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset();
         else
           ev_PosX = m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset();
@@ -5545,7 +5545,7 @@ void HBorder::mouseMoveEvent( TQMouseEvent * _ev )
 
   double dWidth = m_pCanvas->d->view->doc()->unzoomItX( width() );
   double ev_PosX;
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
     ev_PosX = dWidth - m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset();
   else
     ev_PosX = m_pCanvas->d->view->doc()->unzoomItX( _ev->pos().x() ) + m_pCanvas->xOffset();
@@ -5571,7 +5571,7 @@ void HBorder::mouseMoveEvent( TQMouseEvent * _ev )
     newAnchor.setX( m_iSelectionAnchor );
     m_pView->selectionInfo()->update(newMarker);
 
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
     {
       if ( _ev->pos().x() < width() - m_pCanvas->width() )
       {
@@ -5607,7 +5607,7 @@ void HBorder::mouseMoveEvent( TQMouseEvent * _ev )
     const double unzoomedPixel = m_pCanvas->d->view->doc()->unzoomItX( 1 );
     double x;
 
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
     {
       int tmpCol = sheet->leftColumn( m_pCanvas->xOffset(), x );
 
@@ -5685,12 +5685,12 @@ void HBorder::resizeEvent( TQResizeEvent* _ev )
   // workaround to allow horizontal resizing and zoom changing when sheet
   // direction and interface direction don't match (e.g. an RTL sheet on an
   // LTR interface)
-  if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->tqlayoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() )
+  if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->layoutDirection()==Sheet::RightToLeft && !TQApplication::reverseLayout() )
   {
     int dx = _ev->size().width() - _ev->oldSize().width();
     scroll(dx, 0);
   }
-  else if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->tqlayoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() )
+  else if ( m_pCanvas->activeSheet() && m_pCanvas->activeSheet()->layoutDirection()==Sheet::LeftToRight && TQApplication::reverseLayout() )
   {
     int dx = _ev->size().width() - _ev->oldSize().width();
     scroll(-dx, 0);
@@ -5710,7 +5710,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     if ( !firstTime )
       painter.drawLine( m_iResizePos, 0, m_iResizePos, m_pCanvas->height() );
 
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
       m_iResizePos = mouseX + m_pCanvas->width() - width();
     else
       m_iResizePos = mouseX;
@@ -5718,7 +5718,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     // Dont make the column have a width < 2 pixels.
     int x = m_pCanvas->d->view->doc()->zoomItX( sheet->dblColumnPos( m_iResizedColumn ) - m_pCanvas->xOffset() );
 
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
     {
       x = m_pCanvas->width() - x;
 
@@ -5738,7 +5738,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     TQString tmpSize;
     if ( m_iResizePos != x )
         tmpSize = i18n("Width: %1 %2")
-                  .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->tqlayoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
+                  .tqarg( KGlobal::locale()->formatNumber( KoUnit::toUserValue( m_pCanvas->doc()->unzoomItX( (sheet->layoutDirection()==Sheet::RightToLeft) ? x - m_iResizePos : m_iResizePos - x ),
                                                                            m_pView->doc()->unit() )))
                   .tqarg( m_pView->doc()->unitName() );
     else
@@ -5753,7 +5753,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     {
         m_lSize = new TQLabel( m_pCanvas );
 
-        if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+        if ( sheet->layoutDirection()==Sheet::RightToLeft )
           m_lSize->setGeometry( x - len - 5, 3, len + 2, hei + 2 );
         else
           m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 );
@@ -5765,7 +5765,7 @@ void HBorder::paintSizeIndicator( int mouseX, bool firstTime )
     }
     else
     {
-        if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+        if ( sheet->layoutDirection()==Sheet::RightToLeft )
           m_lSize->setGeometry( x - len - 5, 3, len + 2, hei + 2 );
         else
           m_lSize->setGeometry( x + 3, 3, len + 2, hei + 2 );
@@ -5809,7 +5809,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
   double xPos;
   int x;
 
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     //Get the left column and the current x-position
     x = sheet->leftColumn( int( m_pCanvas->d->view->doc()->unzoomItX( width() ) - m_pCanvas->d->view->doc()->unzoomItX( _ev->rect().x() ) + m_pCanvas->xOffset() ), xPos );
@@ -5835,7 +5835,7 @@ void HBorder::paintEvent( TQPaintEvent* _ev )
   TQFont boldFont = normalFont;
   boldFont.setBold( true );
 
-  if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( sheet->layoutDirection()==Sheet::RightToLeft )
   {
     if ( x > KS_colMax )
       x = KS_colMax;
@@ -6014,7 +6014,7 @@ void ToolTip::maybeTip( const TQPoint& p )
     double ypos, xpos;
     double dwidth = m_canvas->doc()->unzoomItX( m_canvas->width() );
     int col;
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
       col = sheet->leftColumn( (dwidth - m_canvas->doc()->unzoomItX( p.x() ) +
                                               m_canvas->xOffset()), xpos );
     else
@@ -6085,7 +6085,7 @@ void ToolTip::maybeTip( const TQPoint& p )
     TQRect marker;
     bool insideMarker = false;
 
-    if ( sheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( sheet->layoutDirection()==Sheet::RightToLeft )
     {
       KoRect unzoomedMarker( dwidth - u - xpos + m_canvas->xOffset(),
                              ypos - m_canvas->yOffset(),
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index 9314d220..c3c520f8 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -2177,7 +2177,7 @@ void Cell::paintCell( const KoRect   &rect, TQPainter & painter,
   Q_ASSERT(isDefault()
      || (((cellRef.x() == d->column) && (cellRef.y() == d->row))));
 
-  Sheet::LayoutDirection sheetDir =  format()->sheet()->tqlayoutDirection();
+  Sheet::LayoutDirection sheetDir =  format()->sheet()->layoutDirection();
 
   double left = coordinate.x();
 
@@ -2790,7 +2790,7 @@ void Cell::paintDefaultBorders( TQPainter& painter, const KoRect &rect,
     */
   Doc* doc = sheet()->doc();
 
-  Sheet::LayoutDirection sheetDir =  format()->sheet()->tqlayoutDirection();
+  Sheet::LayoutDirection sheetDir =  format()->sheet()->layoutDirection();
   bool paintingToExternalDevice = painter.tqdevice()->isExtDev();
 
   // Each cell is responsible for drawing it's top and left portions
@@ -3039,7 +3039,7 @@ void Cell::paintCommentIndicator( TQPainter& painter,
 
     // Get the triangle.
     TQPointArray  point( 3 );
-    if ( format()->sheet()->tqlayoutDirection()==Sheet::RightToLeft ) {
+    if ( format()->sheet()->layoutDirection()==Sheet::RightToLeft ) {
       point.setPoint( 0, doc->zoomItX( cellRect.x() + 6.0 ),
                          doc->zoomItY( cellRect.y() ) );
       point.setPoint( 1, doc->zoomItX( cellRect.x() ),
@@ -3089,7 +3089,7 @@ void Cell::paintFormulaIndicator( TQPainter& painter,
 
     // Get the triangle...
     TQPointArray point( 3 );
-    if ( format()->sheet()->tqlayoutDirection()==Sheet::RightToLeft ) {
+    if ( format()->sheet()->layoutDirection()==Sheet::RightToLeft ) {
       point.setPoint( 0, doc->zoomItX( cellRect.right() - 6.0 ),
                          doc->zoomItY( cellRect.bottom() ) );
       point.setPoint( 1, doc->zoomItX( cellRect.right() ),
@@ -3474,7 +3474,7 @@ void Cell::paintPageBorders( TQPainter& painter,
 
   SheetPrint* print = format()->sheet()->print();
 
-  Sheet::LayoutDirection sheetDir =  format()->sheet()->tqlayoutDirection();
+  Sheet::LayoutDirection sheetDir =  format()->sheet()->layoutDirection();
 
   Doc* doc = sheet()->doc();
   int zcellRect_left = doc->zoomItX (cellRect.left());
@@ -3554,7 +3554,7 @@ void Cell::paintCellBorders( TQPainter& painter, const KoRect& rect,
 
   Doc * doc = sheet()->doc();
 
-  Sheet::LayoutDirection sheetDir =  format()->sheet()->tqlayoutDirection();
+  Sheet::LayoutDirection sheetDir =  format()->sheet()->layoutDirection();
 
   // compute zoomed rectangles
   // I don't use KoRect, because that ends up producing lots of warnings
@@ -7264,7 +7264,7 @@ bool Cell::calcDirtyFlag()
   return isFormula() ? testFlag( Flag_CalcDirty ) : false;
 }
 
-bool Cell::tqlayoutDirtyFlag() const
+bool Cell::layoutDirtyFlag() const
 {
   return testFlag( Flag_LayoutDirty );
 }
diff --git a/kspread/kspread_cell.h b/kspread/kspread_cell.h
index e7d4e2bb..24662186 100644
--- a/kspread/kspread_cell.h
+++ b/kspread/kspread_cell.h
@@ -681,7 +681,7 @@ public:
      * some cell specific format value like font or text change.
      */
     void setLayoutDirtyFlag( bool format = false );
-    bool tqlayoutDirtyFlag() const;
+    bool layoutDirtyFlag() const;
 
     void clearDisplayDirtyFlag();
     void setDisplayDirtyFlag();
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 6a40cbd9..7340feda 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 *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-  : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+  : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
 {
   d = new Private;
   d->m_loadingInfo = 0L;
@@ -276,7 +276,7 @@ TQValueList<Doc*> Doc::documents()
   return Private::s_docs;
 }
 
-bool Doc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
   //  ElapsedTime et( "      initDoc        " );
 
@@ -311,7 +311,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
             dlgtype = KoTemplateChooseDia::OnlyTemplates;
 
     ret = KoTemplateChooseDia::choose( Factory::global(), f,
-                                       dlgtype, "kspread_template", tqparentWidget );
+                                       dlgtype, "kspread_template", parentWidget );
 
     if ( ret == KoTemplateChooseDia::File )
     {
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index 57f95d8e..f2b7fa02 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -120,7 +120,7 @@ public:
   /**
    * Creates a new document.
    */
-  Doc( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0,
+  Doc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0,
   const char* name = 0, bool singleViewMode = false );
 
   /**
@@ -445,7 +445,7 @@ public:
 
   virtual void addView( KoView *_view );
 
-  virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+  virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
   /**
    * Change the zoom factor to @p z (e.g. 150 for 150%)
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc
index 85690b13..1ed83ac2 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cc
@@ -195,7 +195,7 @@ void FormulaEditorHighlighter::handleBrace( uint index )
   int opType = token.asOperator();
   bool highlightBrace=false;
 
-  //Check where the cursor is in relation to this left or right tqparenthesis token.
+  //Check where the cursor is in relation to this left or right parenthesis token.
   //Only one pair of braces should be highlighted at a time, and if the cursor
   //is between two braces, the inner-most pair should be highlighted.
 
diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cc
index dd000d2e..a1ef3484 100644
--- a/kspread/kspread_factory.cc
+++ b/kspread/kspread_factory.cc
@@ -53,11 +53,11 @@ Factory::~Factory()
   s_dcopObject = 0L;
 }
 
-KParts::Part* Factory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
   bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-  Doc *doc = new Doc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+  Doc *doc = new Doc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
   if ( !bWantKoDocument )
     doc->setReadWrite( false );
diff --git a/kspread/kspread_factory.h b/kspread/kspread_factory.h
index bd2c896a..ddf46099 100644
--- a/kspread/kspread_factory.h
+++ b/kspread/kspread_factory.h
@@ -36,7 +36,7 @@ public:
     Factory( TQObject* tqparent = 0, const char* name = 0 );
     ~Factory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 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 *tqparent = 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 1b0e6d7a..95898cd3 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cc
@@ -369,8 +369,8 @@ TQDomElement Format::saveFormat( TQDomDocument& doc, bool force, bool copy ) con
   }
   else
   {
-    if ( m_pStyle->tqparent() && m_pStyle->tqparentName().length() > 0 )
-      format.setAttribute( "tqparent", m_pStyle->tqparentName() );
+    if ( m_pStyle->tqparent() && m_pStyle->parentName().length() > 0 )
+      format.setAttribute( "tqparent", m_pStyle->parentName() );
   }
 
   if ( hasProperty( PAlign, true ) || hasNoFallBackProperties( PAlign ) || force )
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 70323124..43e4bbec 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -268,7 +268,7 @@ public:
   TQString name;
   int id;
 
-  Sheet::LayoutDirection tqlayoutDirection;
+  Sheet::LayoutDirection layoutDirection;
 
   // true if sheet is hidden
   bool hide;
@@ -365,7 +365,7 @@ Sheet::Sheet (Map* map,
   d->id = s_id++;
   s_mapSheets->insert( d->id, this );
 
-  d->tqlayoutDirection = LeftToRight;
+  d->layoutDirection = LeftToRight;
 
   d->defaultFormat = new Format (this, d->workbook->doc()->styleManager()->defaultStyle());
   d->emptyPen.setStyle( Qt::NoPen );
@@ -452,19 +452,19 @@ int Sheet::id() const
   return d->id;
 }
 
-Sheet::LayoutDirection Sheet::tqlayoutDirection() const
+Sheet::LayoutDirection Sheet::layoutDirection() const
 {
-  return d->tqlayoutDirection;
+  return d->layoutDirection;
 }
 
 void Sheet::setLayoutDirection( LayoutDirection dir )
 {
-  d->tqlayoutDirection = dir;
+  d->layoutDirection = dir;
 }
 
 bool Sheet::isRightToLeft() const
 {
-  return d->tqlayoutDirection == RightToLeft;
+  return d->layoutDirection == RightToLeft;
 }
 
 bool Sheet::isHidden() const
@@ -5921,7 +5921,7 @@ TQDomElement Sheet::saveXML( TQDomDocument& dd )
 
 
     //Laurent: for oasis format I think that we must use style:direction...
-    sheet.setAttribute( "tqlayoutDirection", (d->tqlayoutDirection == RightToLeft) ? "rtl" : "ltr" );
+    sheet.setAttribute( "layoutDirection", (d->layoutDirection == RightToLeft) ? "rtl" : "ltr" );
     sheet.setAttribute( "columnnumber", (int)d->showColumnNumber);
     sheet.setAttribute( "borders", (int)d->showPageBorders);
     sheet.setAttribute( "hide", (int)d->hide);
@@ -6390,7 +6390,7 @@ TQString Sheet::getPart( const TQDomNode & part )
 
 bool Sheet::loadOasis( const TQDomElement& sheetElement, KoOasisLoadingContext& oasisContext, TQDict<Style>& styleMap )
 {
-    d->tqlayoutDirection = LeftToRight;
+    d->layoutDirection = LeftToRight;
     if ( sheetElement.hasAttributeNS( KoXmlNS::table, "style-name" ) )
     {
         TQString stylename = sheetElement.attributeNS( KoXmlNS::table, "style-name", TQString() );
@@ -6594,7 +6594,7 @@ void Sheet::loadOasisMasterLayoutPage( KoStyleStack &styleStack )
     if ( styleStack.hasAttributeNS( KoXmlNS::style, "writing-mode" ) )
     {
         kdDebug()<<"styleStack.hasAttribute( style:writing-mode ) :"<<styleStack.hasAttributeNS( KoXmlNS::style, "writing-mode" )<<endl;
-        d->tqlayoutDirection = ( styleStack.attributeNS( KoXmlNS::style, "writing-mode" )=="lr-tb" ) ? LeftToRight : RightToLeft;
+        d->layoutDirection = ( styleStack.attributeNS( KoXmlNS::style, "writing-mode" )=="lr-tb" ) ? LeftToRight : RightToLeft;
         //TODO
         //<value>lr-tb</value>
         //<value>rl-tb</value>
@@ -7638,22 +7638,22 @@ bool Sheet::loadXML( const TQDomElement& sheet )
     }
 
     bool detectDirection = true;
-    d->tqlayoutDirection = LeftToRight;
-    TQString tqlayoutDir = sheet.attribute( "tqlayoutDirection" );
-    if( !tqlayoutDir.isEmpty() )
+    d->layoutDirection = LeftToRight;
+    TQString layoutDir = sheet.attribute( "layoutDirection" );
+    if( !layoutDir.isEmpty() )
     {
-        if( tqlayoutDir == "rtl" )
+        if( layoutDir == "rtl" )
         {
            detectDirection = false;
-           d->tqlayoutDirection = RightToLeft;
+           d->layoutDirection = RightToLeft;
         }
-        else if( tqlayoutDir == "ltr" )
+        else if( layoutDir == "ltr" )
         {
            detectDirection = false;
-           d->tqlayoutDirection = LeftToRight;
+           d->layoutDirection = LeftToRight;
         }
         else
-            kdDebug()<<" Direction not implemented : "<<tqlayoutDir<<endl;
+            kdDebug()<<" Direction not implemented : "<<layoutDir<<endl;
     }
     if( detectDirection )
        checkContentDirection( d->name );
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index 1ba2e3f5..6266d382 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -307,7 +307,7 @@ public:
     /**
      * Returns the tqlayout direction of the sheet.
      */
-    LayoutDirection tqlayoutDirection() const;
+    LayoutDirection layoutDirection() const;
 
     /**
      * Sets the tqlayout direction of the sheet. For example, for Arabic or Hebrew
@@ -468,7 +468,7 @@ public:
     void adjustSizeMaxY ( double _y );
 
     /**
-     * Sets the @ref Cell::tqlayoutDirtyFlag in all cells.
+     * Sets the @ref Cell::layoutDirtyFlag in all cells.
      */
     void setLayoutDirtyFlag();
     /**
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index de8d4a17..6bb577f6 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -554,7 +554,7 @@ void SheetPrint::printRect( TQPainter& painter, const KoPoint& topLeft,
 
 	      TQPen highlightPen;
 
-            if ( m_pSheet->tqlayoutDirection()==Sheet::RightToLeft )
+            if ( m_pSheet->layoutDirection()==Sheet::RightToLeft )
               cell->paintCell( rect, painter, NULL,
                                KoPoint( view.width() - xpos -
                                    col_lay->dblWidth(), ypos ), TQPoint( x, y ),
diff --git a/kspread/kspread_style.h b/kspread/kspread_style.h
index df1ed131..58922a06 100644
--- a/kspread/kspread_style.h
+++ b/kspread/kspread_style.h
@@ -262,7 +262,7 @@ public:
   Style * clearProperty( Properties p );
 
   CustomStyle * tqparent() const;
-  TQString const & tqparentName() const { return m_parentName; }
+  TQString const & parentName() const { return m_parentName; }
   void setParent( CustomStyle * tqparent );
 
   /**
diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc
index 8c4d86f5..1d570e95 100644
--- a/kspread/kspread_style_manager.cc
+++ b/kspread/kspread_style_manager.cc
@@ -132,8 +132,8 @@ void StyleManager::loadOasisStyleTemplate( KoOasisStyles& oasisStyles )
         CustomStyle * styleData = iter.data();
 
         if ( styleData->name() != "Default" )
-            if ( !styleData->tqparent() && !styleData->tqparentName().isNull() )
-                styleData->setParent( m_oasisStyles[ styleData->tqparentName() ] );
+            if ( !styleData->tqparent() && !styleData->parentName().isNull() )
+                styleData->setParent( m_oasisStyles[ styleData->parentName() ] );
 
         ++iter;
     }
@@ -209,8 +209,8 @@ bool StyleManager::loadXML( TQDomElement const & styles )
   {
     CustomStyle * styleData = iter.data();
 
-    if ( !styleData->tqparent() && !styleData->tqparentName().isNull() )
-      styleData->setParent( m_styles[ styleData->tqparentName() ] );
+    if ( !styleData->tqparent() && !styleData->parentName().isNull() )
+      styleData->setParent( m_styles[ styleData->parentName() ] );
 
     ++iter;
   }
@@ -284,10 +284,10 @@ bool StyleManager::checkCircle( TQString const & name, TQString const & tqparent
   CustomStyle * s = style( tqparent );
   if ( !s || s->tqparent() == 0 )
     return true;
-  if ( s->tqparentName() == name )
+  if ( s->parentName() == name )
     return false;
   else
-    return checkCircle( name, s->tqparentName() );
+    return checkCircle( name, s->parentName() );
 }
 
 bool StyleManager::validateStyleName( TQString const & name, CustomStyle * style )
@@ -316,7 +316,7 @@ void StyleManager::changeName( TQString const & oldName, TQString const & newNam
 
   while ( iter != end )
   {
-    if ( iter.data()->tqparentName() == oldName )
+    if ( iter.data()->parentName() == oldName )
       iter.data()->refreshParentName();
 
     ++iter;
@@ -365,12 +365,12 @@ TQDict<Style> StyleManager::loadOasisAutoStyles( KoOasisStyles& oasisStyles )
 
       if ( it.current()->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
       {
-        TQString tqparentStyleName = it.current()->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
-        if ( m_oasisStyles.tqcontains( tqparentStyleName ) )
+        TQString parentStyleName = it.current()->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+        if ( m_oasisStyles.tqcontains( parentStyleName ) )
         {
-          autoStyles[name]->setParent( m_oasisStyles[tqparentStyleName] );
+          autoStyles[name]->setParent( m_oasisStyles[parentStyleName] );
         }
-        kdDebug() << "\t tqparent-style-name:" << tqparentStyleName << endl;
+        kdDebug() << "\t tqparent-style-name:" << parentStyleName << endl;
       }
       else
       {
diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cc
index ae075fe6..f88c35fc 100644
--- a/kspread/kspread_undo.cc
+++ b/kspread/kspread_undo.cc
@@ -917,12 +917,12 @@ UndoCellFormat::UndoCellFormat( Doc * _doc,
   copyFormat( m_lstFormats, m_lstColFormats, m_lstRowFormats, _sheet );
 }
 
-void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
-                                       TQValueList<tqlayoutColumn> & listCol,
-                                       TQValueList<tqlayoutRow> & listRow,
+void UndoCellFormat::copyFormat(TQValueList<layoutCell> & list,
+                                       TQValueList<layoutColumn> & listCol,
+                                       TQValueList<layoutRow> & listRow,
                                        Sheet * sheet )
 {
-    TQValueList<tqlayoutCell>::Iterator it2;
+    TQValueList<layoutCell>::Iterator it2;
   for ( it2 = list.begin(); it2 != list.end(); ++it2 )
   {
       delete (*it2).l;
@@ -942,7 +942,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
     /* Don't need to go through the loop twice...
       for (int i = range.left(); i <= right; ++i)
       {
-      tqlayoutColumn tmptqlayout;
+      layoutColumn tmptqlayout;
       tmptqlayout.col = i;
       tmptqlayout.l = new ColumnFormat( sheet, i );
       tmptqlayout.l->copy( *(sheet->columnFormat( i )) );
@@ -951,7 +951,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
     */
     for ( int c = range.left(); c <= right; ++c )
     {
-      tqlayoutColumn tmptqlayout;
+      layoutColumn tmptqlayout;
       tmptqlayout.col = c;
       tmptqlayout.l = new ColumnFormat( sheet, c );
       tmptqlayout.l->copy( *(sheet->columnFormat( c )) );
@@ -966,7 +966,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
           continue;
         }
 
-        tqlayoutCell tmptqlayout;
+        layoutCell tmptqlayout;
         tmptqlayout.col = c;
         tmptqlayout.row = cell->row();
         tmptqlayout.l = new Format( sheet, 0 );
@@ -984,7 +984,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
       if ( range.left() <= col && right >= col
           && !c->isPartOfMerged())
       {
-        tqlayoutCell tmptqlayout;
+        layoutCell tmptqlayout;
         tmptqlayout.col = c->column();
         tmptqlayout.row = c->row();
         tmptqlayout.l = new Format( sheet, 0 );
@@ -998,7 +998,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
   {
     for ( int row = range.top(); row <= bottom; ++row )
     {
-      tqlayoutRow tmptqlayout;
+      layoutRow tmptqlayout;
       tmptqlayout.row = row;
       tmptqlayout.l = new RowFormat( sheet, row );
       tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
@@ -1012,7 +1012,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
           cell = sheet->getNextCellRight( cell->column(), row );
           continue;
         }
-        tqlayoutCell tmptqlayout;
+        layoutCell tmptqlayout;
         tmptqlayout.col = cell->column();
         tmptqlayout.row = row;
         tmptqlayout.l = new Format( sheet, 0 );
@@ -1030,7 +1030,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
       if ( range.top() <= row && bottom >= row
            && !c->isPartOfMerged())
       {
-        tqlayoutCell tmptqlayout;
+        layoutCell tmptqlayout;
         tmptqlayout.col = c->column();
         tmptqlayout.row = c->row();
         tmptqlayout.l = new Format( sheet, 0 );
@@ -1048,7 +1048,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
         Cell * cell = sheet->nonDefaultCell( x, y );
         if ( !cell->isPartOfMerged() )
         {
-          tqlayoutCell tmptqlayout;
+          layoutCell tmptqlayout;
           tmptqlayout.col = x;
           tmptqlayout.row = y;
           tmptqlayout.l = new Format( sheet, 0 );
@@ -1062,7 +1062,7 @@ void UndoCellFormat::copyFormat(TQValueList<tqlayoutCell> & list,
 
 UndoCellFormat::~UndoCellFormat()
 {
-    TQValueList<tqlayoutCell>::Iterator it2;
+    TQValueList<layoutCell>::Iterator it2;
     for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
     {
         delete (*it2).l;
@@ -1075,7 +1075,7 @@ UndoCellFormat::~UndoCellFormat()
     }
     m_lstRedoFormats.clear();
 
-    TQValueList<tqlayoutColumn>::Iterator it3;
+    TQValueList<layoutColumn>::Iterator it3;
     for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 )
     {
         delete (*it3).l;
@@ -1088,7 +1088,7 @@ UndoCellFormat::~UndoCellFormat()
     }
     m_lstRedoColFormats.clear();
 
-    TQValueList<tqlayoutRow>::Iterator it4;
+    TQValueList<layoutRow>::Iterator it4;
     for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 )
     {
         delete (*it4).l;
@@ -1119,7 +1119,7 @@ void UndoCellFormat::undo()
     TQRect range = (*it)->rect().normalize();
   if( util_isColumnSelected( range ) )
   {
-    TQValueList<tqlayoutColumn>::Iterator it2;
+    TQValueList<layoutColumn>::Iterator it2;
     for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 )
     {
       ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1128,7 +1128,7 @@ void UndoCellFormat::undo()
   }
   else if( util_isRowSelected( range ) )
   {
-    TQValueList<tqlayoutRow>::Iterator it2;
+    TQValueList<layoutRow>::Iterator it2;
     for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 )
     {
       RowFormat * row = sheet->nonDefaultRowFormat( (*it2).row );
@@ -1136,7 +1136,7 @@ void UndoCellFormat::undo()
     }
   }
 
-  TQValueList<tqlayoutCell>::Iterator it2;
+  TQValueList<layoutCell>::Iterator it2;
   for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
   {
     Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -1167,7 +1167,7 @@ void UndoCellFormat::redo()
     TQRect range = (*it)->rect().normalize();
   if ( util_isColumnSelected( range ) )
   {
-    TQValueList<tqlayoutColumn>::Iterator it2;
+    TQValueList<layoutColumn>::Iterator it2;
     for ( it2 = m_lstRedoColFormats.begin(); it2 != m_lstRedoColFormats.end(); ++it2 )
     {
       ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1176,7 +1176,7 @@ void UndoCellFormat::redo()
   }
   else if( util_isRowSelected( range ) )
   {
-    TQValueList<tqlayoutRow>::Iterator it2;
+    TQValueList<layoutRow>::Iterator it2;
     for ( it2 = m_lstRedoRowFormats.begin(); it2 != m_lstRedoRowFormats.end(); ++it2 )
     {
       RowFormat * row = sheet->nonDefaultRowFormat( (*it2).row );
@@ -1184,7 +1184,7 @@ void UndoCellFormat::redo()
     }
   }
 
-  TQValueList<tqlayoutCell>::Iterator it2;
+  TQValueList<layoutCell>::Iterator it2;
   for ( it2 = m_lstRedoFormats.begin(); it2 != m_lstRedoFormats.end(); ++it2 )
   {
     Cell * cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -1250,10 +1250,10 @@ UndoSort::UndoSort( Doc * _doc, Sheet * _sheet, const TQRect & _selection ) :
   copyAll( m_lstFormats, m_lstColFormats, m_lstRowFormats, _sheet );
 }
 
-void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayoutColumn> & listCol,
-                              TQValueList<tqlayoutRow> & listRow, Sheet * sheet )
+void UndoSort::copyAll(TQValueList<layoutTextCell> & list, TQValueList<layoutColumn> & listCol,
+                              TQValueList<layoutRow> & listRow, Sheet * sheet )
 {
-  TQValueList<tqlayoutTextCell>::Iterator it2;
+  TQValueList<layoutTextCell>::Iterator it2;
   for ( it2 = list.begin(); it2 != list.end(); ++it2 )
   {
       delete (*it2).l;
@@ -1265,7 +1265,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
     Cell * c;
     for (int col = m_rctRect.left(); col <= m_rctRect.right(); ++col)
     {
-      tqlayoutColumn tmptqlayout;
+      layoutColumn tmptqlayout;
       tmptqlayout.col = col;
       tmptqlayout.l = new ColumnFormat( sheet, col );
       tmptqlayout.l->copy( *(sheet->columnFormat( col )) );
@@ -1276,7 +1276,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
       {
         if ( !c->isPartOfMerged() )
         {
-          tqlayoutTextCell tmptqlayout;
+          layoutTextCell tmptqlayout;
           tmptqlayout.col = col;
           tmptqlayout.row = c->row();
           tmptqlayout.l = new Format( sheet, 0 );
@@ -1294,7 +1294,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
     Cell * c;
     for ( int row = m_rctRect.top(); row <= m_rctRect.bottom(); ++row)
     {
-      tqlayoutRow tmptqlayout;
+      layoutRow tmptqlayout;
       tmptqlayout.row = row;
       tmptqlayout.l = new RowFormat( sheet, row );
       tmptqlayout.l->copy( *(sheet->rowFormat( row )) );
@@ -1305,7 +1305,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
       {
         if ( !c->isPartOfMerged() )
         {
-          tqlayoutTextCell tmptqlayout;
+          layoutTextCell tmptqlayout;
           tmptqlayout.col = c->column();
           tmptqlayout.row = row;
           tmptqlayout.l   = new Format( sheet, 0 );
@@ -1328,7 +1328,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
         cell = sheet->nonDefaultCell( x, y );
         if (!cell->isPartOfMerged())
         {
-          tqlayoutTextCell tmptqlayout;
+          layoutTextCell tmptqlayout;
           tmptqlayout.col = x;
           tmptqlayout.row = y;
           tmptqlayout.l   = new Format( sheet, 0 );
@@ -1342,7 +1342,7 @@ void UndoSort::copyAll(TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayou
 
 UndoSort::~UndoSort()
 {
-    TQValueList<tqlayoutTextCell>::Iterator it2;
+    TQValueList<layoutTextCell>::Iterator it2;
     for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
     {
         delete (*it2).l;
@@ -1355,7 +1355,7 @@ UndoSort::~UndoSort()
     }
     m_lstRedoFormats.clear();
 
-    TQValueList<tqlayoutColumn>::Iterator it3;
+    TQValueList<layoutColumn>::Iterator it3;
     for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 )
     {
         delete (*it3).l;
@@ -1368,7 +1368,7 @@ UndoSort::~UndoSort()
     }
     m_lstRedoColFormats.clear();
 
-    TQValueList<tqlayoutRow>::Iterator it4;
+    TQValueList<layoutRow>::Iterator it4;
     for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 )
     {
         delete (*it4).l;
@@ -1397,7 +1397,7 @@ void UndoSort::undo()
 
   if ( util_isColumnSelected( m_rctRect ) )
   {
-    TQValueList<tqlayoutColumn>::Iterator it2;
+    TQValueList<layoutColumn>::Iterator it2;
     for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 )
     {
       ColumnFormat * col = sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1406,7 +1406,7 @@ void UndoSort::undo()
   }
   else if( util_isRowSelected( m_rctRect ) )
   {
-    TQValueList<tqlayoutRow>::Iterator it2;
+    TQValueList<layoutRow>::Iterator it2;
     for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 )
     {
       RowFormat *row= sheet->nonDefaultRowFormat( (*it2).row );
@@ -1414,7 +1414,7 @@ void UndoSort::undo()
     }
   }
 
-  TQValueList<tqlayoutTextCell>::Iterator it2;
+  TQValueList<layoutTextCell>::Iterator it2;
   for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
   {
     Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -1449,7 +1449,7 @@ void UndoSort::redo()
 
     if( util_isColumnSelected( m_rctRect ) )
     {
-      TQValueList<tqlayoutColumn>::Iterator it2;
+      TQValueList<layoutColumn>::Iterator it2;
       for ( it2 = m_lstRedoColFormats.begin(); it2 != m_lstRedoColFormats.end(); ++it2 )
       {
         ColumnFormat *col= sheet->nonDefaultColumnFormat( (*it2).col );
@@ -1458,7 +1458,7 @@ void UndoSort::redo()
     }
     else if( util_isRowSelected( m_rctRect ) )
     {
-      TQValueList<tqlayoutRow>::Iterator it2;
+      TQValueList<layoutRow>::Iterator it2;
       for ( it2 = m_lstRedoRowFormats.begin(); it2 != m_lstRedoRowFormats.end(); ++it2 )
       {
         RowFormat *row= sheet->nonDefaultRowFormat( (*it2).row );
@@ -1466,7 +1466,7 @@ void UndoSort::redo()
       }
     }
 
-    TQValueList<tqlayoutTextCell>::Iterator it2;
+    TQValueList<layoutTextCell>::Iterator it2;
     for ( it2 = m_lstRedoFormats.begin(); it2 != m_lstRedoFormats.end(); ++it2 )
     {
       Cell *cell = sheet->nonDefaultCell( (*it2).col,(*it2).row );
diff --git a/kspread/kspread_undo.h b/kspread/kspread_undo.h
index bb68a43f..f4e90826 100644
--- a/kspread/kspread_undo.h
+++ b/kspread/kspread_undo.h
@@ -60,25 +60,25 @@ int col;
 TQString text;
 };
 
-struct tqlayoutTextCell {
+struct layoutTextCell {
 int row;
 int col;
 Format * l;
 TQString text;
 };
 
-struct tqlayoutCell {
+struct layoutCell {
 int row;
 int col;
 Format *l;
 };
 
-struct tqlayoutColumn {
+struct layoutColumn {
 int col;
 ColumnFormat *l;
 };
 
-struct tqlayoutRow {
+struct layoutRow {
 int row;
 RowFormat *l;
 };
@@ -362,15 +362,15 @@ public:
     virtual void redo();
 
 protected:
-    void copyFormat( TQValueList<tqlayoutCell> &list,TQValueList<tqlayoutColumn> &listCol,TQValueList<tqlayoutRow> &listRow, Sheet* sheet );
+    void copyFormat( TQValueList<layoutCell> &list,TQValueList<layoutColumn> &listCol,TQValueList<layoutRow> &listRow, Sheet* sheet );
 
     Region m_region;
-    TQValueList<tqlayoutCell> m_lstFormats;
-    TQValueList<tqlayoutCell> m_lstRedoFormats;
-    TQValueList<tqlayoutColumn> m_lstColFormats;
-    TQValueList<tqlayoutColumn> m_lstRedoColFormats;
-    TQValueList<tqlayoutRow> m_lstRowFormats;
-    TQValueList<tqlayoutRow> m_lstRedoRowFormats;
+    TQValueList<layoutCell> m_lstFormats;
+    TQValueList<layoutCell> m_lstRedoFormats;
+    TQValueList<layoutColumn> m_lstColFormats;
+    TQValueList<layoutColumn> m_lstRedoColFormats;
+    TQValueList<layoutRow> m_lstRowFormats;
+    TQValueList<layoutRow> m_lstRedoRowFormats;
 
     TQString m_sheetName;
 };
@@ -483,16 +483,16 @@ public:
     virtual void redo();
 
 protected:
-    void copyAll( TQValueList<tqlayoutTextCell> & list, TQValueList<tqlayoutColumn> & listCol,
-                  TQValueList<tqlayoutRow> & listRow, Sheet * sheet );
+    void copyAll( TQValueList<layoutTextCell> & list, TQValueList<layoutColumn> & listCol,
+                  TQValueList<layoutRow> & listRow, Sheet * sheet );
 
     TQRect m_rctRect;
-    TQValueList<tqlayoutTextCell> m_lstFormats;
-    TQValueList<tqlayoutTextCell> m_lstRedoFormats;
-    TQValueList<tqlayoutColumn> m_lstColFormats;
-    TQValueList<tqlayoutColumn> m_lstRedoColFormats;
-    TQValueList<tqlayoutRow> m_lstRowFormats;
-    TQValueList<tqlayoutRow> m_lstRedoRowFormats;
+    TQValueList<layoutTextCell> m_lstFormats;
+    TQValueList<layoutTextCell> m_lstRedoFormats;
+    TQValueList<layoutColumn> m_lstColFormats;
+    TQValueList<layoutColumn> m_lstRedoColFormats;
+    TQValueList<layoutRow> m_lstRowFormats;
+    TQValueList<layoutRow> m_lstRedoRowFormats;
 
     TQString m_sheetName;
 };
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index b667214f..3244a11d 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -468,7 +468,7 @@ void View::Private::initActions()
   // -- cell formatting actions --
 
   actions->cellLayout = new KAction( i18n("Cell Format..."), "cell_layout",
-      TQt::CTRL+ TQt::ALT+ TQt::Key_F, TQT_TQOBJECT(view), TQT_SLOT( tqlayoutDlg() ), ac, "cellLayout" );
+      TQt::CTRL+ TQt::ALT+ TQt::Key_F, TQT_TQOBJECT(view), TQT_SLOT( layoutDlg() ), ac, "cellLayout" );
   actions->cellLayout->setToolTip( i18n("Set the cell formatting.") );
 
   actions->actionExtraProperties = new KAction( i18n( "&Properties" ), "penbrush", 0,
@@ -1975,7 +1975,7 @@ void View::initView()
     TQWidget::setFocusPolicy( TQ_StrongFocus );
     setFocusProxy( d->canvas );
 
-    connect( this, TQT_SIGNAL( tqinvalidated() ), d->canvas, TQT_SLOT( update() ) );
+    connect( this, TQT_SIGNAL( invalidated() ), d->canvas, TQT_SLOT( update() ) );
 
     TQWidget* bottomPart = new TQWidget( this );
     d->tabScrollBarLayout = new TQHBoxLayout( bottomPart );
@@ -3580,7 +3580,7 @@ void View::borderRight()
   if ( d->activeSheet != 0L )
   {
     doc()->emitBeginOperation( false );
-    if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
       d->activeSheet->borderLeft( d->selection, d->actions->borderColor->color() );
     else
       d->activeSheet->borderRight( d->selection, d->actions->borderColor->color() );
@@ -3595,7 +3595,7 @@ void View::setSelectionRightBorderColor( const TQColor & color )
   if ( d->activeSheet != 0L )
   {
     doc()->emitBeginOperation( false );
-    if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
       d->activeSheet->borderLeft( selectionInfo(), color );
     else
       d->activeSheet->borderRight( selectionInfo(), color );
@@ -3610,7 +3610,7 @@ void View::borderLeft()
   if ( d->activeSheet != 0L )
   {
     doc()->emitBeginOperation( false );
-    if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
       d->activeSheet->borderRight( d->selection, d->actions->borderColor->color() );
     else
       d->activeSheet->borderLeft( d->selection, d->actions->borderColor->color() );
@@ -3625,7 +3625,7 @@ void View::setSelectionLeftBorderColor( const TQColor & color )
   if ( d->activeSheet != 0L )
   {
     doc()->emitBeginOperation( false );
-    if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft )
+    if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
       d->activeSheet->borderRight( selectionInfo(), color );
     else
       d->activeSheet->borderLeft( selectionInfo(), color );
@@ -3825,7 +3825,7 @@ void View::setActiveSheet( Sheet * _t, bool updateSheet )
     return;
   }
 
-  if ( oldSheet && oldSheet->tqlayoutDirection()==Sheet::RightToLeft != d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( oldSheet && oldSheet->layoutDirection()==Sheet::RightToLeft != d->activeSheet->layoutDirection()==Sheet::RightToLeft )
     refreshView();
 
   doc()->setDisplaySheet( d->activeSheet );
@@ -3945,7 +3945,7 @@ void View::sheetProperties()
     bool directionChanged = false;
 
     SheetPropertiesDialog* dlg = new SheetPropertiesDialog( this );
-    dlg->setLayoutDirection( d->activeSheet->tqlayoutDirection() );
+    dlg->setLayoutDirection( d->activeSheet->layoutDirection() );
     dlg->setAutoCalc( d->activeSheet->getAutoCalc() );
     dlg->setShowGrid( d->activeSheet->getShowGrid() );
     dlg->setShowPageBorders( d->activeSheet->isShowPageBorders() );
@@ -3961,10 +3961,10 @@ void View::sheetProperties()
     {
         SheetPropertiesCommand* command = new SheetPropertiesCommand( doc(), d->activeSheet );
 
-        if ( d->activeSheet->tqlayoutDirection() != dlg->tqlayoutDirection() )
+        if ( d->activeSheet->layoutDirection() != dlg->layoutDirection() )
             directionChanged = true;
 
-        command->setLayoutDirection( dlg->tqlayoutDirection() );
+        command->setLayoutDirection( dlg->layoutDirection() );
         command->setAutoCalc( dlg->autoCalc() );
         command->setShowGrid( dlg->showGrid() );
         command->setShowPageBorders( dlg->showPageBorders() );
@@ -5568,7 +5568,7 @@ void View::refreshView()
   d->hBorderWidget->setMinimumHeight( doc()->zoomItY( KoGlobal::defaultFont().pointSizeFloat() + 5 ) );
   d->vBorderWidget->setMinimumWidth( doc()->zoomItX( YBORDER_WIDTH ) );
 
-  Sheet::LayoutDirection sheetDir = sheet->tqlayoutDirection();
+  Sheet::LayoutDirection sheetDir = sheet->layoutDirection();
   bool interfaceIsRTL = TQApplication::reverseLayout();
 
   kdDebug()<<" sheetDir == Sheet::LeftToRight :"<<( sheetDir == Sheet::LeftToRight )<<endl;
@@ -5886,7 +5886,7 @@ void View::slotListChoosePopupMenu( )
     h = cell->extraHeight();
   ty += h;
 
-  if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
   {
     tx = canvasWidget()->width() - tx;
   }
@@ -5894,7 +5894,7 @@ void View::slotListChoosePopupMenu( )
   TQPoint p( (int)tx, (int)ty );
   TQPoint p2 = d->canvas->mapToGlobal( p );
 
-  if ( d->activeSheet->tqlayoutDirection()==Sheet::RightToLeft )
+  if ( d->activeSheet->layoutDirection()==Sheet::RightToLeft )
   {
     p2.setX( p2.x() - d->popupListChoose->tqsizeHint().width() + 1 );
   }
@@ -6353,7 +6353,7 @@ void View::equalizeColumn()
 }
 
 
-void View::tqlayoutDlg()
+void View::layoutDlg()
 {
   if (!activeSheet())
 	  return;
diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h
index f82912b3..4a64a52e 100644
--- a/kspread/kspread_view.h
+++ b/kspread/kspread_view.h
@@ -465,7 +465,7 @@ public slots:
     void changeBackgroundColor();
     void sortInc();
     void sortDec();
-    void tqlayoutDlg();
+    void layoutDlg();
     void extraProperties();
     void borderBottom();
     void borderRight();
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index 31a33a0f..5d501798 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -250,7 +250,7 @@ FormatManipulator::FormatManipulator()
 
 FormatManipulator::~FormatManipulator()
 {
-  TQValueList<tqlayoutCell>::Iterator it2;
+  TQValueList<layoutCell>::Iterator it2;
   for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
   {
     delete (*it2).l;
@@ -263,7 +263,7 @@ FormatManipulator::~FormatManipulator()
   }
   m_lstRedoFormats.clear();
 
-  TQValueList<tqlayoutColumn>::Iterator it3;
+  TQValueList<layoutColumn>::Iterator it3;
   for ( it3 = m_lstColFormats.begin(); it3 != m_lstColFormats.end(); ++it3 )
   {
     delete (*it3).l;
@@ -276,7 +276,7 @@ FormatManipulator::~FormatManipulator()
   }
   m_lstRedoColFormats.clear();
 
-  TQValueList<tqlayoutRow>::Iterator it4;
+  TQValueList<layoutRow>::Iterator it4;
   for ( it4 = m_lstRowFormats.begin(); it4 != m_lstRowFormats.end(); ++it4 )
   {
     delete (*it4).l;
@@ -391,7 +391,7 @@ bool FormatManipulator::process (Element *element)
   {  // undoing
     if( element->isColumn() )
     {
-      TQValueList<tqlayoutColumn>::Iterator it2;
+      TQValueList<layoutColumn>::Iterator it2;
       for ( it2 = m_lstColFormats.begin(); it2 != m_lstColFormats.end(); ++it2 )
       {
         ColumnFormat * col = m_sheet->nonDefaultColumnFormat( (*it2).col );
@@ -400,7 +400,7 @@ bool FormatManipulator::process (Element *element)
     }
     else if( element->isRow() )
     {
-      TQValueList<tqlayoutRow>::Iterator it2;
+      TQValueList<layoutRow>::Iterator it2;
       for ( it2 = m_lstRowFormats.begin(); it2 != m_lstRowFormats.end(); ++it2 )
       {
         RowFormat * row = m_sheet->nonDefaultRowFormat( (*it2).row );
@@ -408,7 +408,7 @@ bool FormatManipulator::process (Element *element)
       }
     }
 
-    TQValueList<tqlayoutCell>::Iterator it2;
+    TQValueList<layoutCell>::Iterator it2;
     for ( it2 = m_lstFormats.begin(); it2 != m_lstFormats.end(); ++it2 )
     {
       Cell *cell = m_sheet->nonDefaultCell( (*it2).col,(*it2).row );
@@ -421,12 +421,12 @@ bool FormatManipulator::process (Element *element)
   return true;
 }
 
-void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
-                                   TQValueList<tqlayoutColumn> & listCol,
-                                   TQValueList<tqlayoutRow> & listRow)
+void FormatManipulator::copyFormat(TQValueList<layoutCell> & list,
+                                   TQValueList<layoutColumn> & listCol,
+                                   TQValueList<layoutRow> & listRow)
 {
-  TQValueList<tqlayoutCell>::Iterator end = list.end();
-  for (TQValueList<tqlayoutCell>::Iterator it2 = list.begin(); it2 != end; ++it2)
+  TQValueList<layoutCell>::Iterator end = list.end();
+  for (TQValueList<layoutCell>::Iterator it2 = list.begin(); it2 != end; ++it2)
   {
       delete (*it2).l;
   }
@@ -445,7 +445,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
       /* Don't need to go through the loop twice...
         for (int i = range.left(); i <= right; ++i)
         {
-        tqlayoutColumn tmptqlayout;
+        layoutColumn tmptqlayout;
         tmptqlayout.col = i;
         tmptqlayout.l = new ColumnFormat( m_sheet, i );
         tmptqlayout.l->copy( *(m_sheet->columnFormat( i )) );
@@ -454,7 +454,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
       */
       for ( int col = range.left(); col <= right; ++col )
       {
-        tqlayoutColumn tmptqlayout;
+        layoutColumn tmptqlayout;
         tmptqlayout.col = col;
         tmptqlayout.l = new ColumnFormat( m_sheet, col );
         tmptqlayout.l->copy( *(m_sheet->columnFormat( col )) );
@@ -469,7 +469,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
             continue;
           }
 
-          tqlayoutCell tmptqlayout;
+          layoutCell tmptqlayout;
           tmptqlayout.col = col;
           tmptqlayout.row = cell->row();
           tmptqlayout.l = new Format( m_sheet, 0 );
@@ -487,7 +487,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
         if ( range.left() <= col && right >= col
             && !cell->isPartOfMerged())
         {
-          tqlayoutCell tmptqlayout;
+          layoutCell tmptqlayout;
           tmptqlayout.col = cell->column();
           tmptqlayout.row = cell->row();
           tmptqlayout.l = new Format( m_sheet, 0 );
@@ -501,7 +501,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
     {
       for ( int row = range.top(); row <= bottom; ++row )
       {
-        tqlayoutRow tmptqlayout;
+        layoutRow tmptqlayout;
         tmptqlayout.row = row;
         tmptqlayout.l = new RowFormat( m_sheet, row );
         tmptqlayout.l->copy( *(m_sheet->rowFormat( row )) );
@@ -515,7 +515,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
             cell = m_sheet->getNextCellRight( cell->column(), row );
             continue;
           }
-          tqlayoutCell tmptqlayout;
+          layoutCell tmptqlayout;
           tmptqlayout.col = cell->column();
           tmptqlayout.row = row;
           tmptqlayout.l = new Format( m_sheet, 0 );
@@ -533,7 +533,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
         if ( range.top() <= row && bottom >= row
             && !cell->isPartOfMerged())
         {
-          tqlayoutCell tmptqlayout;
+          layoutCell tmptqlayout;
           tmptqlayout.col = cell->column();
           tmptqlayout.row = cell->row();
           tmptqlayout.l = new Format( m_sheet, 0 );
@@ -551,7 +551,7 @@ void FormatManipulator::copyFormat(TQValueList<tqlayoutCell> & list,
           Cell * cell = m_sheet->nonDefaultCell( col, row );
           if ( !cell->isPartOfMerged() )
           {
-            tqlayoutCell tmptqlayout;
+            layoutCell tmptqlayout;
             tmptqlayout.col = col;
             tmptqlayout.row = row;
             tmptqlayout.l = new Format( m_sheet, 0 );
diff --git a/kspread/manipulator.h b/kspread/manipulator.h
index 9af94032..622362bc 100644
--- a/kspread/manipulator.h
+++ b/kspread/manipulator.h
@@ -42,18 +42,18 @@ class RowFormat;
 class Sheet;
 
 
-// struct tqlayoutCell {
+// struct layoutCell {
 //   int row;
 //   int col;
 //   Format *l;
 // };
 // 
-// struct tqlayoutColumn {
+// struct layoutColumn {
 //   int col;
 //   ColumnFormat *l;
 // };
 // 
-// struct tqlayoutRow {
+// struct layoutRow {
 //   int row;
 //   RowFormat *l;
 // };
@@ -176,9 +176,9 @@ protected:
   virtual bool preProcessing();
   virtual bool process(Element*);
 
-  void copyFormat(TQValueList<tqlayoutCell> &list,
-                  TQValueList<tqlayoutColumn> &listCol,
-                  TQValueList<tqlayoutRow> &listRow);
+  void copyFormat(TQValueList<layoutCell> &list,
+                  TQValueList<layoutColumn> &listCol,
+                  TQValueList<layoutRow> &listRow);
   bool testCondition(RowFormat*);
   void doWork(Format*, bool isTop, bool isBottom, bool isLeft, bool isRight);
   void prepareCell(Cell*);
@@ -187,12 +187,12 @@ private:
   TQ_UINT32 m_properties;
 
   // TODO Stefan: find a more elegant way to store the format
-  TQValueList<tqlayoutCell> m_lstFormats;
-  TQValueList<tqlayoutCell> m_lstRedoFormats;
-  TQValueList<tqlayoutColumn> m_lstColFormats;
-  TQValueList<tqlayoutColumn> m_lstRedoColFormats;
-  TQValueList<tqlayoutRow> m_lstRowFormats;
-  TQValueList<tqlayoutRow> m_lstRedoRowFormats;
+  TQValueList<layoutCell> m_lstFormats;
+  TQValueList<layoutCell> m_lstRedoFormats;
+  TQValueList<layoutColumn> m_lstColFormats;
+  TQValueList<layoutColumn> m_lstRedoColFormats;
+  TQValueList<layoutRow> m_lstRowFormats;
+  TQValueList<layoutRow> m_lstRedoRowFormats;
 
   // SetSelectionFontWorker
   // SetSelectionSizeWorker
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index a8cdc22a..dc92e9f5 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -167,7 +167,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *tqparent, const ch
 //
 
 
-    // First the widgets that are the tqparents of the buttons
+    // First the widgets that are the parents of the buttons
     mSmallPage = new TQWidget(this);
     mLargePage = new TQWidget(this);
 
@@ -569,8 +569,8 @@ void TQtCalculator::updateGeometry()
     // Button groups (base and angle)
     //
     //TQButtonGroup *g;
-    //g = (TQButtonGroup*)(anglebutton[0]->tqparentWidget());
-    //g = (TQButtonGroup*)(basebutton[0]->tqparentWidget());
+    //g = (TQButtonGroup*)(anglebutton[0]->parentWidget());
+    //g = (TQButtonGroup*)(basebutton[0]->parentWidget());
 
     //
     // Calculator buttons
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
index b2c82866..712b11b4 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialogbase.ui
@@ -199,7 +199,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kdatewidget.h</includehint>
     <includehint>kdatewidget.h</includehint>
diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
index cedc82cc..8217a751 100755
--- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
+++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py
@@ -22,10 +22,10 @@ except (ImportError):
 # Samples.
 
 class Widget(qt.QHBox):
-	def __init__(self, tqparentwidget, label = None):
-		self.tqparentwidget = tqparentwidget
+	def __init__(self, parentwidget, label = None):
+		self.parentwidget = parentwidget
 		import qt
-		qt.QHBox.__init__(self, tqparentwidget)
+		qt.QHBox.__init__(self, parentwidget)
 		self.setMargin(4)
 		self.setSpacing(4)
 		if label != None: qt.QLabel(label, self)
@@ -33,10 +33,10 @@ class Widget(qt.QHBox):
 		return None
 
 class ListWidget(Widget):
-	def __init__(self, tqparentwidget, label):
+	def __init__(self, parentwidget, label):
 		import qt
 		global Widget
-		Widget.__init__(self, tqparentwidget, label)
+		Widget.__init__(self, parentwidget, label)
 		self.combo = qt.QComboBox(self)
 		self.combo.setEditable(True)
 		self.setStretchFactor(self.combo,1)
@@ -44,22 +44,22 @@ class ListWidget(Widget):
 		return self.combo.currentText()
 
 class EditWidget(Widget):
-	def __init__(self, tqparentwidget, label):
+	def __init__(self, parentwidget, label):
 		import qt
 		global Widget
-		Widget.__init__(self, tqparentwidget, label)
+		Widget.__init__(self, parentwidget, label)
 		self.edit = qt.QLineEdit(self)
 		self.setStretchFactor(self.edit,1)
 	def value(self):
 		return self.edit.text()
 
 class FileWidget(Widget):
-	def __init__(self, tqparentwidget, label, filtertqmask, openfiledialog = True):
+	def __init__(self, parentwidget, label, filtertqmask, openfiledialog = True):
 		self.filtertqmask = filtertqmask
 		self.openfiledialog = openfiledialog
 		import qt
 		global Widget
-		Widget.__init__(self, tqparentwidget, label)
+		Widget.__init__(self, parentwidget, label)
 		self.edit = qt.QLineEdit(self)
 		self.setStretchFactor(self.edit,1)
 		btn = qt.QPushButton("...",self)
@@ -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.tqparentwidget) )
+			filename = str( qt.QFileDialog.getOpenFileName(text, self.filtertqmask, self.parentwidget) )
 		else:
-			filename = qt.QFileDialog.getSaveFileName(text, self.filtertqmask, self.tqparentwidget)
+			filename = qt.QFileDialog.getSaveFileName(text, self.filtertqmask, self.parentwidget)
 		if filename != "": self.edit.setText( filename )
 	def value(self):
 		return self.edit.text()
@@ -81,33 +81,33 @@ class Samples:
 	# KexiDB
 
 	class KexiDB:
-		def __init__(self, tqparentwidget):
-			self.tqparentwidget = tqparentwidget
+		def __init__(self, parentwidget):
+			self.parentwidget = parentwidget
 
 		class _ProjectWidget(FileWidget):
-			def __init__(self, tqparentwidget):
+			def __init__(self, parentwidget):
 				global FileWidget
-				FileWidget.__init__(self, tqparentwidget, "Project File:", "*.kexi *.kexis *.kexic;;*")
+				FileWidget.__init__(self, parentwidget, "Project File:", "*.kexi *.kexis *.kexic;;*")
 
 		class _DriverWidget(ListWidget):
-			def __init__(self, tqparentwidget):
+			def __init__(self, parentwidget):
 				global ListWidget
-				ListWidget.__init__(self, tqparentwidget, "Driver:")
+				ListWidget.__init__(self, parentwidget, "Driver:")
 				import krosskexidb
 				for driver in krosskexidb.DriverManager().driverNames():
 					self.combo.insertItem(driver)
 
 		class _TableWidget(ListWidget):
-			def __init__(self, tqparentwidget):
+			def __init__(self, parentwidget):
 				global ListWidget
-				ListWidget.__init__(self, tqparentwidget, "Table:")
+				ListWidget.__init__(self, parentwidget, "Table:")
 
 		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):
 				self.widgets = {
-					"DriverName" : Samples.KexiDB._DriverWidget( tqparent.tqparentwidget ),
+					"DriverName" : Samples.KexiDB._DriverWidget( tqparent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -127,7 +127,7 @@ class Samples:
 			name = "Connect with file"
 			def __init__(self, tqparent):
 				self.widgets = {
-					"ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.tqparentwidget ),
+					"ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -166,8 +166,8 @@ class Samples:
 			name = "Iterate through table"
 			def __init__(self, tqparent):
 				self.widgets = {
-					"ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.tqparentwidget ),
-					"TableName" : Samples.KexiDB._TableWidget( tqparent.tqparentwidget ),
+					"ProjectFile" : Samples.KexiDB._ProjectWidget( tqparent.parentwidget ),
+					"TableName" : Samples.KexiDB._TableWidget( tqparent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -216,13 +216,13 @@ class Samples:
 	# KSpread
 
 	class KSpread:
-		def __init__(self, tqparentwidget):
-			self.tqparentwidget = tqparentwidget
+		def __init__(self, parentwidget):
+			self.parentwidget = parentwidget
 
 		class _SheetWidget(ListWidget):
-			def __init__(self, tqparentwidget, label = "Sheet:"):
+			def __init__(self, parentwidget, label = "Sheet:"):
 				global ListWidget
-				ListWidget.__init__(self, tqparentwidget, label)
+				ListWidget.__init__(self, parentwidget, label)
 
 				try:
 					import krosskspreadcore
@@ -235,9 +235,9 @@ class Samples:
 					print trace
 
 		class _CellsWidget(ListWidget):
-			def __init__(self, tqparentwidget):
+			def __init__(self, parentwidget):
 				global ListWidget
-				ListWidget.__init__(self, tqparentwidget, "Cells (col1:row1 - col2:row2):")
+				ListWidget.__init__(self, parentwidget, "Cells (col1:row1 - col2:row2):")
 				self.combo.insertItem( "1:1 - %s:%s" % (5,10) )
 				self.combo.insertItem( "1:1 - %s:%s" % (256,256) )
 				self.combo.insertItem( "1:1 - %s:%s" % (32767,32767) )
@@ -245,15 +245,15 @@ class Samples:
 				return [ [ int(i) for i in item.split(':') ] for item in str( ListWidget.value(self) ).split('-') ]
 
 		class _ValueWidget(EditWidget):
-			def __init__(self, tqparentwidget):
+			def __init__(self, parentwidget):
 				global EditWidget
-				EditWidget.__init__(self, tqparentwidget, "Value:")
+				EditWidget.__init__(self, parentwidget, "Value:")
 				self.edit.setText("Some text")
 
 		class _ColorWidget(EditWidget):
-			def __init__(self, tqparentwidget,label,color):
+			def __init__(self, parentwidget,label,color):
 				global EditWidget
-				EditWidget.__init__(self, tqparentwidget, "%s (RGB):" % label)
+				EditWidget.__init__(self, parentwidget, "%s (RGB):" % label)
 				self.edit.setText(color)
 			def value(self):
 				return "#%s" % EditWidget.value(self)
@@ -264,9 +264,9 @@ class Samples:
 			def __init__(self, tqparent):
 				pass
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ),
-					"Cells" : Samples.KSpread._CellsWidget( tqparent.tqparentwidget ),
-					"Value" : Samples.KSpread._ValueWidget( tqparent.tqparentwidget ),
+					"SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
+					"Cells" : Samples.KSpread._CellsWidget( tqparent.parentwidget ),
+					"Value" : Samples.KSpread._ValueWidget( tqparent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -295,10 +295,10 @@ class Samples:
 			def __init__(self, tqparent):
 				pass
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget),
-					"Cells" : Samples.KSpread._CellsWidget( tqparent.tqparentwidget ),
-					"TextColor" : Samples.KSpread._ColorWidget( tqparent.tqparentwidget, "Textcolor", "ff0000" ),
-					"BackgroundColor" : Samples.KSpread._ColorWidget( tqparent.tqparentwidget, "Backgroundcolor", "c0c0c0" ),
+					"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" ),
 				}
 			def getCode(self):
 				return (
@@ -327,7 +327,7 @@ class Samples:
 			def __init__(self, tqparent):
 				pass
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ),
+					"SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -354,7 +354,7 @@ class Samples:
 			name = "Details about a sheet"
 			def __init__(self, tqparent):
 				self.widgets = {
-					"SheetName" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ),
+					"SheetName" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
 				}
 			def getCode(self):
 				return (
@@ -379,7 +379,7 @@ class Samples:
 			def __init__(self, tqparent):
 				global FileWidget
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.tqparentwidget, "XML File:", "*.xml;;*" ),
+					"FileName" : FileWidget( tqparent.parentwidget, "XML File:", "*.xml;;*" ),
 				}
 			def getCode(self):
 				return (
@@ -416,7 +416,7 @@ class Samples:
 			def __init__(self, tqparent):
 				global FileWidget
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.tqparentwidget, "XML File:", "*.xml;;*", False ),
+					"FileName" : FileWidget( tqparent.parentwidget, "XML File:", "*.xml;;*", False ),
 				}
 			def getCode(self):
 				return (
@@ -453,8 +453,8 @@ class Samples:
 			name = "Copy sheets"
 			def __init__(self, tqparent):
 				self.widgets = {
-					"SourceSheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget, "Source sheet:" ),
-					"TargetSheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget, "Target sheet:" ),
+					"SourceSheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget, "Source sheet:" ),
+					"TargetSheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget, "Target sheet:" ),
 				}
 			def getCode(self):
 				return (
@@ -482,8 +482,8 @@ class Samples:
 			name = "Load data from CSV file into sheet"
 			def __init__(self, tqparent):
 				self.widgets = {
-					"Sheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ),
-					"FileName" : FileWidget( tqparent.tqparentwidget, "CSV File:", "*.csv;;*", True ),
+					"Sheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
+					"FileName" : FileWidget( tqparent.parentwidget, "CSV File:", "*.csv;;*", True ),
 				}
 			def getCode(self):
 				return (
@@ -521,8 +521,8 @@ class Samples:
 			name = "Save data from a sheet into a CSV file"
 			def __init__(self, tqparent):
 				self.widgets = {
-					"Sheet" : Samples.KSpread._SheetWidget( tqparent.tqparentwidget ),
-					"FileName" : FileWidget( tqparent.tqparentwidget, "CSV File:", "*.csv;;*", False ),
+					"Sheet" : Samples.KSpread._SheetWidget( tqparent.parentwidget ),
+					"FileName" : FileWidget( tqparent.parentwidget, "CSV File:", "*.csv;;*", False ),
 				}
 			def getCode(self):
 				return (
@@ -557,8 +557,8 @@ class Samples:
 	# PyQt
 
 	class PyQt:
-		def __init__(self, tqparentwidget):
-			self.tqparentwidget = tqparentwidget
+		def __init__(self, parentwidget):
+			self.parentwidget = parentwidget
 
 		class OpenFileDialog:
 			""" Show the usage of the openfile dialog with QFileDialog. """
@@ -566,7 +566,7 @@ class Samples:
 			def __init__(self, tqparent):
 				pass
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.tqparentwidget, "Open File:", "*.txt *.html;;*" ),
+					"FileName" : FileWidget( tqparent.parentwidget, "Open File:", "*.txt *.html;;*" ),
 				}
 			def getCode(self):
 				return (
@@ -581,7 +581,7 @@ class Samples:
 			def __init__(self, tqparent):
 				pass
 				self.widgets = {
-					"FileName" : FileWidget( tqparent.tqparentwidget, "Save File:", "*.txt *.html;;*", False ),
+					"FileName" : FileWidget( tqparent.parentwidget, "Save File:", "*.txt *.html;;*", False ),
 				}
 			def getCode(self):
 				return (
@@ -622,8 +622,8 @@ class Samples:
 			def __init__(self, tqparent):
 				global EditWidget
 				self.widgets = {
-					"Caption" : EditWidget( tqparent.tqparentwidget, "Caption" ),
-					"Message" : EditWidget( tqparent.tqparentwidget, "Message" ),
+					"Caption" : EditWidget( tqparent.parentwidget, "Caption" ),
+					"Message" : EditWidget( tqparent.parentwidget, "Message" ),
 				}
 			def getCode(self):
 				return (
@@ -640,8 +640,8 @@ class Samples:
 	# DCOP
 
 	class DCOP:
-		def __init__(self, tqparentwidget):
-			self.tqparentwidget = tqparentwidget
+		def __init__(self, parentwidget):
+			self.parentwidget = parentwidget
 
 		class PrintClipboard:
 			""" Print the content from the clipper via DCOP. """
diff --git a/kspread/tests/formula_tester.cc b/kspread/tests/formula_tester.cc
index b7f9f227..19a70d61 100644
--- a/kspread/tests/formula_tester.cc
+++ b/kspread/tests/formula_tester.cc
@@ -252,7 +252,7 @@ void FormulaEvalTester::run()
   CHECK_EVAL( "1.2--COS(0)", Value(2.2) );
   CHECK_EVAL( "1.3---COS(0)", Value(0.3) );
 
-  // no tqparentheses, checking operator precendences
+  // no parentheses, checking operator precendences
   CHECK_EVAL( "14+3*77", Value(245) );
   CHECK_EVAL( "14-3*77", Value(-217) );
   CHECK_EVAL( "26*4+81", Value(185) );
diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc
index ad186817..72410f53 100644
--- a/kspread/tests/inspector.cc
+++ b/kspread/tests/inspector.cc
@@ -169,7 +169,7 @@ void Inspector::Private::handleSheet()
   sheetView->clear();
   
   new TQListViewItem( sheetView, "Name", sheet->sheetName() ) ;
-  new TQListViewItem( sheetView, "Layout Direction", dirAsString( sheet->tqlayoutDirection() ) );
+  new TQListViewItem( sheetView, "Layout Direction", dirAsString( sheet->layoutDirection() ) );
 }
 
 void Inspector::Private::handleDep()
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 0f554866..aa5cec46 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -41,8 +41,8 @@
 
 #include "kudesigner_view.h"
 
-KudesignerDoc::KudesignerDoc( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
-        : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ), m_plugin( 0 ), m_propPos( DockRight ), m_modified( false )
+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 )
 {
     setInstance( KudesignerFactory::global(), false );
     setTemplateType("kudesigner_template");
@@ -66,7 +66,7 @@ void KudesignerDoc::addCommand( KCommand *cmd )
     /*    history->addCommand(cmd);*/
 }
 
-bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* tqparentWidget )
+bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* parentWidget )
 {
     // If nothing is loaded, do initialize here
     bool ok = FALSE;
@@ -82,7 +82,7 @@ bool KudesignerDoc::initDoc( InitDocFlags flags, TQWidget* tqparentWidget )
 
     KoTemplateChooseDia::ReturnType ret = KoTemplateChooseDia::choose(
                                               KudesignerFactory::global(), file,
-                                              dlgtype, "kudesigner_template", tqparentWidget );
+                                              dlgtype, "kudesigner_template", parentWidget );
     if ( ret == KoTemplateChooseDia::Template )
     {
         resetURL();
diff --git a/kugar/kudesigner/kudesigner_doc.h b/kugar/kudesigner/kudesigner_doc.h
index 318876d2..659b3e1c 100644
--- a/kugar/kudesigner/kudesigner_doc.h
+++ b/kugar/kudesigner/kudesigner_doc.h
@@ -39,13 +39,13 @@ class KudesignerDoc: public KoDocument
     Q_OBJECT
   TQ_OBJECT
 public:
-    KudesignerDoc( TQWidget *tqparentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KudesignerDoc( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
 
     ~KudesignerDoc();
 
     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* tqparentWidget );
+    virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget );
 
     virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, const TQDomDocument&, KoStore* );
     virtual bool saveOasis( KoStore*, KoXmlWriter* );
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp
index 2c90d1d8..f8712f03 100644
--- a/kugar/kudesigner/kudesigner_factory.cpp
+++ b/kugar/kudesigner/kudesigner_factory.cpp
@@ -43,13 +43,13 @@ KudesignerFactory::~KudesignerFactory()
     s_global = 0L;
 }
 
-KParts::Part* KudesignerFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & data )
+KParts::Part* KudesignerFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, 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 );
-    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    KudesignerDoc *part = new KudesignerDoc( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    KudesignerDoc *part = new KudesignerDoc( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
         part->setReadWrite( false );
diff --git a/kugar/kudesigner/kudesigner_factory.h b/kugar/kudesigner/kudesigner_factory.h
index 82eb7bb8..fd8956f6 100644
--- a/kugar/kudesigner/kudesigner_factory.h
+++ b/kugar/kudesigner/kudesigner_factory.h
@@ -33,7 +33,7 @@ public:
     KudesignerFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KudesignerFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 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 *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() );
 
     static KInstance* global();
 
diff --git a/kugar/kudesigner_lib/line.cpp b/kugar/kudesigner_lib/line.cpp
index caff18a1..fb5a56d5 100644
--- a/kugar/kudesigner_lib/line.cpp
+++ b/kugar/kudesigner_lib/line.cpp
@@ -113,7 +113,7 @@ void Line::setSection( Band *section )
 {
     props[ "X1" ].setValue( ( int ) ( x() - section->x() ) );
     props[ "Y1" ].setValue( ( int ) ( y() - section->y() ) );
-    tqparentSection = section;
+    parentSection = section;
 }
 
 void Line::updateGeomProps()
diff --git a/kugar/kudesigner_lib/reportitem.cpp b/kugar/kudesigner_lib/reportitem.cpp
index c986c970..78446a9e 100644
--- a/kugar/kudesigner_lib/reportitem.cpp
+++ b/kugar/kudesigner_lib/reportitem.cpp
@@ -88,19 +88,19 @@ void ReportItem::updateGeomProps()
 
 Band *ReportItem::section()
 {
-    return tqparentSection;
+    return parentSection;
 }
 
 void ReportItem::setSection( Band *section )
 {
     props[ "X" ].setValue( ( int ) ( x() - section->x() ) );
     props[ "Y" ].setValue( ( int ) ( y() - section->y() ) );
-    tqparentSection = section;
+    parentSection = section;
 }
 
 void ReportItem::setSectionUndestructive( Band *section )
 {
-    tqparentSection = section;
+    parentSection = section;
 }
 
 TQString ReportItem::getXml()
diff --git a/kugar/kudesigner_lib/reportitem.h b/kugar/kudesigner_lib/reportitem.h
index 5d10545c..47c5838c 100644
--- a/kugar/kudesigner_lib/reportitem.h
+++ b/kugar/kudesigner_lib/reportitem.h
@@ -37,7 +37,7 @@ public:
             : Box( x, y, width, height, canvas )
     {
         setZ( 20 );
-        tqparentSection = 0;
+        parentSection = 0;
     }
     virtual int rtti() const
     {
@@ -74,7 +74,7 @@ public:
 
 protected:
     friend class View;
-    Band *tqparentSection;
+    Band *parentSection;
 };
 
 }
diff --git a/kugar/kudesigner_lib/view.cpp b/kugar/kudesigner_lib/view.cpp
index a74bbd61..6c5c4404 100644
--- a/kugar/kudesigner_lib/view.cpp
+++ b/kugar/kudesigner_lib/view.cpp
@@ -474,10 +474,10 @@ void View::contentsMouseMoveEvent( TQMouseEvent* e )
     {
         double newXPos = moving->x() + p.x() - moving_start.x();
         double newYPos = moving->y() + p.y() - moving_start.y();
-        fixMinValues( newYPos, moving->tqparentSection->y(), moving_offsetY );
-        fixMinValues( newXPos, moving->tqparentSection->x(), moving_offsetX );
-        fixMaxValues( newYPos, moving->height(), moving->tqparentSection->y() + moving->tqparentSection->height(), moving_offsetY );
-        fixMaxValues( newXPos, moving->width(), moving->tqparentSection->x() + moving->tqparentSection->width(), moving_offsetX );
+        fixMinValues( newYPos, moving->parentSection->y(), moving_offsetY );
+        fixMinValues( newXPos, moving->parentSection->x(), moving_offsetX );
+        fixMaxValues( newYPos, moving->height(), moving->parentSection->y() + moving->parentSection->height(), moving_offsetY );
+        fixMaxValues( newXPos, moving->width(), moving->parentSection->x() + moving->parentSection->width(), moving_offsetX );
 
         double sx = newXPos;
         double sy = newYPos;
diff --git a/kugar/lib/inputmask.cpp b/kugar/lib/inputmask.cpp
index 08d67b26..8194a211 100644
--- a/kugar/lib/inputmask.cpp
+++ b/kugar/lib/inputmask.cpp
@@ -23,17 +23,17 @@ InputMask::InputMask( TQObject *tqparent, const char *name )
         m_maxLength( 32767 ),
         m_blank( ' ' ),
         m_tqmask( TQString() ),
-        m_tqmaskData( 0L )
+        m_maskData( 0L )
 {}
 
 InputMask::~InputMask()
 {
-    delete [] m_tqmaskData;
+    delete [] m_maskData;
 }
 
 TQString InputMask::tqmask() const
 {
-    return ( m_tqmaskData ? m_tqmask + ';' + m_blank : TQString() );
+    return ( m_maskData ? m_tqmask + ';' + m_blank : TQString() );
 }
 
 void InputMask::setMask( const TQString &tqmask )
@@ -43,28 +43,28 @@ void InputMask::setMask( const TQString &tqmask )
 
 TQString InputMask::formatText( const TQString &txt )
 {
-    return tqmaskString( 0, txt, true );
+    return maskString( 0, txt, true );
 }
 
-void InputMask::parseInputMask( const TQString &tqmaskFields )
+void InputMask::parseInputMask( const TQString &maskFields )
 {
-    if ( tqmaskFields.isEmpty() || tqmaskFields.section( ';', 0, 0 ).isEmpty() )
+    if ( maskFields.isEmpty() || maskFields.section( ';', 0, 0 ).isEmpty() )
     {
-        if ( m_tqmaskData )
+        if ( m_maskData )
         {
-            delete [] m_tqmaskData;
-            m_tqmaskData = 0;
+            delete [] m_maskData;
+            m_maskData = 0;
             m_maxLength = 32767;
         }
         return ;
     }
 
-    m_tqmask = tqmaskFields.section( ';', 0, 0 );
-    m_blank = tqmaskFields.section( ';', 1, 1 ).at( 0 );
+    m_tqmask = maskFields.section( ';', 0, 0 );
+    m_blank = maskFields.section( ';', 1, 1 ).at( 0 );
     if ( m_blank.isNull() )
         m_blank = ' ';
 
-    // calculate m_maxLength / m_tqmaskData length
+    // calculate m_maxLength / m_maskData length
     m_maxLength = 0;
     TQChar c = 0;
     uint i;
@@ -83,8 +83,8 @@ void InputMask::parseInputMask( const TQString &tqmaskFields )
             m_maxLength++;
     }
 
-    delete [] m_tqmaskData;
-    m_tqmaskData = new MaskInputData[ m_maxLength ];
+    delete [] m_maskData;
+    m_maskData = new MaskInputData[ m_maxLength ];
 
     MaskInputData::Casemode m = MaskInputData::NoCaseMode;
     c = 0;
@@ -97,9 +97,9 @@ void InputMask::parseInputMask( const TQString &tqmaskFields )
         if ( escape )
         {
             s = TRUE;
-            m_tqmaskData[ index ].tqmaskChar = c;
-            m_tqmaskData[ index ].separator = s;
-            m_tqmaskData[ index ].caseMode = m;
+            m_maskData[ index ].maskChar = c;
+            m_maskData[ index ].separator = s;
+            m_maskData[ index ].caseMode = m;
             index++;
             escape = FALSE;
         }
@@ -144,9 +144,9 @@ void InputMask::parseInputMask( const TQString &tqmaskFields )
 
             if ( !escape )
             {
-                m_tqmaskData[ index ].tqmaskChar = c;
-                m_tqmaskData[ index ].separator = s;
-                m_tqmaskData[ index ].caseMode = m;
+                m_maskData[ index ].maskChar = c;
+                m_maskData[ index ].separator = s;
+                m_maskData[ index ].caseMode = m;
                 index++;
             }
         }
@@ -207,7 +207,7 @@ bool InputMask::isValidInput( TQChar key, TQChar tqmask ) const
     return FALSE;
 }
 
-TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) const
+TQString InputMask::maskString( uint pos, const TQString &str, bool clear ) const
 {
     if ( pos >= ( uint ) m_maxLength )
         return TQString::tqfromLatin1( "" );
@@ -222,18 +222,18 @@ TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) co
     {
         if ( strIndex < str.length() )
         {
-            if ( m_tqmaskData[ i ].separator )
+            if ( m_maskData[ i ].separator )
             {
-                s += m_tqmaskData[ i ].tqmaskChar;
-                if ( str[ ( int ) strIndex ] == m_tqmaskData[ i ].tqmaskChar )
+                s += m_maskData[ i ].maskChar;
+                if ( str[ ( int ) strIndex ] == m_maskData[ i ].maskChar )
                     strIndex++;
                 ++i;
             }
             else
             {
-                if ( isValidInput( str[ ( int ) strIndex ], m_tqmaskData[ i ].tqmaskChar ) )
+                if ( isValidInput( str[ ( int ) strIndex ], m_maskData[ i ].maskChar ) )
                 {
-                    switch ( m_tqmaskData[ i ].caseMode )
+                    switch ( m_maskData[ i ].caseMode )
                     {
                     case MaskInputData::Upper:
                         s += str[ ( int ) strIndex ].upper();
@@ -252,7 +252,7 @@ TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) co
                     int n = findInMask( i, TRUE, TRUE, str[ ( int ) strIndex ] );
                     if ( n != -1 )
                     {
-                        if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_tqmaskData[ i - 1 ].separator || m_tqmaskData[ i - 1 ].tqmaskChar != str[ ( int ) strIndex ] ) ) )
+                        if ( str.length() != 1 || i == 0 || ( i > 0 && ( !m_maskData[ i - 1 ].separator || m_maskData[ i - 1 ].maskChar != str[ ( int ) strIndex ] ) ) )
                         {
                             s += fill.mid( i, n - i + 1 );
                             i = n + 1; // update i to tqfind + 1
@@ -265,7 +265,7 @@ TQString InputMask::tqmaskString( uint pos, const TQString &str, bool clear ) co
                         if ( n != -1 )
                         {
                             s += fill.mid( i, n - i );
-                            switch ( m_tqmaskData[ n ].caseMode )
+                            switch ( m_maskData[ n ].caseMode )
                             {
                             case MaskInputData::Upper:
                                 s += str[ ( int ) strIndex ].upper();
@@ -298,8 +298,8 @@ TQString InputMask::clearString( uint pos, uint len ) const
     TQString s;
     int end = TQMIN( ( uint ) m_maxLength, pos + len );
     for ( int i = pos; i < end; i++ )
-        if ( m_tqmaskData[ i ].separator )
-            s += m_tqmaskData[ i ].tqmaskChar;
+        if ( m_maskData[ i ].separator )
+            s += m_maskData[ i ].maskChar;
         else
             s += m_blank;
 
@@ -308,14 +308,14 @@ TQString InputMask::clearString( uint pos, uint len ) const
 
 TQString InputMask::stripString( const TQString &str ) const
 {
-    if ( !m_tqmaskData )
+    if ( !m_maskData )
         return str;
 
     TQString s;
     int end = TQMIN( m_maxLength, ( int ) str.length() );
     for ( int i = 0; i < end; i++ )
-        if ( m_tqmaskData[ i ].separator )
-            s += m_tqmaskData[ i ].tqmaskChar;
+        if ( m_maskData[ i ].separator )
+            s += m_maskData[ i ].maskChar;
         else
             if ( str[ i ] != m_blank )
                 s += str[ i ];
@@ -336,16 +336,16 @@ int InputMask::findInMask( int pos, bool forward, bool findSeparator, TQChar sea
     {
         if ( findSeparator )
         {
-            if ( m_tqmaskData[ i ].separator && m_tqmaskData[ i ].tqmaskChar == searchChar )
+            if ( m_maskData[ i ].separator && m_maskData[ i ].maskChar == searchChar )
                 return i;
         }
         else
         {
-            if ( !m_tqmaskData[ i ].separator )
+            if ( !m_maskData[ i ].separator )
             {
                 if ( searchChar.isNull() )
                     return i;
-                else if ( isValidInput( searchChar, m_tqmaskData[ i ].tqmaskChar ) )
+                else if ( isValidInput( searchChar, m_maskData[ i ].maskChar ) )
                     return i;
             }
         }
diff --git a/kugar/lib/inputmask.h b/kugar/lib/inputmask.h
index 98d5c717..93889a16 100644
--- a/kugar/lib/inputmask.h
+++ b/kugar/lib/inputmask.h
@@ -35,9 +35,9 @@ public:
     TQString formatText( const TQString &txt );
 
 private:
-    void parseInputMask( const TQString &tqmaskFields );
+    void parseInputMask( const TQString &maskFields );
     bool isValidInput( TQChar key, TQChar tqmask ) const;
-    TQString tqmaskString( uint pos, const TQString &str, bool clear = FALSE ) 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;
     int findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar = TQChar() ) const;
@@ -50,11 +50,11 @@ private:
     struct MaskInputData
     {
         enum Casemode { NoCaseMode, Upper, Lower };
-        TQChar tqmaskChar; // either the separator char or the inputtqmask
+        TQChar maskChar; // either the separator char or the inputtqmask
         bool separator;
         Casemode caseMode;
     };
-    MaskInputData *m_tqmaskData;
+    MaskInputData *m_maskData;
 };
 
 }
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index 69d16f21..cc7631e3 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -65,7 +65,7 @@ KAboutData *KugarFactory::aboutData()
 
 // Create a new part.
 
-KParts::Part* KugarFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part* KugarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
         TQObject* tqparent, const char* name, const char* classname, const TQStringList & data )
 {
     TQString forcedUserTemplate;
@@ -77,15 +77,15 @@ KParts::Part* KugarFactory::createPartObject( TQWidget *tqparentWidget, const ch
     }
 
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
-    // tqparentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
-    KugarPart *part = new KugarPart( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+    // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case.
+    KugarPart *part = new KugarPart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
 
     //  if ( !bWantKoDocument )
     part->setReadWrite( false );
 
     part->setForcedUserTemplate( forcedUserTemplate );
     return part;
-    //return ( new KugarPart(tqparentWidget,name,forcedUserTemplate));
+    //return ( new KugarPart(parentWidget,name,forcedUserTemplate));
 }
 
 
diff --git a/kugar/part/kugar_factory.h b/kugar/part/kugar_factory.h
index 1acb2920..390b21df 100644
--- a/kugar/part/kugar_factory.h
+++ b/kugar/part/kugar_factory.h
@@ -21,7 +21,7 @@ public:
     KugarFactory( TQObject* tqparent = 0, const char* name = 0 );
     ~KugarFactory();
 
-    virtual KParts::Part *createPartObject( TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+    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() );
 
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index fa6644e2..06395a75 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -30,9 +30,9 @@
 
 #include <KoFilterManager.h>
 
-KugarPart::KugarPart( TQWidget *tqparentWidget, const char *widgetName, 
+KugarPart::KugarPart( TQWidget *parentWidget, const char *widgetName, 
                       TQObject* tqparent, const char* name, bool singleViewMode ) 
-    : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode ),
+    : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ),
     m_templateOk( false )
 {
     setInstance( KugarFactory::global(), false );
@@ -107,7 +107,7 @@ bool KugarPart::loadXML( TQIODevice *file, const TQDomDocument & /*doc*/ )
     return ok;
 }
 
-bool KugarPart::initDoc( InitDocFlags /*flags*/, TQWidget* /*tqparentWidget*/ )
+bool KugarPart::initDoc( InitDocFlags /*flags*/, TQWidget* /*parentWidget*/ )
 {
     TQString filename;
     bool ok = false;
diff --git a/kugar/part/kugar_part.h b/kugar/part/kugar_part.h
index cc778bf8..e489ceb0 100644
--- a/kugar/part/kugar_part.h
+++ b/kugar/part/kugar_part.h
@@ -20,12 +20,12 @@ class KugarPart: public KoDocument
   TQ_OBJECT
 
 public:
-    KugarPart( TQWidget *tqparentWidget = 0, const char *widgetName = 0, 
+    KugarPart( TQWidget *parentWidget = 0, const char *widgetName = 0, 
                TQObject* tqparent = 0,
                const char* name = 0, bool singleViewMode = false );
     virtual ~KugarPart();
 
-    virtual bool initDoc( InitDocFlags flags, TQWidget* tqparentWidget = 0 );
+    virtual bool initDoc( InitDocFlags flags, TQWidget* parentWidget = 0 );
 
     virtual bool loadOasis( const TQDomDocument&, KoOasisStyles&, 
                             const TQDomDocument&, KoStore* );
diff --git a/kword/KWAnchor.cpp b/kword/KWAnchor.cpp
index f9641cf4..11136e3d 100644
--- a/kword/KWAnchor.cpp
+++ b/kword/KWAnchor.cpp
@@ -154,8 +154,8 @@ void KWAnchor::draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch,
     if ( containingFrame ) // 0 in the textviewmode
         topLeftParagPt = containingFrame->innerRect().topLeft();
 
-    topLeftParagPt.rx() += zh->tqlayoutUnitPtToPt( zh->pixelYToPt( paragx ) );
-    topLeftParagPt.ry() += zh->tqlayoutUnitPtToPt( zh->pixelYToPt( paragy ) );
+    topLeftParagPt.rx() += zh->layoutUnitPtToPt( zh->pixelYToPt( paragx ) );
+    topLeftParagPt.ry() += zh->layoutUnitPtToPt( zh->pixelYToPt( paragy ) );
     if ( containingFrame ) // 0 in the textviewmode
         topLeftParagPt.ry() -= containingFrame->internalY();
 
@@ -205,8 +205,8 @@ TQSize KWAnchor::size() const
     KoTextZoomHandler * zh = textDocument()->formattingZoomHandler();
     TQSize sz( zh->ptToLayoutUnitPixX( kosz.width() ), zh->ptToLayoutUnitPixY( kosz.height() ) );
     //kdDebug() << "KWAnchor::size in LU: " << sz.width() << "x" << sz.height() << endl;
-    //kdDebug() << "          size in pixels: " << zh->tqlayoutUnitToPixelX( sz.width() ) << "x"
-    //          << zh->tqlayoutUnitToPixelY( sz.height() ) << endl;
+    //kdDebug() << "          size in pixels: " << zh->layoutUnitToPixelX( sz.width() ) << "x"
+    //          << zh->layoutUnitToPixelY( sz.height() ) << endl;
     if ( sz.isNull() ) // for some reason, we don't know the size yet
         sz = TQSize( width, height ); // LU
     return sz;
@@ -263,10 +263,10 @@ void KWAnchor::setDeleted( bool b )
         m_frameset->setAnchored( static_cast<KWTextDocument *>(textDocument())->textFrameSet() );
 }
 
-void KWAnchor::save( TQDomElement &tqparentElem )
+void KWAnchor::save( TQDomElement &parentElem )
 {
-    TQDomElement anchorElem = tqparentElem.ownerDocument().createElement( "ANCHOR" );
-    tqparentElem.appendChild( anchorElem );
+    TQDomElement anchorElem = parentElem.ownerDocument().createElement( "ANCHOR" );
+    parentElem.appendChild( anchorElem );
     anchorElem.setAttribute( "type", "frameset" ); // the only possible value currently
     //KWDocument * doc = textDocument()->textFrameSet()->kWordDocument();
     // ## TODO save the frame number as well ? Only the first frame ? to be determined
diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index e1f0f52b..e68e1c99 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -344,9 +344,9 @@ void KWTextDeleteCommand::createBookmarkList()
         return;
     }
 
-    // Now restore the parag tqlayouts (i.e. libkotext specific stuff)
+    // Now restore the parag layouts (i.e. libkotext specific stuff)
     TQValueList<KoParagLayout>::Iterator lit = m_oldParagLayouts.begin();
-    kdDebug(32500) << "KWTextDeleteCommand::createBookmarkList " << m_oldParagLayouts.count() << " parag tqlayouts. First parag=" << s->paragId() << endl;
+    kdDebug(32500) << "KWTextDeleteCommand::createBookmarkList " << m_oldParagLayouts.count() << " parag layouts. First parag=" << s->paragId() << endl;
     Q_ASSERT( id == s->paragId() );
     KoTextParag *p = s;
     while ( p ) {
diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp
index 6743e36f..fac2ced0 100644
--- a/kword/KWConfigFootNoteDia.cpp
+++ b/kword/KWConfigFootNoteDia.cpp
@@ -78,7 +78,7 @@ void KWConfigFootNoteDia::setupTab3()
 
     TQButtonGroup *positionGroupBox = new TQButtonGroup( i18n( "Position"), page );
     comment= i18n ("The separator can be positioned horizontally by picking one "
-        "of the three tqalignments.");
+        "of the three alignments.");
     TQWhatsThis::add(positionGroupBox, comment);
     positionGroupBox->setColumnLayout(0, Qt::Vertical );
     TQVBoxLayout *positionLayout = new TQVBoxLayout( positionGroupBox->tqlayout() );
diff --git a/kword/KWCreateBookmarkDiaBase.ui b/kword/KWCreateBookmarkDiaBase.ui
index 872c0d8b..0d164ed4 100644
--- a/kword/KWCreateBookmarkDiaBase.ui
+++ b/kword/KWCreateBookmarkDiaBase.ui
@@ -53,5 +53,5 @@ Please provide the name of your bookmark.</string>
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="6"/>
+<layoutdefaults spacing="6" margin="6"/>
 </UI>
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 138cf92a..72fd0555 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -151,8 +151,8 @@ public:
 
 const int KWDocument::CURRENT_SYNTAX_VERSION = 3;
 
-KWDocument::KWDocument(TQWidget *tqparentWidget, const char *widname, TQObject* tqparent, const char* name, bool singleViewMode )
-    : KoDocument( tqparentWidget, widname, tqparent, name, singleViewMode ),
+KWDocument::KWDocument(TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, bool singleViewMode )
+    : KoDocument( parentWidget, widname, tqparent, name, singleViewMode ),
       m_urlIntern()
 {
     KWStatisticVariable::setExtendedType(  true );
@@ -492,7 +492,7 @@ void KWDocument::newZoomAndResolution( bool updateViews, bool forPrint )
     }
 }
 
-bool KWDocument::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+bool KWDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget)
 {
     m_pageColumns.columns = 1;
     m_pageColumns.ptColumnSpacing = m_defaultColumnSpacing;
@@ -539,7 +539,7 @@ bool KWDocument::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
     TQString file;
     KoTemplateChooseDia::ReturnType ret = KoTemplateChooseDia::choose(
         KWFactory::instance(), file,
-        dlgtype, "kword_template", tqparentWidget );
+        dlgtype, "kword_template", parentWidget );
     if ( ret == KoTemplateChooseDia::Template ) {
         resetURL();
         ok = loadNativeFormat( file );
@@ -2572,7 +2572,7 @@ void KWDocument::pasteFrames( TQDomElement topElem, KMacroCommand * macroCmd, bo
         KWFrameSet * fs = 0L;
         if ( elem.tagName() == "FRAME" )
         {
-            TQString frameSetName = frameElem.attribute( "tqparentFrameset" );
+            TQString frameSetName = frameElem.attribute( "parentFrameset" );
             fs = frameSetByName( frameSetName );
             if ( !fs )
             {
@@ -3073,13 +3073,13 @@ void KWDocument::saveSelectedFrames( KoXmlWriter& bodyWriter, KoSavingContext& s
         else if ( !isTable ) {
 #if 0
             // Save the frame information
-            TQDomElement frameElem = tqparentElem.ownerDocument().createElement( "FRAME" );
-            tqparentElem.appendChild( frameElem );
+            TQDomElement frameElem = parentElem.ownerDocument().createElement( "FRAME" );
+            parentElem.appendChild( frameElem );
             frame->save( frameElem );
             if ( frame != firstFrame )
             {
                 // Frame saved alone -> remember which frameset it's part of
-                frameElem.setAttribute( "tqparentFrameset", fs->name() );
+                frameElem.setAttribute( "parentFrameset", fs->name() );
             }
 #endif
         }
@@ -3606,17 +3606,17 @@ TQDomDocument KWDocument::saveXML()
 }
 
 // KWord-1.3 format
-void KWDocument::saveEmbeddedObjects( TQDomElement& tqparentElem, const TQPtrList<KoDocumentChild>& childList )
+void KWDocument::saveEmbeddedObjects( TQDomElement& parentElem, const TQPtrList<KoDocumentChild>& childList )
 {
     // Write "OBJECT" tag for every child, appending "EMBEDDING" tags to the main XML
     TQPtrListIterator<KoDocumentChild> chl( childList );
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     for( ; chl.current(); ++chl ) {
         KWDocumentChild* curr = static_cast<KWDocumentChild*>(chl.current());
         if ( !curr->isDeleted() )
         {
             TQDomElement embeddedElem = doc.createElement( "EMBEDDED" );
-            tqparentElem.appendChild( embeddedElem );
+            parentElem.appendChild( embeddedElem );
 
             TQDomElement objectElem = curr->save( doc, true );
             embeddedElem.appendChild( objectElem );
@@ -3630,11 +3630,11 @@ void KWDocument::saveEmbeddedObjects( TQDomElement& tqparentElem, const TQPtrLis
 }
 
 // KWord-1.3 format
-void KWDocument::saveStyle( KoParagStyle *sty, TQDomElement tqparentElem )
+void KWDocument::saveStyle( KoParagStyle *sty, TQDomElement parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement styleElem = doc.createElement( "STYLE" );
-    tqparentElem.appendChild( styleElem );
+    parentElem.appendChild( styleElem );
 
     sty->saveStyle( styleElem );
 
@@ -3643,21 +3643,21 @@ void KWDocument::saveStyle( KoParagStyle *sty, TQDomElement tqparentElem )
 }
 
 // KWord-1.3 format
-void KWDocument::saveFrameStyle( KWFrameStyle *sty, TQDomElement tqparentElem )
+void KWDocument::saveFrameStyle( KWFrameStyle *sty, TQDomElement parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement frameStyleElem = doc.createElement( "FRAMESTYLE" );
-    tqparentElem.appendChild( frameStyleElem );
+    parentElem.appendChild( frameStyleElem );
 
     sty->saveFrameStyle( frameStyleElem );
 }
 
 // KWord-1.3 format
-void KWDocument::saveTableStyle( KWTableStyle *sty, TQDomElement tqparentElem )
+void KWDocument::saveTableStyle( KWTableStyle *sty, TQDomElement parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement tableStyleElem = doc.createElement( "TABLESTYLE" );
-    tqparentElem.appendChild( tableStyleElem );
+    parentElem.appendChild( tableStyleElem );
 
     sty->saveTableStyle( tableStyleElem );
 }
@@ -3867,12 +3867,12 @@ KWDocumentChild* KWDocument::createChildDoc( const KoRect& rect, KoDocument* chi
     return ch;
 }
 
-KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* tqparentWidget )
+KWPartFrameSet* KWDocument::insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* parentWidget )
 {
     KoDocument* doc = e.createDoc( this );
     if ( !doc )
         return 0;
-    if ( !doc->showEmbedInitDialog( tqparentWidget )  )
+    if ( !doc->showEmbedInitDialog( parentWidget )  )
         return 0;
 
     KWDocumentChild* ch = createChildDoc( rect, doc );
diff --git a/kword/KWDocument.h b/kword/KWDocument.h
index 029930d8..cab789f8 100644
--- a/kword/KWDocument.h
+++ b/kword/KWDocument.h
@@ -131,7 +131,7 @@ public:
     friend class KWOasisLoader;
     friend class KWStartupWidget;
 
-    KWDocument( TQWidget *tqparentWidget = 0, const char *widname = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
+    KWDocument( TQWidget *parentWidget = 0, const char *widname = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false );
     ~KWDocument();
 
     enum ProcessingType {WP = 0, DTP = 1};
@@ -139,7 +139,7 @@ public:
     static const int CURRENT_SYNTAX_VERSION;
 
 public:
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
 
     virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* store );
 
@@ -208,7 +208,7 @@ public:
 
     virtual void addShell( KoMainWindow *shell );
 
-    KWPartFrameSet* insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* tqparentWidget );
+    KWPartFrameSet* insertObject( const KoRect& rect, KoDocumentEntry& e, TQWidget* parentWidget );
 
     /// Create an embedded document; used by KWPartFrameSet but is defined here
     /// because KoDocument:insertChild is protected.
@@ -491,7 +491,7 @@ public:
     /// This is used by loadFrameSets() and by KWCanvas to paste framesets
     KWFrameSet *loadFrameSet( TQDomElement framesetElem, bool loadFrames = true , bool loadFootnote = true);
     void loadEmbeddedObjects( TQDomElement& word );
-    void saveEmbeddedObjects( TQDomElement& tqparentElem, const TQPtrList<KoDocumentChild>& childList );
+    void saveEmbeddedObjects( TQDomElement& parentElem, const TQPtrList<KoDocumentChild>& childList );
     void loadEmbedded( const TQDomElement &embedded );
 
     void recalcVariables( int type );
@@ -526,9 +526,9 @@ public:
     TQString viewModeType() const { return m_viewModeType; }
 
     /**
-     * The view mode used for text tqlayouting.
+     * The view mode used for text layouting.
      */
-    KWViewMode* tqlayoutViewMode() const { return m_layoutViewMode; }
+    KWViewMode* layoutViewMode() const { return m_layoutViewMode; }
 
     /**
      * Changes m_viewMode, and updates all views to this viewmode
@@ -829,9 +829,9 @@ protected:
 
     void loadFrameSets( const TQDomElement &framesets );
     void loadStyleTemplates( const TQDomElement &styles );
-    void saveStyle( KoParagStyle *sty, TQDomElement tqparentElem );
-    void saveFrameStyle( KWFrameStyle *sty, TQDomElement tqparentElem );
-    void saveTableStyle( KWTableStyle *sty, TQDomElement tqparentElem );
+    void saveStyle( KoParagStyle *sty, TQDomElement parentElem );
+    void saveFrameStyle( KWFrameStyle *sty, TQDomElement parentElem );
+    void saveTableStyle( KWTableStyle *sty, TQDomElement parentElem );
 
     void loadFrameStyleTemplates( const TQDomElement &styles );
     void loadDefaultFrameStyleTemplates();
@@ -971,7 +971,7 @@ private:
 
     /// The name of the viewmode used by all views.
     TQString m_viewModeType;
-    /// The viewmode used for text tqlayouting
+    /// The viewmode used for text layouting
     KWViewMode* m_layoutViewMode;
     KWVariableCollection *m_varColl;
     KWBgSpellCheck *m_bgSpellCheck;
diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp
index 142fb1fb..31c3b5aa 100644
--- a/kword/KWFactory.cpp
+++ b/kword/KWFactory.cpp
@@ -44,11 +44,11 @@ KWFactory::~KWFactory()
     s_instance=0L;
 }
 
-KParts::Part* KWFactory::createPartObject( TQWidget *tqparentWidget, const char *widname, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
+KParts::Part* KWFactory::createPartObject( TQWidget *parentWidget, const char *widname, TQObject* tqparent, const char* name, const char* classname, const TQStringList & )
 {
     bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
 
-    KWDocument *doc = new KWDocument( tqparentWidget, widname, tqparent, name, !bWantKoDocument );
+    KWDocument *doc = new KWDocument( parentWidget, widname, tqparent, name, !bWantKoDocument );
 
     if ( !bWantKoDocument )
       doc->setReadWrite( false );
diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp
index 5c21daa3..f8d597e8 100644
--- a/kword/KWFormulaFrameSet.cpp
+++ b/kword/KWFormulaFrameSet.cpp
@@ -244,16 +244,16 @@ MouseMeaning KWFormulaFrameSet::getMouseMeaningInsideFrame( const KoPoint& )
     return MEANING_MOUSE_INSIDE_TEXT;
 }
 
-TQDomElement KWFormulaFrameSet::save(TQDomElement& tqparentElem, bool saveFrames)
+TQDomElement KWFormulaFrameSet::save(TQDomElement& parentElem, bool saveFrames)
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement("FRAMESET");
-    tqparentElem.appendChild(framesetElem);
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement("FRAMESET");
+    parentElem.appendChild(framesetElem);
 
     KWFrameSet::saveCommon(framesetElem, saveFrames);
 
-    TQDomElement formulaElem = tqparentElem.ownerDocument().createElement("FORMULA");
+    TQDomElement formulaElem = parentElem.ownerDocument().createElement("FORMULA");
     framesetElem.appendChild(formulaElem);
     formula->save(formulaElem);
     return framesetElem;
diff --git a/kword/KWFormulaFrameSet.h b/kword/KWFormulaFrameSet.h
index b9b06a4d..a72fe200 100644
--- a/kword/KWFormulaFrameSet.h
+++ b/kword/KWFormulaFrameSet.h
@@ -80,7 +80,7 @@ public:
                                    const TQColorGroup&, bool onlyChanged, bool resetChanged,
                                    KWFrameSetEdit *edit, KWViewMode *viewMode);
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     virtual void saveOasis(KoXmlWriter&, KoSavingContext&, bool saveFrames ) const;
     void paste( TQDomNode& formulaElem );
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index d33d9118..2130e235 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -448,7 +448,7 @@ void KWFrameDia::setupTab1(){ // TAB Frame Options
         "When a new page is created, a new frame will be created for this "
         "frameset, so that the text can flow from one page to the next if necessary. "
         "This is what happens for the \"main text frameset\", but this option makes it possible "
-        "to choose the same behavior for other framesets, for instance in magazine tqlayouts."));
+        "to choose the same behavior for other framesets, for instance in magazine layouts."));
     if ( m_rResizeFrame )
         connect( m_reconnect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setFrameBehaviorInputOn() ) );
     m_onpGrid->addRowSpacing( 0, KDialog::marginHint() + 5 );
@@ -2142,12 +2142,12 @@ bool KWFrameDia::applyChanges()
         while(f) {
             // The floating attribute applies to the whole frameset...
             KWFrameSet * fs = f->frameSet();
-            KWFrameSet * tqparentFs = fs->groupmanager() ? fs->groupmanager() : fs;
+            KWFrameSet * parentFs = fs->groupmanager() ? fs->groupmanager() : fs;
 
             // Floating
             if ( m_floating->isChecked() &&
                  m_floating->state() != TQButton::NoChange &&
-                 !tqparentFs->isFloating() )
+                 !parentFs->isFloating() )
             {
                 if(!macroCmd)
                     macroCmd = new KMacroCommand( i18n("Make Frameset Inline") );
@@ -2158,7 +2158,7 @@ bool KWFrameDia::applyChanges()
                 KoPoint oldPos = f->topLeft();
 
                 // turn non-floating frame into floating frame
-                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), tqparentFs, true );
+                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), parentFs, true );
                 cmd->execute();
 
                 frameindexList.append( FrameIndex( f ) );
@@ -2171,12 +2171,12 @@ bool KWFrameDia::applyChanges()
             }
             else if ( !m_floating->isChecked() &&
                       m_floating->state() != TQButton::NoChange &&
-                      tqparentFs->isFloating() )
+                      parentFs->isFloating() )
             {
                 if(!macroCmd)
                     macroCmd = new KMacroCommand( i18n("Make Frameset Non-Inline") );
                 // turn floating-frame into non-floating frame
-                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), tqparentFs, false );
+                KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( TQString(), parentFs, false );
                 macroCmd->addCommand(cmd);
                 cmd->execute();
             }
diff --git a/kword/KWFrameLayout.cpp b/kword/KWFrameLayout.cpp
index 5c0fee78..5a484198 100644
--- a/kword/KWFrameLayout.cpp
+++ b/kword/KWFrameLayout.cpp
@@ -263,7 +263,7 @@ void KWFrameLayout::tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
                 KoRect rect;
 
                 // When two footnotes are in the same page there should be 0 spacing between them
-                // Yeah, write a generic frame tqlayouter and then realize it's not flexible enough :(
+                // Yeah, write a generic frame layouter and then realize it's not flexible enough :(
                 if ( fs->isFootEndNote() && !firstFootNote )
                 {
                     // Undo "bottom -= spacing" (done below). This assumes equal spacing for all footnotes
diff --git a/kword/KWFrameLayout.h b/kword/KWFrameLayout.h
index 140d1284..18089ee5 100644
--- a/kword/KWFrameLayout.h
+++ b/kword/KWFrameLayout.h
@@ -77,7 +77,7 @@ public:
 
     /**
      * Constructor
-     * @param doc the KWDocument we're tqlayouting
+     * @param doc the KWDocument we're layouting
      * @param headersFooters list of header and footer HFFs (see definition of HeaderFooterFrameset)
      * @param footnotes list of footnotes framesets HFFs
      * @param endnotes list of endnotes framesets HFFs
diff --git a/kword/KWFrameList.cpp b/kword/KWFrameList.cpp
index 10e6c467..3628df05 100644
--- a/kword/KWFrameList.cpp
+++ b/kword/KWFrameList.cpp
@@ -67,13 +67,13 @@ TQValueList<KWFrame *> KWFrameList::framesOnTop() const {
 void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) {
     // kdDebug(31001) << "KWFrameList::setFrames for " << m_frame->frameSet()->name() << endl;
     m_frames.clear();
-    if ( m_doc->tqlayoutViewMode() && !m_doc->tqlayoutViewMode()->hasFrames() )
+    if ( m_doc->layoutViewMode() && !m_doc->layoutViewMode()->hasFrames() )
         return;
 
-    TQPtrList<KWFrameSet> tqparentFramesets;
+    TQPtrList<KWFrameSet> parentFramesets;
     KWFrameSet *fs = m_frame->frameSet();
     while(fs) {
-        tqparentFramesets.append(fs);
+        parentFramesets.append(fs);
         fs = (KWFrameSet*) fs->anchorFrameset();
     }
 
@@ -96,7 +96,7 @@ void KWFrameList::setFrames(const TQPtrList<KWFrame> &frames) {
         // ## 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() &&
-                (tqparentFramesets.tqcontains(daFrame->frameSet()->anchorFrameset()) ||
+                (parentFramesets.tqcontains(daFrame->frameSet()->anchorFrameset()) ||
                  daFrame->frameSet()->isPaintedBy(m_frame->frameSet())) )
             continue;
         // Floating frames are not "on top", they are "inside".
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp
index d07a55e2..b8b9f8d0 100644
--- a/kword/KWFrameSet.cpp
+++ b/kword/KWFrameSet.cpp
@@ -475,7 +475,7 @@ KoRect KWFrameSet::floatingFrameRect( int frameNum )
     int x = anchor->x() + paragRect.x(); // in LU
     int y = anchor->y() + paragRect.y(); // in LU
 
-    KoPoint topLeft( m_doc->tqlayoutUnitToPixelX( x ), m_doc->tqlayoutUnitToPixelY( y ) );
+    KoPoint topLeft( m_doc->layoutUnitToPixelX( x ), m_doc->layoutUnitToPixelY( y ) );
     return KoRect( topLeft, frame->outerKoRect().size() );
 }
 
@@ -603,8 +603,8 @@ bool KWFrameSet::isPaintedBy( KWFrameSet* fs ) const
         return true;
     if ( isFloating() )
     {
-        KWFrameSet* tqparentFs = anchorFrameset();
-        if ( tqparentFs && tqparentFs->isPaintedBy( fs ) )
+        KWFrameSet* parentFs = anchorFrameset();
+        if ( parentFs && parentFs->isPaintedBy( fs ) )
             return true;
     }
     if ( groupmanager() )
@@ -865,25 +865,25 @@ void KWFrameSet::drawFrameContents( KWFrame *, TQPainter *, const TQRect &,
     kdWarning() << "Default implementation of drawFrameContents called for " << className() << " " << this << " " << name() << kdBacktrace();
 }
 
-void KWFrameSet::saveCommon( TQDomElement &tqparentElem, bool saveFrames )
+void KWFrameSet::saveCommon( TQDomElement &parentElem, bool saveFrames )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return;
 
     // Save all the common attributes for framesets.
-    tqparentElem.setAttribute( "frameType", static_cast<int>( type() ) );
-    tqparentElem.setAttribute( "frameInfo", static_cast<int>( m_info ) );
-    tqparentElem.setAttribute( "name", m_name );
-    tqparentElem.setAttribute( "visible", static_cast<int>( m_visible ) );
-    tqparentElem.setAttribute( "protectSize", static_cast<int>( m_protectSize ) );
+    parentElem.setAttribute( "frameType", static_cast<int>( type() ) );
+    parentElem.setAttribute( "frameInfo", static_cast<int>( m_info ) );
+    parentElem.setAttribute( "name", m_name );
+    parentElem.setAttribute( "visible", static_cast<int>( m_visible ) );
+    parentElem.setAttribute( "protectSize", static_cast<int>( m_protectSize ) );
     if ( saveFrames )
     {
         TQPtrListIterator<KWFrame> frameIt = frameIterator();
         for ( ; frameIt.current(); ++frameIt )
         {
             KWFrame *frame = frameIt.current();
-            TQDomElement frameElem = tqparentElem.ownerDocument().createElement( "FRAME" );
-            tqparentElem.appendChild( frameElem );
+            TQDomElement frameElem = parentElem.ownerDocument().createElement( "FRAME" );
+            parentElem.appendChild( frameElem );
 
             frame->save( frameElem );
 
@@ -1157,7 +1157,7 @@ void KWFrameSet::setNewFrameBehavior( KWFrame::NewFrameBehavior nfb ) {
 
 // ## this should pass the viewmode as argument, probably.
 bool KWFrameSet::isFrameAtPos( const KWFrame* frame, const TQPoint& point, bool borderOfFrameOnly) const {
-    TQRect outerRect( frame->outerRect( m_doc->tqlayoutViewMode() ) );
+    TQRect outerRect( frame->outerRect( m_doc->layoutViewMode() ) );
     // Give the user a bit of margin for clicking on it :)
     const int margin = 2;
     outerRect.rLeft() -= margin;
diff --git a/kword/KWFrameSet.h b/kword/KWFrameSet.h
index be9337c0..b714d96d 100644
--- a/kword/KWFrameSet.h
+++ b/kword/KWFrameSet.h
@@ -315,10 +315,10 @@ public:
     virtual void tqinvalidate() {}
 
     /// save to XML - when saving
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true ) = 0;
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true ) = 0;
     /// save to XML - when copying to clipboard
-    virtual TQDomElement toXML( TQDomElement &tqparentElem, bool saveFrames = true )
-    { return save( tqparentElem, saveFrames ); }
+    virtual TQDomElement toXML( TQDomElement &parentElem, bool saveFrames = true )
+    { return save( parentElem, saveFrames ); }
     /// Save to OASIS format
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context, bool saveFrames ) const = 0;
     /// If the frameset is inline, is it ok to save it inside an oasis <text:p>?
@@ -467,7 +467,7 @@ signals:
 protected:
 
     /// save the common attributes for the frameset
-    void saveCommon( TQDomElement &tqparentElem, bool saveFrames );
+    void saveCommon( TQDomElement &parentElem, bool saveFrames );
 
     /**Determine the clipping rectangle for drawing the contents of @p frame with @p painter
      * in the rectangle delimited by @p crect.
diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp
index 44b83c56..fd6fd26a 100644
--- a/kword/KWFrameStyle.cpp
+++ b/kword/KWFrameStyle.cpp
@@ -99,46 +99,46 @@ KWFrameStyle::KWFrameStyle( const TQString & name, KWFrame * frame )
     m_borderBottom = frame->bottomBorder();
 }
 
-KWFrameStyle::KWFrameStyle( TQDomElement & tqparentElem, int /*docVersion=2*/ )
+KWFrameStyle::KWFrameStyle( TQDomElement & parentElem, int /*docVersion=2*/ )
     : KoUserStyle( TQString() )
 {
-    TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+    TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("value") ) ) {
         m_name = element.attribute( "value" );
         m_displayName = i18n( "Style name", m_name.utf8() );
     } else
         kdWarning() << "No NAME tag in frame style!" << endl;
 
-    element = tqparentElem.namedItem( "LEFTBORDER" ).toElement();
+    element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderLeft = KoBorder::loadBorder( element );
     else
         m_borderLeft.setPenWidth( 0 );
 
-    element = tqparentElem.namedItem( "RIGHTBORDER" ).toElement();
+    element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderRight = KoBorder::loadBorder( element );
     else
         m_borderRight.setPenWidth( 0 );
 
-    element = tqparentElem.namedItem( "TOPBORDER" ).toElement();
+    element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderTop = KoBorder::loadBorder( element );
     else
         m_borderTop.setPenWidth( 0 );
 
-    element = tqparentElem.namedItem( "BOTTOMBORDER" ).toElement();
+    element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
         m_borderBottom = KoBorder::loadBorder( element );
     else
         m_borderBottom.setPenWidth( 0 );
 
     TQColor c("white");
-    if ( tqparentElem.hasAttribute("red") )
+    if ( parentElem.hasAttribute("red") )
         c.setRgb(
-            KWDocument::getAttribute( tqparentElem, "red", 0 ),
-            KWDocument::getAttribute( tqparentElem, "green", 0 ),
-            KWDocument::getAttribute( tqparentElem, "blue", 0 ) );
+            KWDocument::getAttribute( parentElem, "red", 0 ),
+            KWDocument::getAttribute( parentElem, "green", 0 ),
+            KWDocument::getAttribute( parentElem, "blue", 0 ) );
 
     m_backgroundColor = TQBrush( c );
 }
@@ -174,49 +174,49 @@ int KWFrameStyle::compare( const KWFrameStyle & frameStyle ) const
 }
 
 
-void KWFrameStyle::saveFrameStyle( TQDomElement & tqparentElem )
+void KWFrameStyle::saveFrameStyle( TQDomElement & parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     element.setAttribute( "value", displayName() );
 
     if ( m_borderLeft.width() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderLeft.save( element );
     }
     if ( m_borderRight.width() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderRight.save( element );
     }
     if ( m_borderTop.width() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderTop.save( element );
     }
     if ( m_borderBottom.width() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         m_borderBottom.save( element );
     }
 
     if(m_backgroundColor.color().isValid())
     {
-        tqparentElem.setAttribute( "red", m_backgroundColor.color().red() );
-        tqparentElem.setAttribute( "green", m_backgroundColor.color().green() );
-        tqparentElem.setAttribute( "blue", m_backgroundColor.color().blue() );
+        parentElem.setAttribute( "red", m_backgroundColor.color().red() );
+        parentElem.setAttribute( "green", m_backgroundColor.color().green() );
+        parentElem.setAttribute( "blue", m_backgroundColor.color().blue() );
     }
 }
 
-KWFrameStyle *KWFrameStyle::loadStyle( TQDomElement & tqparentElem, int docVersion )
+KWFrameStyle *KWFrameStyle::loadStyle( TQDomElement & parentElem, int docVersion )
 {
-    return new KWFrameStyle( tqparentElem, docVersion );
+    return new KWFrameStyle( parentElem, docVersion );
 }
 
 void KWFrameStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingContext ) const
@@ -270,7 +270,7 @@ void KWFrameStyle::loadOasis( TQDomElement & styleElem, KoOasisContext& context
     styleStack.setTypeProperties( "graphic" );
 
     styleStack.save();
-    context.addStyles( &styleElem, "graphic" ); // Load all tqparents - only because we don't support inheritance.
+    context.addStyles( &styleElem, "graphic" ); // Load all parents - only because we don't support inheritance.
 
     if ( styleStack.hasAttributeNS( KoXmlNS::fo, "background-color" ) ) {
         TQString color = styleStack.attributeNS( KoXmlNS::fo, "background-color" );
diff --git a/kword/KWFrameStyle.h b/kword/KWFrameStyle.h
index 7b398c29..3336daa2 100644
--- a/kword/KWFrameStyle.h
+++ b/kword/KWFrameStyle.h
@@ -45,7 +45,7 @@ public:
     KWFrameStyle( const TQString & name );
 
     KWFrameStyle( const TQString & name, KWFrame * frame );
-    KWFrameStyle( TQDomElement & tqparentElem, int docVersion=2 );
+    KWFrameStyle( TQDomElement & parentElem, int docVersion=2 );
 
     /** Copy another framestyle */
     KWFrameStyle( const KWFrameStyle & rhs );
@@ -76,12 +76,12 @@ public:
     void setBottomBorder( KoBorder _bottom )  { m_borderBottom = _bottom; }
 
     /// save (old xml format)
-    void saveFrameStyle( TQDomElement & tqparentElem );
+    void saveFrameStyle( TQDomElement & parentElem );
     /// save (new oasis xml format)
     void saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingContext ) const;
 
     /// load (old xml format)
-    static KWFrameStyle *loadStyle( TQDomElement & tqparentElem, int docVersion=2 );
+    static KWFrameStyle *loadStyle( TQDomElement & parentElem, int docVersion=2 );
     /// load (new oasis xml format)
     void loadOasis( TQDomElement & styleElem, KoOasisContext& context );
 
diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp
index 38e7658a..7506e02a 100644
--- a/kword/KWFrameView.cpp
+++ b/kword/KWFrameView.cpp
@@ -185,9 +185,9 @@ void FramePolicy::addFloatingAction(KWView *view, TQPtrList<KAction> &actionList
     KToggleAction *action = dynamic_cast<KToggleAction*> (view->actionCollection()->
             action("inline_frame"));
     Q_ASSERT(action);
-    KWFrameSet *tqparentFs = m_view->frame()->frameSet()->groupmanager() ?
+    KWFrameSet *parentFs = m_view->frame()->frameSet()->groupmanager() ?
         m_view->frame()->frameSet()->groupmanager() : m_view->frame()->frameSet();
-    action->setChecked(tqparentFs->isFloating());
+    action->setChecked(parentFs->isFloating());
     actionList.append(action);
 }
 MouseMeaning FramePolicy::mouseMeaningOnBorder( const KoPoint &point, int keyState ) {
diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp
index 03c6a501..6c9851fe 100644
--- a/kword/KWInsertTOCCommand.cpp
+++ b/kword/KWInsertTOCCommand.cpp
@@ -83,7 +83,7 @@ KoTextCursor * KWInsertTOCCommand::execute( KoTextCursor *c )
     fs->tqlayout();
     fs->updateFrames();
 
-    //kdDebug() << "KWInsertTOCCommand::execute tqlayouting done, setting page numbers" << endl;
+    //kdDebug() << "KWInsertTOCCommand::execute layouting done, setting page numbers" << endl;
 
     // Now add the page numbers, and apply the style
     TQMap<KWTextParag *, KWTextParag *>::Iterator mapIt = paragMap.begin();
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 1a637e16..244c2006 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -276,7 +276,7 @@ bool KWMailMergeDataBase::askUserForConfirmationAndConfig(KWMailMergeDataSource
 TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
 {
     kdDebug()<<"KWMailMergeDataBase::save()"<<endl;
-    TQDomElement tqparentElem=doc.createElement("MAILMERGE");
+    TQDomElement parentElem=doc.createElement("MAILMERGE");
     if (plugin)
     {
         kdDebug()<<"KWMailMergeDataBase::save() There is really something to save"<<endl;
@@ -286,26 +286,26 @@ TQDomElement KWMailMergeDataBase::save(TQDomDocument &doc) const
         TQString libname;
         ds>>libname;
         el.setAttribute("library",libname);
-        tqparentElem.appendChild(el);
+        parentElem.appendChild(el);
         kdDebug()<<"KWMailMergeDataBase::save() Calling datasource save()"<<endl;
         TQDomElement el2=doc.createElement(TQString::tqfromLatin1("DATASOURCE"));
         plugin->save(doc,el2);
-        tqparentElem.appendChild(el2);
+        parentElem.appendChild(el2);
 
     }
     kdDebug()<<"KWMailMergeDataBase::save() leaving now"<<endl;
-    return tqparentElem;
-    // if (plugin) plugin->save(tqparentElem); // Not completely sure, perhaps the database itself has to save something too (JoWenn)
+    return parentElem;
+    // if (plugin) plugin->save(parentElem); // Not completely sure, perhaps the database itself has to save something too (JoWenn)
 }
 
-void KWMailMergeDataBase::load( const TQDomElement& tqparentElem )
+void KWMailMergeDataBase::load( const TQDomElement& parentElem )
 {
-    TQDomNode dn=tqparentElem.namedItem("PLUGIN");
+    TQDomNode dn=parentElem.namedItem("PLUGIN");
     if (dn.isNull()) return;
     TQDomElement el=dn.toElement();
     plugin=loadPlugin(el.attribute("library"));
 
-    dn=tqparentElem.namedItem("DATASOURCE");
+    dn=parentElem.namedItem("DATASOURCE");
     if (dn.isNull()) return;
     el=dn.toElement();
     if (plugin) plugin->load(el);
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index afb07d2a..fc257709 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -150,11 +150,11 @@ void KWPartFrameSet::slotChildChanged()
         kdDebug(32001) << "Frame not found!" << endl;
 }
 
-TQDomElement KWPartFrameSet::save( TQDomElement &tqparentElem, bool saveFrames )
+TQDomElement KWPartFrameSet::save( TQDomElement &parentElem, bool saveFrames )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
-    KWFrameSet::saveCommon( tqparentElem, saveFrames );
+    KWFrameSet::saveCommon( parentElem, saveFrames );
     // Ok, this one is a bit hackish. KWDocument calls us for saving our stuff into
     // the SETTINGS element, which it creates for us. So our save() doesn't really have
     // the same behaviour as a normal KWFrameSet::save()....
@@ -360,7 +360,7 @@ KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix
 
     // Only activate when it's already selected, and when not clicking on the border.
     // KWFrameView and the part frame policy have that logic already.
-    KWView* kwView = ::tqqt_cast<KWView *>( tqparentDocument()->hitTestView() );
+    KWView* kwView = ::tqqt_cast<KWView *>( parentDocument()->hitTestView() );
     Q_ASSERT( kwView );
     if ( kwView ) {
         KWFrame* frame = m_partFrameSet->frame(0);
diff --git a/kword/KWPartFrameSet.h b/kword/KWPartFrameSet.h
index e6f052db..5a85853d 100644
--- a/kword/KWPartFrameSet.h
+++ b/kword/KWPartFrameSet.h
@@ -63,7 +63,7 @@ public:
 
     virtual void createEmptyRegion( const TQRect &crect, TQRegion &emptyRegion, KWViewMode *viewMode );
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context, bool saveFrames ) const;
 
diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp
index 3237bc37..7ea4e955 100644
--- a/kword/KWPictureFrameSet.cpp
+++ b/kword/KWPictureFrameSet.cpp
@@ -82,20 +82,20 @@ void KWPictureFrameSet::reloadPicture( const KoPictureKey& key )
     m_picture = collection->insertPicture( key, KoPicture() );
 }
 
-TQDomElement KWPictureFrameSet::save( TQDomElement & tqparentElem, bool saveFrames )
+TQDomElement KWPictureFrameSet::save( TQDomElement & parentElem, bool saveFrames )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" );
-    tqparentElem.appendChild( framesetElem );
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" );
+    parentElem.appendChild( framesetElem );
 
     KWFrameSet::saveCommon( framesetElem, saveFrames );
 
-    TQDomElement imageElem = tqparentElem.ownerDocument().createElement( "PICTURE" );
+    TQDomElement imageElem = parentElem.ownerDocument().createElement( "PICTURE" );
     framesetElem.appendChild( imageElem );
     imageElem.setAttribute( "keepAspectRatio", m_keepAspectRatio ? "true" : "false" );
 
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "KEY" );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "KEY" );
     imageElem.appendChild( elem );
     m_picture.getKey().saveAttributes( elem );
     return framesetElem;
diff --git a/kword/KWPictureFrameSet.h b/kword/KWPictureFrameSet.h
index ef59aee9..82595344 100644
--- a/kword/KWPictureFrameSet.h
+++ b/kword/KWPictureFrameSet.h
@@ -54,7 +54,7 @@ public:
      */
     void reloadPicture( const KoPictureKey& key );
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context, bool saveFrames ) const;
 
diff --git a/kword/KWSelectBookmarkDiaBase.ui b/kword/KWSelectBookmarkDiaBase.ui
index d77f36b8..474498f4 100644
--- a/kword/KWSelectBookmarkDiaBase.ui
+++ b/kword/KWSelectBookmarkDiaBase.ui
@@ -72,5 +72,5 @@
         </widget>
     </hbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/KWStartupWidgetBase.ui b/kword/KWStartupWidgetBase.ui
index 131ffc28..57d7ce2f 100644
--- a/kword/KWStartupWidgetBase.ui
+++ b/kword/KWStartupWidgetBase.ui
@@ -99,5 +99,5 @@ For letters and notes with one main text, possibly on several pages, you should
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index 1fc51fd8..9d6aa58e 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -2009,19 +2009,19 @@ void KWTableFrameSet::loadOasisCell( const TQDomElement& element, KoOasisContext
 }
 
 // Old XML
-TQDomElement KWTableFrameSet::save( TQDomElement &tqparentElem, bool saveFrames ) {
+TQDomElement KWTableFrameSet::save( TQDomElement &parentElem, bool saveFrames ) {
     // When saving to a file, we don't have anything specific to the frameset to save.
     // Save the cells only.
     for (TableIter cells(this) ; cells ; ++cells)
-        cells->save(tqparentElem, saveFrames);
+        cells->save(parentElem, saveFrames);
     return TQDomElement(); // No englobing element for tables...
 }
 
 // Old XML
-TQDomElement KWTableFrameSet::toXML( TQDomElement &tqparentElem, bool saveFrames )
+TQDomElement KWTableFrameSet::toXML( TQDomElement &parentElem, bool saveFrames )
 {
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" );
-    tqparentElem.appendChild( framesetElem );
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" );
+    parentElem.appendChild( framesetElem );
     KWFrameSet::saveCommon( framesetElem, false ); // Save the frameset attributes
     // Save the cells
     save( framesetElem, saveFrames );
diff --git a/kword/KWTableFrameSet.h b/kword/KWTableFrameSet.h
index 3a3b5d64..f572a1ba 100644
--- a/kword/KWTableFrameSet.h
+++ b/kword/KWTableFrameSet.h
@@ -452,7 +452,7 @@ public:
     void validate();
 
     /** override save so we save in table style.. */
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true );
 
     virtual void saveOasis( KoXmlWriter&, KoSavingContext&, bool saveFrames ) const;
     void loadOasis( const TQDomElement& tag, KoOasisContext& context );
@@ -462,7 +462,7 @@ public:
     Cell* loadCell( TQDomElement &frameElem, bool loadFrames = true, bool useNames = true );
 
     /** from and to XML - used when copying and pasting a table */
-    virtual TQDomElement toXML( TQDomElement &tqparentElem, bool saveFrames = true );
+    virtual TQDomElement toXML( TQDomElement &parentElem, bool saveFrames = true );
     virtual void fromXML( TQDomElement &framesetElem, bool loadFrames = true, bool useNames = true );
 
     /** Contribute to the document statistics */
diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp
index dd446669..99ecfacb 100644
--- a/kword/KWTableStyle.cpp
+++ b/kword/KWTableStyle.cpp
@@ -89,17 +89,17 @@ KWTableStyle::KWTableStyle( const TQString & name, KoParagStyle * _paragStyle, K
     m_frameStyle = _frameStyle;
 }
 
-KWTableStyle::KWTableStyle( TQDomElement & tqparentElem, KWDocument *_doc, int /*docVersion*/ )
+KWTableStyle::KWTableStyle( TQDomElement & parentElem, KWDocument *_doc, int /*docVersion*/ )
     : KoUserStyle( TQString() )
 {
-    TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+    TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("value") ) ) {
         m_name = element.attribute( "value" );
         m_displayName = i18n( "Style name", m_name.utf8() );
     } else
         kdWarning() << "No NAME tag in table style!" << endl;
 
-    element = tqparentElem.namedItem( "PFRAMESTYLE" ).toElement();
+    element = parentElem.namedItem( "PFRAMESTYLE" ).toElement();
     m_frameStyle = 0;
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") ) )
         m_frameStyle = _doc->frameStyleCollection()->findStyleByDisplayName( element.attribute( "name" ) );
@@ -119,7 +119,7 @@ KWTableStyle::KWTableStyle( TQDomElement & tqparentElem, KWDocument *_doc, int /
         }
     }
 
-    element = tqparentElem.namedItem( "PSTYLE" ).toElement();
+    element = parentElem.namedItem( "PSTYLE" ).toElement();
     m_paragStyle = 0;
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") ) )
         m_paragStyle = _doc->styleCollection()->findStyleByDisplayName( element.attribute( "name" ) );
@@ -143,31 +143,31 @@ void KWTableStyle::operator=( const KWTableStyle &rhs )
     m_frameStyle = rhs.frameStyle();
 }
 
-void KWTableStyle::saveTableStyle( TQDomElement & tqparentElem )
+void KWTableStyle::saveTableStyle( TQDomElement & parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     element.setAttribute( "value", displayName() );
 
     if (m_frameStyle)
     {
         element = doc.createElement( "PFRAMESTYLE" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_frameStyle->displayName() );
     }
     if (m_paragStyle)
     {
         element = doc.createElement( "PSTYLE" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_paragStyle->displayName() );
     }
 
 }
 
-KWTableStyle *KWTableStyle::loadStyle( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion )
+KWTableStyle *KWTableStyle::loadStyle( TQDomElement & parentElem, KWDocument *_doc, int docVersion )
 {
-    return new KWTableStyle( tqparentElem, _doc, docVersion );
+    return new KWTableStyle( parentElem, _doc, docVersion );
 }
 
 void KWTableStyle::saveOasis( KoGenStyles& mainStyles, KoSavingContext& /*savingContext*/ ) const
@@ -203,7 +203,7 @@ void KWTableStyle::loadOasis( TQDomElement & styleElem, KoOasisContext& context,
     styleStack.setTypeProperties( "table-cell" );
 
     styleStack.save();
-    context.addStyles( &styleElem, "table-cell" ); // Load all tqparents - only because we don't support inheritance.
+    context.addStyles( &styleElem, "table-cell" ); // Load all parents - only because we don't support inheritance.
 
     const TQString frameStyleName = styleStack.attributeNS( KoXmlNS::koffice, "frame-style-name" );
     m_frameStyle = frameStyles.findStyle( frameStyleName );
diff --git a/kword/KWTableStyle.h b/kword/KWTableStyle.h
index 2fe1f26d..0452312e 100644
--- a/kword/KWTableStyle.h
+++ b/kword/KWTableStyle.h
@@ -50,7 +50,7 @@ public:
     /** Create a blank framestyle (with default attributes) */
     KWTableStyle( const TQString & name, KoParagStyle * _style, KWFrameStyle * _frameStyle );
 
-    KWTableStyle( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    KWTableStyle( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
 
     /** Copy another framestyle */
     KWTableStyle( const KWTableStyle & rhs ) : KoUserStyle( TQString() ) { *this = rhs; }
@@ -67,12 +67,12 @@ public:
     void setFrameStyle( KWFrameStyle *frameStyle ) { m_frameStyle = frameStyle; }
 
     /// save (old xml format)
-    void saveTableStyle( TQDomElement & tqparentElem );
+    void saveTableStyle( TQDomElement & parentElem );
     /// save (new oasis xml format)
     void saveOasis( KoGenStyles& mainStyles, KoSavingContext& savingContext ) const;
 
     /// load (old xml format)
-    static KWTableStyle *loadStyle( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    static KWTableStyle *loadStyle( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
     /// load (new oasis xml format)
     void loadOasis( TQDomElement & styleElem, KoOasisContext& context, const KoStyleCollection& paragraphStyles, const KWFrameStyleCollection& frameStyles );
 
diff --git a/kword/KWTableTemplate.cpp b/kword/KWTableTemplate.cpp
index 76eb224e..7f4b4682 100644
--- a/kword/KWTableTemplate.cpp
+++ b/kword/KWTableTemplate.cpp
@@ -124,18 +124,18 @@ KWTableTemplate::KWTableTemplate( const TQString & name, KWTableStyle * _firstRo
     m_bottomLeftCorner = _bottomLeftCorner;
 }
 
-KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int /*docVersion*/ )
+KWTableTemplate::KWTableTemplate( TQDomElement & parentElem, KWDocument *_doc, int /*docVersion*/ )
 {
     m_topRightCorner = 0L;
     m_topLeftCorner = 0L;
     m_bottomRightCorner = 0L;
     m_bottomLeftCorner = 0L;
 
-    TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+    TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("value") ) )
         m_name = element.attribute( "value" );
 
-    element = tqparentElem.namedItem( "BODYCELL" ).toElement();
+    element = parentElem.namedItem( "BODYCELL" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
         m_bodyCell = _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) );
@@ -172,7 +172,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
             setBodyCell ( ts );
         }
     }
-    element = tqparentElem.namedItem( "FIRSTROW" ).toElement();
+    element = parentElem.namedItem( "FIRSTROW" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -186,7 +186,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
     else
         m_firstRow = m_bodyCell;
 
-    element = tqparentElem.namedItem( "FIRSTCOL" ).toElement();
+    element = parentElem.namedItem( "FIRSTCOL" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -200,7 +200,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
     else
         m_firstCol = m_bodyCell;
 
-    element = tqparentElem.namedItem( "LASTROW" ).toElement();
+    element = parentElem.namedItem( "LASTROW" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -214,7 +214,7 @@ KWTableTemplate::KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc,
     else
         m_lastRow = m_bodyCell;
 
-    element = tqparentElem.namedItem( "LASTCOL" ).toElement();
+    element = parentElem.namedItem( "LASTCOL" ).toElement();
     if ( ( !element.isNull() ) && ( element.hasAttribute("name") )
          && ( _doc->tableStyleCollection()->findStyle( element.attribute( "name" ) ) ) )
     {
@@ -254,46 +254,46 @@ TQString KWTableTemplate::displayName() const
 }
 
 // TODO
-void KWTableTemplate::saveTableTemplate( TQDomElement & tqparentElem )
+void KWTableTemplate::saveTableTemplate( TQDomElement & parentElem )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     element.setAttribute( "value", name() );
 
     if (m_bodyCell)
     {
         element = doc.createElement( "BODYCELL" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_bodyCell->name() );
     }
     if (m_firstRow)
     {
         element = doc.createElement( "FIRSTROW" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_firstRow->name() );
     }
     if (m_firstCol)
     {
         element = doc.createElement( "FIRSTCOL" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_firstCol->name() );
     }
     if (m_lastRow)
     {
         element = doc.createElement( "LASTROW" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_lastRow->name() );
     }
     if (m_lastCol)
     {
         element = doc.createElement( "LASTCOL" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "name", m_lastCol->name() );
     }
 }
 
-KWTableTemplate *KWTableTemplate::loadTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion )
+KWTableTemplate *KWTableTemplate::loadTemplate( TQDomElement & parentElem, KWDocument *_doc, int docVersion )
 {
-    return new KWTableTemplate(tqparentElem, _doc, docVersion);
+    return new KWTableTemplate(parentElem, _doc, docVersion);
 }
diff --git a/kword/KWTableTemplate.h b/kword/KWTableTemplate.h
index 84820d2f..b0e608d7 100644
--- a/kword/KWTableTemplate.h
+++ b/kword/KWTableTemplate.h
@@ -71,7 +71,7 @@ public:
 
     KWTableTemplate( const KWTableTemplate & rhs ) { *this = rhs; }
 
-    KWTableTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    KWTableTemplate( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
 
     ~KWTableTemplate() {}
 
@@ -121,11 +121,11 @@ public:
     void setBottomLeftCorner( KWTableStyle *_tableStyle ) { m_bottomLeftCorner = _tableStyle; }
 
     // SAVING METHODS
-    void save( TQDomElement tqparentElem, KoTextZoomHandler* zh );
-    void saveTableTemplate( TQDomElement & tqparentElem );
+    void save( TQDomElement parentElem, KoTextZoomHandler* zh );
+    void saveTableTemplate( TQDomElement & parentElem );
 
     // STATIC METHODS
-    static KWTableTemplate *loadTemplate( TQDomElement & tqparentElem, KWDocument *_doc, int docVersion=2 );
+    static KWTableTemplate *loadTemplate( TQDomElement & parentElem, KWDocument *_doc, int docVersion=2 );
 
 private:
     TQString m_name;
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index f976dd78..58d5af9a 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -227,7 +227,7 @@ KWFrame * KWTextFrameSet::documentToInternal( const KoPoint &dPoint, TQPoint &iP
 #ifdef DEBUG_DTI
     kdDebug() << "KWTextFrameSet::documentToInternal dPoint:" << dPoint.x() << "," << dPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
         iPoint = TQPoint( m_doc->ptToLayoutUnitPixX( dPoint.x() ),
                          m_doc->ptToLayoutUnitPixY( dPoint.y() ) );
         return m_frames.getFirst();
@@ -382,8 +382,8 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
 #ifdef DEBUG_ITD
     kdDebug() << "KWTextFrameSet::internalToDocumentWithHint hintDPoint: " << hintDPoint.x() << "," << hintDPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
-        dPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
+        dPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
         return m_frames.getFirst();
     }
     KWFrame *lastFrame = 0L;
@@ -421,7 +421,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
     kdDebug(32002) << "KWTextFrameSet::internalToDocumentWithHint " << iPoint.x() << "," << iPoint.y()
                    << " not in any frame of " << (void*)this << endl;
 #endif
-    dPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ); // bah
+    dPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ); // bah
     return 0L;
 }
 
@@ -429,7 +429,7 @@ KWFrame * KWTextFrameSet::internalToDocumentWithHint( const TQPoint &iPoint, KoP
 KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const KoPoint &relPoint, KWFrame* theFrame ) const
 {
     // It's ok to have theFrame == 0 in the text viewmode, but not in other modes
-    if ( m_doc->tqlayoutViewMode()->hasFrames() )
+    if ( m_doc->layoutViewMode()->hasFrames() )
         Q_ASSERT( theFrame );
     if ( theFrame )
         return KoPoint( relPoint.x() + theFrame->innerRect().x(),
@@ -441,7 +441,7 @@ KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const KoPoint &relPoint,
 KoPoint KWTextFrameSet::internalToDocumentKnowingFrame( const TQPoint &iPoint, KWFrame* theFrame ) const
 {
     // Convert LU to relative coordinates (pt), then call the real internalToDocumentKnowingFrame().
-    return internalToDocumentKnowingFrame( m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ), theFrame );
+    return internalToDocumentKnowingFrame( m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) ), theFrame );
 }
 
 TQPoint KWTextFrameSet::moveToPage( int currentPgNum, short int direction ) const
@@ -646,11 +646,11 @@ void KWTextFrameSet::drawFrameContents( KWFrame *theFrame, TQPainter *painter, c
         // Finding the "last parag of the frame" is a bit tricky.
         // It's usually the one before lastFormatted, except if it's actually lastParag :}  [see KoTextDocument::draw]
         KoTextParag * lastDrawn = lastFormatted->prev();
-        if ( lastFormatted == textDocument()->lastParag() && ( !lastDrawn || m_doc->tqlayoutUnitToPixelY( lastDrawn->rect().bottom() ) < r.bottom() ) )
+        if ( lastFormatted == textDocument()->lastParag() && ( !lastDrawn || m_doc->layoutUnitToPixelY( lastDrawn->rect().bottom() ) < r.bottom() ) )
             lastDrawn = lastFormatted;
 
         //kdDebug(32002) << "KWTextFrameSet::drawFrame drawn. onlyChanged=" << onlyChanged << " resetChanged=" << resetChanged << " lastDrawn=" << lastDrawn->paragId() << " lastDrawn's bottom:" << lastDrawn->rect().bottom() << " r.bottom=" << r.bottom() << endl;
-        if ( lastDrawn && m_doc->tqlayoutUnitToPixelY( lastDrawn->rect().bottom() ) > r.bottom() )
+        if ( lastDrawn && m_doc->layoutUnitToPixelY( lastDrawn->rect().bottom() ) > r.bottom() )
         {
             //kdDebug(32002) << "KWTextFrameSet::drawFrame setting lastDrawn " << lastDrawn->paragId() << " to changed" << endl;
             lastDrawn->setChanged( true );
@@ -697,7 +697,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
     TQPoint topLeft = parag->rect().topLeft();         // in TQRT coords
     int lineY;
     // Cursor height, in pixels
-    int cursorHeight = m_doc->tqlayoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
+    int cursorHeight = m_doc->layoutUnitToPixelY( topLeft.y(), parag->lineHeightOfChar( cursor->index(), 0, &lineY ) );
     TQPoint iPoint( topLeft.x() + cursor->x(),
                    topLeft.y() + lineY );
 
@@ -721,7 +721,7 @@ void KWTextFrameSet::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursor
         kdDebug() << " vPoint(view, pixels)=" << vPoint.x() << "," << vPoint.y() << endl;
 #endif
         // from now on, iPoint will be in pixels
-        iPoint = m_doc->tqlayoutUnitToPixel( iPoint );
+        iPoint = m_doc->layoutUnitToPixel( iPoint );
         //int xadj = parag->at( cursor->index() )->pixelxadj;
 #ifdef DEBUG_CURSOR
         //kdDebug() << "     iPoint in pixels : " << iPoint.x() << "," << iPoint.y() << "     will add xadj=" << xadj << endl;
@@ -974,7 +974,7 @@ void KWTextFrameSet::getMargins( int yp, int h, int reqMinWidth,
 #ifdef DEBUG_MARGINS
     kdDebugBody(32002) << "  getMargins: looking for frames between " << yp << " and " << yp+h << " (internal coords)" << endl;
 #endif
-    if ( m_doc->tqlayoutViewMode()->shouldAdjustMargins() )
+    if ( m_doc->layoutViewMode()->shouldAdjustMargins() )
     {
         // Principle: for every frame on top at this height, we'll move from and to
         // towards each other. The text flows between 'from' and 'to'
@@ -1193,7 +1193,7 @@ int KWTextFrameSet::formatVertically( KoTextParag * _parag, const TQRect& paragR
 {
     // WARNING: in this whole method parag can be 0. See adjustFlow()
     KWTextParag *parag = static_cast<KWTextParag *>( _parag );
-    if ( !m_doc->tqlayoutViewMode()->shouldFormatVertically() )
+    if ( !m_doc->layoutViewMode()->shouldFormatVertically() )
     {
         return 0;
     }
@@ -1528,7 +1528,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint &
 #ifdef DEBUG_ITD
     kdDebug() << name() << " ITD called for relPoint=" << relPoint.x() << "," << relPoint.y() << endl;
 #endif
-    if ( !m_doc->tqlayoutViewMode()->hasFrames() ) { // text viewmode
+    if ( !m_doc->layoutViewMode()->hasFrames() ) { // text viewmode
         dPoint = relPoint;
         return m_frames.getFirst();
     }
@@ -1653,7 +1653,7 @@ KWFrame * KWTextFrameSet::internalToDocument( const KoPoint &relPoint, KoPoint &
 // same but with iPoint in LU
 KWFrame * KWTextFrameSet::internalToDocument( const TQPoint &iPoint, KoPoint &dPoint ) const
 {
-    KoPoint relPoint = m_doc->tqlayoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
+    KoPoint relPoint = m_doc->layoutUnitPtToPt( m_doc->pixelToPt( iPoint ) );
     return internalToDocument( relPoint, dPoint );
 }
 
@@ -1676,13 +1676,13 @@ void KWTextFrameSet::printDebug()
 }
 #endif
 
-TQDomElement KWTextFrameSet::saveInternal( TQDomElement &tqparentElem, bool saveFrames, bool saveAnchorsFramesets )
+TQDomElement KWTextFrameSet::saveInternal( TQDomElement &parentElem, bool saveFrames, bool saveAnchorsFramesets )
 {
     if ( m_frames.isEmpty() ) // Deleted frameset -> don't save
         return TQDomElement();
 
-    TQDomElement framesetElem = tqparentElem.ownerDocument().createElement( "FRAMESET" );
-    tqparentElem.appendChild( framesetElem );
+    TQDomElement framesetElem = parentElem.ownerDocument().createElement( "FRAMESET" );
+    parentElem.appendChild( framesetElem );
 
     if ( m_groupmanager ) {
         framesetElem.setAttribute( "grpMgr", m_groupmanager->name() );
@@ -2010,7 +2010,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
                 // The Y position doesn't matter much, recalcFrames will reposition the frame
                 // But the point of this code is set the correct height for the frame.
                 double maxFooterSize = footerHeaderSizeMax( theFrame );
-                double diffPt = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                double diffPt = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                 wantedPosition = theFrame->top() - diffPt;
 #ifdef DEBUG_FORMAT_MORE
                 kdDebug() << "  diffPt=" << diffPt << " -> wantedPosition=" << wantedPosition << endl;
@@ -2038,7 +2038,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
             }
             // Other frames are resized by the bottom
 
-            wantedPosition = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) ) + theFrame->bottom();
+            wantedPosition = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) ) + theFrame->bottom();
             KWPage *page = m_doc->pageManager()->page( theFrame );
             double pageBottom;
             if(page)
@@ -2086,7 +2086,7 @@ bool KWTextFrameSet::slotAfterFormattingNeedMoreSpace( int bottom, KoTextParag *
                       // The Y position doesn't matter much, recalcFrames will reposition the frame
                       // But the point of this code is set the correct height for the frame.
                       double maxFooterSize = footerHeaderSizeMax( theFrame );
-                      double diffPt = m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                      double diffPt = m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                       wantedPosition = theFrame->top() - diffPt;
                       if ( wantedPosition < 0 )
                       {
@@ -2183,7 +2183,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
 #endif
     if ( theFrame->frameSet()->isAFooter() || theFrame->frameSet()->isFootEndNote() )
     {
-        double wantedPosition = theFrame->top() + m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+        double wantedPosition = theFrame->top() + m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
         Q_ASSERT( wantedPosition < theFrame->bottom() );
         if ( wantedPosition != theFrame->top() )
         {
@@ -2199,7 +2199,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
     }
     else // header or other frame: resize bottom
     {
-        double wantedPosition = theFrame->bottom() - m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+        double wantedPosition = theFrame->bottom() - m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
 #ifdef DEBUG_FORMAT_MORE
         kdDebug() << "slotAfterFormatting wantedPosition=" << wantedPosition << " top+minheight=" << theFrame->top() + s_minFrameHeight << endl;
 #endif
@@ -2231,7 +2231,7 @@ void KWTextFrameSet::slotAfterFormattingTooMuchSpace( int bottom )
                     else if ( table->anchorFrameset()->isAFooter() ||  table->anchorFrameset()->isFootEndNote() )
                     {
                       theFrame = table->anchorFrameset()->frameIterator().getLast();
-                      double wantedPosition = theFrame->top() + m_doc->tqlayoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
+                      double wantedPosition = theFrame->top() + m_doc->layoutUnitPtToPt( m_doc->pixelYToPt( difference ) );
                       Q_ASSERT( wantedPosition < theFrame->bottom() );
                       if ( wantedPosition != theFrame->top() )
                       {
@@ -2459,9 +2459,9 @@ double KWTextFrameSet::footerHeaderSizeMax( KWFrame *theFrame )
     return tmp;
 }
 
-void KWTextFrameSet::frameResized( KWFrame *theFrame, bool tqinvalidateLayout )
+void KWTextFrameSet::frameResized( KWFrame *theFrame, bool invalidateLayout )
 {
-    kdDebug(32002) << "KWTextFrameSet::frameResized " << theFrame << " " << *theFrame << " tqinvalidateLayout=" << tqinvalidateLayout << endl;
+    kdDebug(32002) << "KWTextFrameSet::frameResized " << theFrame << " " << *theFrame << " invalidateLayout=" << invalidateLayout << endl;
     if ( theFrame->height() < 0 )
         return; // safety!
 
@@ -2486,7 +2486,7 @@ void KWTextFrameSet::frameResized( KWFrame *theFrame, bool tqinvalidateLayout )
     // m_doc->frameChanged( theFrame );
     // Warning, can't call tqlayout() (frameChanged calls it)
     // from here, since it calls formatMore() !
-    if ( tqinvalidateLayout )
+    if ( invalidateLayout )
         m_doc->tqinvalidate(this);
 
     // Can't tqrepaint directly, we might be in a paint event already
@@ -3361,9 +3361,9 @@ void KWTextFrameSetEdit::ensureCursorVisible()
     }
     TQPoint cursorPos = textFrameSet()->kWordDocument()->zoomPoint( pt );
     cursorPos = m_canvas->viewMode()->normalToView( cursorPos );
-    areaLeft = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelX( areaLeft ) + 1;
-    areaRight = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelX( areaRight ) + 1;
-    cursorHeight = textFrameSet()->kWordDocument()->tqlayoutUnitToPixelY( cursorHeight );
+    areaLeft = textFrameSet()->kWordDocument()->layoutUnitToPixelX( areaLeft ) + 1;
+    areaRight = textFrameSet()->kWordDocument()->layoutUnitToPixelX( areaRight ) + 1;
+    cursorHeight = textFrameSet()->kWordDocument()->layoutUnitToPixelY( cursorHeight );
     //kdDebug() << "KWTextFrameSetEdit::ensureCursorVisible pt=" << pt << " cursorPos=" << cursorPos
     //          << " areaLeft=" << areaLeft << " areaRight=" << areaRight << " y=" << y << endl;
     m_canvas->ensureVisible( cursorPos.x() - areaLeft, cursorPos.y() + cursorHeight / 2, areaLeft + areaRight, cursorHeight / 2 + 2 );
@@ -3653,7 +3653,7 @@ void KWTextFrameSetEdit::dropEvent( TQDropEvent * e, const TQPoint & nPoint, con
                 if ( cmd )
                     macroCmd->addCommand(cmd);
                 //retqlayout textframeset after a dnd otherwise autoextend
-                //frameset is not re-tqlayouted
+                //frameset is not re-layouted
                 textFrameSet()->tqlayout();
                 frameSet()->kWordDocument()->addCommand( macroCmd );
             }
diff --git a/kword/KWTextFrameSet.h b/kword/KWTextFrameSet.h
index 3477bc3f..b8cdd3f9 100644
--- a/kword/KWTextFrameSet.h
+++ b/kword/KWTextFrameSet.h
@@ -155,11 +155,11 @@ public:
      */
     void updateViewArea( TQWidget * w, KWViewMode* viewMode, const TQPoint & nPointBottom );
 
-    virtual TQDomElement save( TQDomElement &tqparentElem, bool saveFrames = true )
-    { return saveInternal( tqparentElem, saveFrames, false ); }
+    virtual TQDomElement save( TQDomElement &parentElem, bool saveFrames = true )
+    { return saveInternal( parentElem, saveFrames, false ); }
     /** save to XML - when copying to clipboard (includes floating framesets) */
-    virtual TQDomElement toXML( TQDomElement &tqparentElem, bool saveFrames = true )
-    { return saveInternal( tqparentElem, saveFrames, true ); }
+    virtual TQDomElement toXML( TQDomElement &parentElem, bool saveFrames = true )
+    { return saveInternal( parentElem, saveFrames, true ); }
 
     virtual void load( TQDomElement &attributes, bool loadFrames = true );
     /// Load the contents of a frame (i.e. the text)
@@ -353,7 +353,7 @@ private:
     void getMargins( int yp, int h, int reqMinWidth, int* marginLeft, int* marginRight, int* pageWidth, int* validHeight,
                      int* breakBegin, int* breakEnd, KoTextParag* parag );
     bool checkVerticalBreak( int & yp, int & h, KoTextParag * parag, bool linesTogether, int breakBegin, int breakEnd );
-    void frameResized( KWFrame *theFrame, bool tqinvalidateLayout );
+    void frameResized( KWFrame *theFrame, bool invalidateLayout );
     /**
      * Return the list of frames containing the text that goes from @p y1 to @p y2
      * (in internal coordinates).
@@ -361,7 +361,7 @@ private:
     TQValueList<KWFrame*> framesFromTo( int y1, int y2 ) const;
     double footerHeaderSizeMax( KWFrame *theFrame );
     double footNoteSize( KWFrame *theFrame );
-    TQDomElement saveInternal( TQDomElement &tqparentElem, bool saveFrames, bool saveAnchorsFramesets );
+    TQDomElement saveInternal( TQDomElement &parentElem, bool saveFrames, bool saveAnchorsFramesets );
     bool createNewPageAndNewFrame( KoTextParag* lastFormatted, int difference );
 
 private:
diff --git a/kword/KWTextImage.cpp b/kword/KWTextImage.cpp
index 0a036d87..981ce1cb 100644
--- a/kword/KWTextImage.cpp
+++ b/kword/KWTextImage.cpp
@@ -95,35 +95,35 @@ void KWTextImage::drawCustomItem( TQPainter* p, int x, int y, int wpix, int hpix
     }
 }
 
-void KWTextImage::save( TQDomElement & tqparentElem )
+void KWTextImage::save( TQDomElement & parentElem )
 {
     // This code is similar to KWPictureFrameSet::save
     KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument();
 
-    TQDomElement imageElem = tqparentElem.ownerDocument().createElement( "PICTURE" );
-    tqparentElem.appendChild( imageElem );
+    TQDomElement imageElem = parentElem.ownerDocument().createElement( "PICTURE" );
+    parentElem.appendChild( imageElem );
     //imageElem.setAttribute( "keepAspectRatio", "true" );
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "KEY" );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "KEY" );
     imageElem.appendChild( elem );
     image().getKey().saveAttributes( elem );
     // Now we must take care that a <KEY> element will be written as a child of <PICTURES>
     doc->addTextImageRequest( this );
 }
 
-void KWTextImage::load( TQDomElement & tqparentElem )
+void KWTextImage::load( TQDomElement & parentElem )
 {
     // This code is similar to KWPictureFrameSet::load
     KWDocument * doc = static_cast<KWTextDocument *>(tqparent)->textFrameSet()->kWordDocument();
 
     // <IMAGE> (KOffice 1.0) or <PICTURE> (KWord 1.2)
-    TQDomNode node=tqparentElem.namedItem( "PICTURE" );
+    TQDomNode node=parentElem.namedItem( "PICTURE" );
     if ( node.isNull() )
     {
-        node=tqparentElem.namedItem( "IMAGE" );
+        node=parentElem.namedItem( "IMAGE" );
     }
     TQDomElement image = node.toElement();
     if ( image.isNull() )
-        image = tqparentElem; // The data is directly child of <FORMAT>
+        image = parentElem; // The data is directly child of <FORMAT>
     // <KEY>
     TQDomElement keyElement = image.namedItem( "KEY" ).toElement();
     if ( !keyElement.isNull() )
diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp
index f715298d..d50e98a0 100644
--- a/kword/KWTextParag.cpp
+++ b/kword/KWTextParag.cpp
@@ -82,15 +82,15 @@ void KWTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
             //cg2.setColor( TQColorGroup::Base, TQt::green ); // for debug
             int last = length() - 1;
             KoTextStringChar &ch = string()->at( last );
-            int x = zh->tqlayoutUnitToPixelX( ch.x );// + ch.pixelxadj;
+            int x = zh->layoutUnitToPixelX( ch.x );// + ch.pixelxadj;
 
             KoTextFormat format( *lastFormat );
             format.setColor( pen.color() ); // ### A bit slow, maybe pass the color to drawParagStringInternal ?
             KoTextParag::drawParagStringInternal(
                 painter, str, 0, str.length(),
                 x, lastY_pix, // startX and lastY
-                zh->tqlayoutUnitToPixelY( ch.ascent() ), // baseline
-                width, zh->tqlayoutUnitToPixelY( ch.height() ), // bw and h
+                zh->layoutUnitToPixelY( ch.ascent() ), // baseline
+                width, zh->layoutUnitToPixelY( ch.height() ), // bw and h
                 drawSelections, &format, selectionStarts,
                 selectionEnds, cg2, rightToLeft, line, zh, false );
         // Clear 'paint end of line' flag, we don't want it overwriting the above
@@ -280,20 +280,20 @@ TQDomElement KWTextParag::saveFormat( TQDomDocument & doc, KoTextFormat * curFor
     return formatElem;
 }
 
-void KWTextParag::save( TQDomElement &tqparentElem, bool saveAnchorsFramesets )
+void KWTextParag::save( TQDomElement &parentElem, bool saveAnchorsFramesets )
 {
     // The TQMAX below ensures that although we don't save the trailing space
     // in the normal case, we do save it for empty paragraphs (#30336)
-    save( tqparentElem, 0, TQMAX( 0, length()-2 ), saveAnchorsFramesets );
+    save( parentElem, 0, TQMAX( 0, length()-2 ), saveAnchorsFramesets );
 }
 
-void KWTextParag::save( TQDomElement &tqparentElem, int from /* default 0 */,
+void KWTextParag::save( TQDomElement &parentElem, int from /* default 0 */,
                         int to /* default length()-2 */,
                         bool saveAnchorsFramesets /* default false */ )
 {
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement paragElem = doc.createElement( "PARAGRAPH" );
-    tqparentElem.appendChild( paragElem );
+    parentElem.appendChild( paragElem );
     TQDomElement textElem = doc.createElement( "TEXT" );
     textElem.setAttribute("xml:space", "preserve");
     paragElem.appendChild( textElem );
@@ -382,18 +382,18 @@ void KWTextParag::save( TQDomElement &tqparentElem, int from /* default 0 */,
         paragElem.appendChild( formatsElem );
 
 
-    TQDomElement tqlayoutElem = doc.createElement( "LAYOUT" );
-    paragElem.appendChild( tqlayoutElem );
+    TQDomElement layoutElem = doc.createElement( "LAYOUT" );
+    paragElem.appendChild( layoutElem );
 
     // save with the real tqalignment (left or right, not auto)
-    m_layout.saveParagLayout( tqlayoutElem, resolveAlignment() );
+    m_layout.saveParagLayout( layoutElem, resolveAlignment() );
 
     // Paragraph's format
     // ## Maybe we should have a "default format" somewhere and
     // pass it instead of 0L, to only save the non-default attributes
     // But this would break all export filters again.
     TQDomElement paragFormatElement = saveFormat( doc, paragraphFormat(), 0L, 0, to - from + 1 );
-    tqlayoutElem.appendChild( paragFormatElement );
+    layoutElem.appendChild( paragFormatElement );
 }
 
 //static
@@ -751,7 +751,7 @@ void KWTextParag::setParagLayout( const KoParagLayout & tqlayout, int flags, int
 //////////
 
 // Create a KoParagLayout from XML.
-KoParagLayout KWTextParag::loadParagLayout( TQDomElement & tqparentElem, KWDocument *doc, bool findStyle )
+KoParagLayout KWTextParag::loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool findStyle )
 {
     KoParagLayout tqlayout;
 
@@ -761,7 +761,7 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & tqparentElem, KWDocum
         KoParagStyle *style;
         // Name of the style. If there is no style, then we do not supply
         // any default!
-        TQDomElement element = tqparentElem.namedItem( "NAME" ).toElement();
+        TQDomElement element = parentElem.namedItem( "NAME" ).toElement();
         if ( !element.isNull() )
         {
             TQString styleName = element.attribute( "value" );
@@ -782,7 +782,7 @@ KoParagLayout KWTextParag::loadParagLayout( TQDomElement & tqparentElem, KWDocum
         tqlayout.style = style;
     }
 
-    KoParagLayout::loadParagLayout( tqlayout, tqparentElem, doc->syntaxVersion() );
+    KoParagLayout::loadParagLayout( tqlayout, parentElem, doc->syntaxVersion() );
 
     return tqlayout;
 }
diff --git a/kword/KWTextParag.h b/kword/KWTextParag.h
index db873c24..b0a9d044 100644
--- a/kword/KWTextParag.h
+++ b/kword/KWTextParag.h
@@ -62,10 +62,10 @@ public:
 
 
     /** Save (to KWord-1.3 XML) the whole paragraph */
-    void save( TQDomElement &tqparentElem, bool saveAnchorsFramesets = false );
+    void save( TQDomElement &parentElem, bool saveAnchorsFramesets = false );
 
     /** Save (to KWord-1.3 XML) a portion of the paragraph */
-    void save( TQDomElement &tqparentElem, int from, int to, bool saveAnchorsFramesets = false );
+    void save( TQDomElement &parentElem, int from, int to, bool saveAnchorsFramesets = false );
 
     /** Load (from KWord-1.3 XML) the paragraph */
     void load( TQDomElement &attributes );
@@ -77,7 +77,7 @@ public:
     void loadLayout( TQDomElement & attributes );
 
     /** Load (from KWord-1.3 XML), optionally using styles from document. */
-    static KoParagLayout loadParagLayout( TQDomElement & tqparentElem, KWDocument *doc, bool useRefStyle );
+    static KoParagLayout loadParagLayout( TQDomElement & parentElem, KWDocument *doc, bool useRefStyle );
 
     virtual void loadOasis( const TQDomElement& e, KoOasisContext& context, KoStyleCollection *styleCollection, uint& pos );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context,
diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp
index 1b463878..45fa37cd 100644
--- a/kword/KWVariable.cpp
+++ b/kword/KWVariable.cpp
@@ -92,15 +92,15 @@ void KWVariableSettings::loadNoteConfiguration( const TQDomElement& tqparent )
     }
 }
 
-void KWVariableSettings::save( TQDomElement &tqparentElem )
+void KWVariableSettings::save( TQDomElement &parentElem )
 {
-    KoVariableSettings::save( tqparentElem );
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    KoVariableSettings::save( parentElem );
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement footNoteSettingElem = doc.createElement( "FOOTNOTESETTING" );
-    tqparentElem.appendChild( footNoteSettingElem );
+    parentElem.appendChild( footNoteSettingElem );
     m_footNoteCounter.save( footNoteSettingElem );
     TQDomElement endNoteSettingElem = doc.createElement( "ENDNOTESETTING" );
-    tqparentElem.appendChild( endNoteSettingElem );
+    parentElem.appendChild( endNoteSettingElem );
     m_endNoteCounter.save( endNoteSettingElem );
 }
 
@@ -197,7 +197,7 @@ KWPgNumVariable::KWPgNumVariable( KoTextDocument *textdoc, int subtype, KoVariab
 
 void KWPgNumVariable::recalc()
 {
-    if ( !m_doc->tqlayoutViewMode()->hasPages() ) // ModeText
+    if ( !m_doc->layoutViewMode()->hasPages() ) // ModeText
     {
         //necessary to resize it in this mode because in this mode
         //we don't call KWTextFrameSet::drawFrame()
@@ -221,7 +221,7 @@ TQString KWPgNumVariable::text(bool realValue)
     if (m_varColl->variableSetting()->displayFieldCode()&& !realValue)
         return fieldCode();
     // #### ??? What?
-    else if ( m_subtype !=  VST_CURRENT_SECTION && !m_doc->tqlayoutViewMode()->hasPages() && !realValue)
+    else if ( m_subtype !=  VST_CURRENT_SECTION && !m_doc->layoutViewMode()->hasPages() && !realValue)
         return fieldCode();
     else
         return m_varFormat->convert( m_varValue );
@@ -367,10 +367,10 @@ void KWFootNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& contex
     writer.endElement();
 }
 
-void KWFootNoteVariable::saveVariable( TQDomElement &tqparentElem )
+void KWFootNoteVariable::saveVariable( TQDomElement &parentElem )
 {
-    TQDomElement footnoteElem = tqparentElem.ownerDocument().createElement( "FOOTNOTE" );
-    tqparentElem.appendChild( footnoteElem );
+    TQDomElement footnoteElem = parentElem.ownerDocument().createElement( "FOOTNOTE" );
+    parentElem.appendChild( footnoteElem );
     //footnoteElem.setAttribute( "subtype", 0 );
     if ( m_numberingType == Auto )
         footnoteElem.setAttribute( "value", m_numDisplay );
@@ -500,7 +500,7 @@ void KWFootNoteVariable::drawCustomItem( TQPainter* p, int x, int y, int wpix, i
     int offset = _offset;
     if ( offset == 0 )
     {
-        int h = zh->tqlayoutUnitToPixelY( /*_y HACK,*/ height );
+        int h = zh->layoutUnitToPixelY( /*_y HACK,*/ height );
         offset = -( h - TQFontMetrics(font).height() );
     }
 
@@ -619,7 +619,7 @@ double KWFootNoteVariable::varY() const
         kdDebug(32001) << "KWFootNoteVariable::varY too early, no updateFrames yet" << endl;
         return 0; // this happens on loading - frame tqlayout is done before text tqlayout
     }
-    // What we need is "has never been formatted". Not "has just been tqinvalidated"...
+    // What we need is "has never been formatted". Not "has just been invalidated"...
     //if ( !paragraph()->isValid() )
     //{
     //    kdDebug(32001) << "KWFootNoteVariable::varY called but paragraph " << paragraph()->paragId() << " not valid" << endl;
diff --git a/kword/KWVariable.h b/kword/KWVariable.h
index 005ca434..e0445957 100644
--- a/kword/KWVariable.h
+++ b/kword/KWVariable.h
@@ -44,7 +44,7 @@ class KWVariableSettings : public KoVariableSettings
  public:
     KWVariableSettings();
     virtual ~KWVariableSettings() {}
-    virtual void save( TQDomElement &tqparentElem );
+    virtual void save( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     void saveNoteConfiguration( KoXmlWriter& writer ) const;
     void loadNoteConfiguration( const TQDomElement& tqparent );
@@ -126,7 +126,7 @@ public:
     KWFootNoteFrameSet * frameSet() const { return m_frameset; }
     void setFrameSet( KWFootNoteFrameSet* fs ) { Q_ASSERT( !m_frameset ); m_frameset = fs; }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
 
     virtual void loadOasis( const TQDomElement &footNoteTag, KoOasisContext& context );
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 2651e6ad..92181228 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -1420,7 +1420,7 @@ void KWView::updateGridButton()
     m_actionViewSnapToGrid->setChecked ( m_doc->snapToGrid() );
 }
 
-void KWView::loadexpressionActions( KActionMenu * tqparentMenu)
+void KWView::loadexpressionActions( KActionMenu * parentMenu)
 {
     KActionPtrList lst = actionCollection()->actions("expression-action");
     TQValueList<KAction *> actions = lst;
@@ -1434,7 +1434,7 @@ void KWView::loadexpressionActions( KActionMenu * tqparentMenu)
         delete *it;
     }
 
-    tqparentMenu->popupMenu()->clear();
+    parentMenu->popupMenu()->clear();
     TQStringList path = m_doc->personalExpressionPath();
     TQStringList files;
     for ( TQStringList::Iterator it = path.begin(); it != path.end(); ++it )
@@ -1452,10 +1452,10 @@ void KWView::loadexpressionActions( KActionMenu * tqparentMenu)
     int i = 0;
     int nbFile = 0;
     for( TQStringList::Iterator it = files.begin(); it != files.end(); ++it,nbFile++ )
-        createExpressionActions( tqparentMenu,*it, i,(nbFile<(int)files.count()-1), personalShortCuts );
+        createExpressionActions( parentMenu,*it, i,(nbFile<(int)files.count()-1), personalShortCuts );
 }
 
-void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut )
+void KWView::createExpressionActions( KActionMenu * parentMenu,const TQString& filename,int &i, bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut )
 {
     TQFile file( filename );
     if ( !file.exists() || !file.open( IO_ReadOnly ) )
@@ -1477,7 +1477,7 @@ void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString&
                 expressionExist =true;
                 TQString group = i18n( e.namedItem( "TypeName" ).toElement().text().utf8() );
                 KActionMenu * subMenu = new KActionMenu( group, actionCollection() );
-                tqparentMenu->insert( subMenu );
+                parentMenu->insert( subMenu );
 
                 TQDomNode n2 = e.firstChild();
                 for( ; !n2.isNull(); n2 = n2.nextSibling() )
@@ -1504,7 +1504,7 @@ void KWView::createExpressionActions( KActionMenu * tqparentMenu,const TQString&
         }
     }
     if(expressionExist && insertSepar)
-        tqparentMenu->popupMenu()->insertSeparator();
+        parentMenu->popupMenu()->insertSeparator();
 }
 
 void KWView::insertExpression()
@@ -1519,15 +1519,15 @@ void KWView::insertExpression()
 
 
 void KWView::addVariableActions( int type, const TQStringList & texts,
-                                 KActionMenu * tqparentMenu, const TQString & menuText )
+                                 KActionMenu * parentMenu, const TQString & menuText )
 {
-    // Single items go directly into tqparentMenu.
+    // Single items go directly into parentMenu.
     // For multiple items we create a submenu.
     if ( texts.count() > 1 && !menuText.isEmpty() )
     {
         KActionMenu * subMenu = new KActionMenu( menuText, actionCollection() );
-        tqparentMenu->insert( subMenu );
-        tqparentMenu = subMenu;
+        parentMenu->insert( subMenu );
+        parentMenu = subMenu;
     }
     TQStringList::ConstIterator it = texts.begin();
     for ( int i = 0; it != texts.end() ; ++it, ++i )
@@ -1544,7 +1544,7 @@ void KWView::addVariableActions( int type, const TQStringList & texts,
             // Mainly for KEditToolbar
             act->setToolTip( i18n( "Insert variable \"%1\" into the text" ).tqarg( *it ) );
             m_variableDefMap.insert( act, v );
-            tqparentMenu->insert( act );
+            parentMenu->insert( act );
         }
     }
 }
@@ -6203,7 +6203,7 @@ void KWView::inlineFrame()
     if( !frame)
         return;
     KWFrameSet * fs = frame->frameSet();
-    KWFrameSet * tqparentFs = fs->groupmanager() ? fs->groupmanager() : fs;
+    KWFrameSet * parentFs = fs->groupmanager() ? fs->groupmanager() : fs;
 
     if(m_actionInlineFrame->isChecked())
     {
@@ -6214,7 +6214,7 @@ void KWView::inlineFrame()
 
         KoPoint initialPos = frame->topLeft();
         // turn non-floating frame into floating frame
-        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Inline"), tqparentFs, true );
+        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Inline"), parentFs, true );
         cmd->execute();
 
         frameindexList.append( FrameIndex( frame ) );
@@ -6228,7 +6228,7 @@ void KWView::inlineFrame()
     }
     else
     {
-        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Non-Inline"), tqparentFs, false );
+        KWFrameSetInlineCommand *cmd = new KWFrameSetInlineCommand( i18n("Make Frameset Non-Inline"), parentFs, false );
         m_doc->addCommand(cmd);
         cmd->execute();
     }
diff --git a/kword/KWView.h b/kword/KWView.h
index 7f84334f..58134978 100644
--- a/kword/KWView.h
+++ b/kword/KWView.h
@@ -497,11 +497,11 @@ protected slots:
 
 protected:
     void addVariableActions( int type, const TQStringList & texts,
-                             KActionMenu * tqparentMenu, const TQString & menuText );
+                             KActionMenu * parentMenu, const TQString & menuText );
 
-    void loadexpressionActions( KActionMenu * tqparentMenu);
+    void loadexpressionActions( KActionMenu * parentMenu);
 
-    void createExpressionActions( KActionMenu * tqparentMenu,const TQString& filename,int &i , bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut );
+    void createExpressionActions( KActionMenu * parentMenu,const TQString& filename,int &i , bool insertSepar, const TQMap<TQString, KShortcut>& personalShortCut );
 
     void showParagraphDialog( int initialPage = -1, double initialTabPos = 0.0 );
 
diff --git a/kword/KWViewMode.cpp b/kword/KWViewMode.cpp
index 02130dc0..c1c6f16e 100644
--- a/kword/KWViewMode.cpp
+++ b/kword/KWViewMode.cpp
@@ -508,10 +508,10 @@ TQSize KWViewModeText::contentsSize()
     // The width is the one from the text, so that the placement of tabs makes a bit of sense, etc.
     // The minimum height is the one of a normal page though.
 
-    int width = m_doc->tqlayoutUnitToPixelX( m_textFrameSet->textDocument()->width() );
+    int width = m_doc->layoutUnitToPixelX( m_textFrameSet->textDocument()->width() );
 
     int height = TQMAX((int)m_doc->paperHeight(m_doc->startPage()),
-                      m_doc->tqlayoutUnitToPixelY( m_textFrameSet->textDocument()->height() ) );
+                      m_doc->layoutUnitToPixelY( m_textFrameSet->textDocument()->height() ) );
     //kdDebug() << "KWViewModeText::contentsSize " << width << "x" << height << endl;
     return TQSize( width, height );
 }
@@ -526,10 +526,10 @@ bool KWViewModeText::isFrameSetVisible( const KWFrameSet *fs )
     if(fs==NULL) return false; // assertion
     if(fs==textFrameSet()) return true;
 
-    const KWFrameSet* tqparentFrameset = fs->groupmanager() ? fs->groupmanager() : fs;
-    while ( tqparentFrameset->isFloating() ) {
-        tqparentFrameset = tqparentFrameset->anchorFrameset();
-        if ( tqparentFrameset == m_textFrameSet )
+    const KWFrameSet* parentFrameset = fs->groupmanager() ? fs->groupmanager() : fs;
+    while ( parentFrameset->isFloating() ) {
+        parentFrameset = parentFrameset->anchorFrameset();
+        if ( parentFrameset == m_textFrameSet )
             return true;
     }
     return false;
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index d539f692..af23925e 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -139,18 +139,18 @@ void KWClassicSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqparent
 	}
 }
 
-void KWClassicSerialDataSource::load( TQDomElement& tqparentElem )
+void KWClassicSerialDataSource::load( TQDomElement& parentElem )
 {
 	db.clear();
 	sampleRecord.clear();
-	TQDomNode defNd=tqparentElem.namedItem("DEFINITION");
+	TQDomNode defNd=parentElem.namedItem("DEFINITION");
 	if (defNd.isNull()) return;
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
 		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=i18n( "No Value" );
 	}
-	TQDomNode contNd=tqparentElem.namedItem("CONTENT");
+	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
 	for (TQDomNode rec=contNd.firstChild();!rec.isNull();rec=rec.nextSibling())
 	{
@@ -255,7 +255,7 @@ KWClassicMailMergeEditorList::KWClassicMailMergeEditorList( TQWidget *tqparent,
     currentRecord = -1;
 }
 
-void KWClassicMailMergeEditorList::tqinvalidateCurrentRecord()
+void KWClassicMailMergeEditorList::invalidateCurrentRecord()
 {
 	currentRecord=-1;
 }
@@ -537,7 +537,7 @@ void KWClassicMailMergeEditor::removeRecord()
         return;
 
     db->removeRecord( records->value() - 1 );
-    dbList->tqinvalidateCurrentRecord();
+    dbList->invalidateCurrentRecord();
     if ( db->getNumRecords() > 0 ) {
         records->setRange( records->minValue(), records->maxValue() - 1 );
         records->setValue( 1 );
diff --git a/kword/mailmerge/KWClassicSerialDataSource.h b/kword/mailmerge/KWClassicSerialDataSource.h
index 713f41d8..43416b07 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.h
+++ b/kword/mailmerge/KWClassicSerialDataSource.h
@@ -110,7 +110,7 @@ public:
     KWClassicMailMergeEditorList( TQWidget *tqparent, KWClassicSerialDataSource *db_ );
     virtual ~KWClassicMailMergeEditorList();
 
-    void tqinvalidateCurrentRecord();
+    void invalidateCurrentRecord();
     void updateItems();
     void displayRecord( int i );
 
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index aeadae4c..855611f5 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -396,10 +396,10 @@ TQStringList KWMailMergeKABC::lists() const
 }
 
 
-void KWMailMergeKABC::load( TQDomElement& tqparentElem )
+void KWMailMergeKABC::load( TQDomElement& parentElem )
 {
     clear();
-    TQDomNode contentNode=tqparentElem.namedItem("CONTENT");
+    TQDomNode contentNode=parentElem.namedItem("CONTENT");
     if( contentNode.isNull() )
         return;
     for( TQDomNode rec=contentNode.firstChild(); !rec.isNull(); rec=rec.nextSibling() )
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index 40521704..c7276c9b 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -287,7 +287,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 518699a8..e48fbf34 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -56,9 +56,9 @@ TQString KWMailMergeKSpread::getValue( const TQString &name, int record ) const
     return i18n( "Unkown mail merge variable: %1" ).tqarg( name );
 }
 
-void KWMailMergeKSpread::load( TQDomElement& tqparentElem )
+void KWMailMergeKSpread::load( TQDomElement& parentElem )
 {
-  TQDomNode contentNode = tqparentElem.namedItem( "CONTENT" );
+  TQDomNode contentNode = parentElem.namedItem( "CONTENT" );
   if ( contentNode.isNull() )
     return;
 
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index 8020b0aa..f3129420 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -111,10 +111,10 @@ void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &tqpar
         }
 }
 
-void KWQtSqlPowerSerialDataSource::load( TQDomElement& tqparentElem )
+void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
 {
         clearSampleRecord();
-        TQDomNode defNd=tqparentElem.namedItem("DEFINITION");
+        TQDomNode defNd=parentElem.namedItem("DEFINITION");
         if (!defNd.isNull())
 	{
 	        TQDomElement def=defNd.toElement();
@@ -138,7 +138,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& tqparentElem )
 		}
         }
 
-        defNd=tqparentElem.namedItem("SAMPLERECORD");
+        defNd=parentElem.namedItem("SAMPLERECORD");
         if (!defNd.isNull())
 	{
 		TQDomElement def1=defNd.toElement();
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 4083c1e1..47ce94cf 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -91,19 +91,19 @@ void KWQtSqlSerialDataSource::save( TQDomDocument & /*doc*/, TQDomElement & /*tq
 */
 }
 
-void KWQtSqlSerialDataSource::load( TQDomElement& /*tqparentElem*/ )
+void KWQtSqlSerialDataSource::load( TQDomElement& /*parentElem*/ )
 {
 /*
 	db.clear();
 	sampleRecord.clear();
-	TQDomNode defNd=tqparentElem.namedItem("DEFINITION");
+	TQDomNode defNd=parentElem.namedItem("DEFINITION");
 	if (defNd.isNull()) return;
 	TQDomElement def=defNd.toElement();
 	for (TQDomElement defEnt=def.firstChild().toElement();!defEnt.isNull();defEnt=defEnt.nextSibling().toElement())
 	{
 		sampleRecord[defEnt.attribute(TQString::tqfromLatin1("name"))]=defEnt.attribute(TQString::tqfromLatin1("name"));//i18n( "No Value" );
 	}
-	TQDomNode contNd=tqparentElem.namedItem("CONTENT");
+	TQDomNode contNd=parentElem.namedItem("CONTENT");
 	if (contNd.isNull()) return;
 	for (TQDomNode rec=contNd.firstChild();!rec.isNull();rec=rec.nextSibling())
 	{
diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui
index bd579f81..a68b62db 100644
--- a/kword/mailmerge/sql/kwqtsqlpower.ui
+++ b/kword/mailmerge/sql/kwqtsqlpower.ui
@@ -229,5 +229,5 @@
     <include location="global" impldecl="in declaration">klistbox.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/mailmerge/sql/qtsqldatasourceeditor.ui b/kword/mailmerge/sql/qtsqldatasourceeditor.ui
index a22ae687..24d32b79 100644
--- a/kword/mailmerge/sql/qtsqldatasourceeditor.ui
+++ b/kword/mailmerge/sql/qtsqldatasourceeditor.ui
@@ -154,5 +154,5 @@
 <Q_SLOTS>
     <slot>filterCheckBox_toggled( bool fcb_state )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kword/mailmerge/sql/qtsqlopenwidget.ui b/kword/mailmerge/sql/qtsqlopenwidget.ui
index 80c190b3..fc32bded 100644
--- a/kword/mailmerge/sql/qtsqlopenwidget.ui
+++ b/kword/mailmerge/sql/qtsqlopenwidget.ui
@@ -297,5 +297,5 @@
     <include location="global" impldecl="in declaration">kcombobox.h</include>
     <include location="global" impldecl="in declaration">kpushbutton.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kformula/DESIGN b/lib/kformula/DESIGN
index f060b897..fc404921 100644
--- a/lib/kformula/DESIGN
+++ b/lib/kformula/DESIGN
@@ -56,7 +56,7 @@ except SequenceElements if they contains a SequenceElement they merge
 it in the list
 
 They can handle splitting of the sequence to allow "select an put selected item
-between tqparenthesis" i.e. as content child of a delimiterelement) 
+between parenthesis" i.e. as content child of a delimiterelement) 
 
 
 FormulaElement from SequenceElement
@@ -90,7 +90,7 @@ contains one char and no tqchildren at all.
 
 
 Might have its own font and size. But preferes to use a reasonalbe
-font and size that are calculated from its tqparents font and a given
+font and size that are calculated from its parents font and a given
 scheme (see below).
 
 
@@ -353,7 +353,7 @@ turns this on.)
 Fonts and font size
 ###################
 
-Each elements font size is calculated starting from its tqparents font
+Each elements font size is calculated starting from its parents font
 size. It knows how it differs to those.
 
 The font size might also be used to choose the pen width and other
diff --git a/lib/kformula/basicelement.cc b/lib/kformula/basicelement.cc
index bbe6f453..da961df3 100644
--- a/lib/kformula/basicelement.cc
+++ b/lib/kformula/basicelement.cc
@@ -80,11 +80,11 @@ FormulaElement* BasicElement::formula()
  * Returns the element the point is in.
  */
 BasicElement* BasicElement::goToPos( FormulaCursor*, bool&,
-                                     const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                     const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    luPixel x = point.x() - (tqparentOrigin.x() + getX());
+    luPixel x = point.x() - (parentOrigin.x() + getX());
     if ((x >= 0) && (x < getWidth())) {
-        luPixel y = point.y() - (tqparentOrigin.y() + getY());
+        luPixel y = point.y() - (parentOrigin.y() + getY());
         if ((y >= 0) && (y < getHeight())) {
             return this;
         }
diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h
index d373fc6c..025dfbc6 100644
--- a/lib/kformula/basicelement.h
+++ b/lib/kformula/basicelement.h
@@ -141,7 +141,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Returns our position inside the widget.
@@ -158,7 +158,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 							ContextStyle::TextStyle tstyle,
@@ -167,15 +167,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin ) = 0;
+                       const LuPixelPoint& parentOrigin ) = 0;
 
 
     /**
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc
index d95eac78..0a599dc0 100644
--- a/lib/kformula/bracketelement.cc
+++ b/lib/kformula/bracketelement.cc
@@ -59,7 +59,7 @@ SingleContentElement::~SingleContentElement()
 TQChar SingleContentElement::getCharacter() const
 {
     // This is meant to make the SingleContentElement text only.
-    // This "fixes" the tqparenthesis problem (tqparenthesis too large).
+    // This "fixes" the parenthesis problem (parenthesis too large).
     // I'm not sure if we really want this. There should be better ways.
     if ( content->isTextOnly() ) {
         return '\\';
@@ -68,12 +68,12 @@ TQChar SingleContentElement::getCharacter() const
 }
 
 BasicElement* SingleContentElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                             const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                             const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
@@ -252,12 +252,12 @@ void BracketElement::entered( SequenceElement* /*child*/ )
 
 
 BasicElement* BracketElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                       const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                       const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
         e = getContent()->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
             return e;
@@ -281,7 +281,7 @@ BasicElement* BracketElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void BracketElement::calcSizes( const ContextStyle& context,
                                 ContextStyle::TextStyle tstyle,
@@ -361,17 +361,17 @@ void BracketElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void BracketElement::draw( TQPainter& painter, const LuPixelRect& r,
                            const ContextStyle& context,
                            ContextStyle::TextStyle tstyle,
                            ContextStyle::IndexStyle istyle,
                            StyleAttributes& style,
-                           const LuPixelPoint& tqparentOrigin )
+                           const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -394,14 +394,14 @@ void BracketElement::draw( TQPainter& painter, const LuPixelRect& r,
 #if 0
     painter.setBrush( TQt::NoBrush );
     painter.setPen( TQt::red );
-    painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x()+left->getX() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+left->getY() ),
-                      context.tqlayoutUnitToPixelX( left->getWidth() ),
-                      context.tqlayoutUnitToPixelY( left->getHeight() ) );
-    painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x()+right->getX() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+right->getY() ),
-                      context.tqlayoutUnitToPixelX( right->getWidth() ),
-                      context.tqlayoutUnitToPixelY( right->getHeight() ) );
+    painter.drawRect( context.layoutUnitToPixelX( myPos.x()+left->getX() ),
+                      context.layoutUnitToPixelY( myPos.y()+left->getY() ),
+                      context.layoutUnitToPixelX( left->getWidth() ),
+                      context.layoutUnitToPixelY( left->getHeight() ) );
+    painter.drawRect( context.layoutUnitToPixelX( myPos.x()+right->getX() ),
+                      context.layoutUnitToPixelY( myPos.y()+right->getY() ),
+                      context.layoutUnitToPixelX( right->getWidth() ),
+                      context.layoutUnitToPixelY( right->getHeight() ) );
 #endif
 }
 
@@ -520,9 +520,9 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
     bool empty = false;
     int nodeCounter = 0;
     if ( m_operator ) {
-        node = node.tqparentNode();
+        node = node.parentNode();
         TQDomNode open = node;
-        TQDomNode tqparent = node.tqparentNode();
+        TQDomNode tqparent = node.parentNode();
         if ( ! operatorType( node, true ) )
             return -1;
         int nodeNum = searchOperator( node );
@@ -563,7 +563,7 @@ int BracketElement::readContentFromMathMLDom(TQDomNode& node)
             next = next.nextSibling();
         if ( ! next.isNull()) {
             TQDomDocument doc = node.ownerDocument();
-            TQDomNode tqparent = node.tqparentNode();
+            TQDomNode tqparent = node.parentNode();
             TQString ns = tqparent.prefix();
             TQDomElement de = doc.createElementNS( ns, "mrow" );
             uint pos = 0;
@@ -850,9 +850,9 @@ void OverlineElement::draw( TQPainter& painter, const LuPixelRect& r,
                             ContextStyle::TextStyle tstyle,
                             ContextStyle::IndexStyle istyle,
                             StyleAttributes& style,
-                            const LuPixelPoint& tqparentOrigin )
+                            const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -868,12 +868,12 @@ void OverlineElement::draw( TQPainter& painter, const LuPixelRect& r,
     //luPixel unit = (content->getHeight() + distY)/ 3;
 
     painter.setPen( TQPen( context.getDefaultColor(),
-                          context.tqlayoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
+                          context.layoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
 
-    painter.drawLine( context.tqlayoutUnitToPixelX( x ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+content->getWidth() ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ) );
+    painter.drawLine( context.layoutUnitToPixelX( x ),
+                      context.layoutUnitToPixelY( y+distY/3 ),
+                      context.layoutUnitToPixelX( x+content->getWidth() ),
+                      context.layoutUnitToPixelY( y+distY/3 ) );
 }
 
 
@@ -954,9 +954,9 @@ void UnderlineElement::draw( TQPainter& painter, const LuPixelRect& r,
                              ContextStyle::TextStyle tstyle,
                              ContextStyle::IndexStyle istyle,
                              StyleAttributes& style,
-                             const LuPixelPoint& tqparentOrigin )
+                             const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -972,12 +972,12 @@ void UnderlineElement::draw( TQPainter& painter, const LuPixelRect& r,
 
     double factor = style.sizeFactor();
     painter.setPen( TQPen( context.getDefaultColor(),
-                          context.tqlayoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
+                          context.layoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
 
-    painter.drawLine( context.tqlayoutUnitToPixelX( x ),
-                      context.tqlayoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ),
-                      context.tqlayoutUnitToPixelX( x+content->getWidth() ),
-                      context.tqlayoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ) );
+    painter.drawLine( context.layoutUnitToPixelX( x ),
+                      context.layoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ),
+                      context.layoutUnitToPixelX( x+content->getWidth() ),
+                      context.layoutUnitToPixelY( y+getHeight()-context.getLineWidth( factor ) ) );
 }
 
 
diff --git a/lib/kformula/bracketelement.h b/lib/kformula/bracketelement.h
index 98f515a1..eb0e2613 100644
--- a/lib/kformula/bracketelement.h
+++ b/lib/kformula/bracketelement.h
@@ -59,7 +59,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
@@ -196,11 +196,11 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 							ContextStyle::TextStyle tstyle,
@@ -209,15 +209,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-					   const LuPixelPoint& tqparentOrigin );
+					   const LuPixelPoint& parentOrigin );
 
 protected:
 
@@ -322,7 +322,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -331,15 +331,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * @returns the latex representation of the element and
@@ -389,7 +389,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -398,15 +398,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * @returns the latex representation of the element and
diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cc
index 0bf80237..c63cf09c 100644
--- a/lib/kformula/errorelement.cc
+++ b/lib/kformula/errorelement.cc
@@ -28,24 +28,24 @@ ErrorElement::ErrorElement( BasicElement* tqparent ) : SequenceElement( tqparent
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void ErrorElement::draw( TQPainter& painter, const LuPixelRect& r,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle istyle,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
 
-    painter.fillRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-                      context.tqlayoutUnitToPixelY( myPos.y() ),
-                      context.tqlayoutUnitToPixelX( getWidth() ),
-                      context.tqlayoutUnitToPixelY( getHeight() ),
+    painter.fillRect( context.layoutUnitToPixelX( myPos.x() ),
+                      context.layoutUnitToPixelY( myPos.y() ),
+                      context.layoutUnitToPixelX( getWidth() ),
+                      context.layoutUnitToPixelY( getHeight() ),
                       context.getErrorColor() );
-    inherited::draw( painter, r, context, tstyle, istyle, style, tqparentOrigin );
+    inherited::draw( painter, r, context, tstyle, istyle, style, parentOrigin );
 }
     
 KFORMULA_NAMESPACE_END
diff --git a/lib/kformula/errorelement.h b/lib/kformula/errorelement.h
index bc23b5e2..c7d69fed 100644
--- a/lib/kformula/errorelement.h
+++ b/lib/kformula/errorelement.h
@@ -31,15 +31,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 private:
     virtual TQString getElementName() const { return "merror"; }
diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc
index 0d1792e0..57088fef 100644
--- a/lib/kformula/fontstyle.cc
+++ b/lib/kformula/fontstyle.cc
@@ -266,17 +266,17 @@ static short cmex_nextchar( short ch )
 bool Artwork::calcCMDelimiterSize( const ContextStyle& context,
                                      uchar c,
                                      luPt fontSize,
-                                     luPt tqparentSize )
+                                     luPt parentSize )
 {
     TQFont f( "cmex10" );
-    f.setPointSizeFloat( context.tqlayoutUnitPtToPt( fontSize ) );
+    f.setPointSizeFloat( context.layoutUnitPtToPt( fontSize ) );
     TQFontMetrics fm( f );
 
     for ( char i=1; c != 0; ++i ) {
         LuPixelRect bound = fm.boundingRect( c );
 
         luPt height = context.ptToLayoutUnitPt( bound.height() );
-        if ( height >= tqparentSize ) {
+        if ( height >= parentSize ) {
             luPt width = context.ptToLayoutUnitPt( fm.width( c ) );
             luPt baseline = context.ptToLayoutUnitPt( -bound.top() );
 
@@ -300,7 +300,7 @@ void Artwork::calcLargest( const ContextStyle& context,
                              uchar c, luPt fontSize )
 {
     TQFont f( "cmex10" );
-    f.setPointSizeFloat( context.tqlayoutUnitPtToPt( fontSize ) );
+    f.setPointSizeFloat( context.layoutUnitPtToPt( fontSize ) );
     TQFontMetrics fm( f );
 
     cmChar = c;
@@ -329,11 +329,11 @@ void Artwork::drawCMDelimiter( TQPainter& painter, const ContextStyle& style,
                                  luPt height )
 {
     TQFont f( "cmex10" );
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( height, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( height, false ) );
 
     painter.setFont( f );
-    painter.drawText( style.tqlayoutUnitToPixelX( x ),
-                      style.tqlayoutUnitToPixelY( y + getBaseline() ),
+    painter.drawText( style.layoutUnitToPixelX( x ),
+                      style.layoutUnitToPixelY( y + getBaseline() ),
                       TQString( TQChar( cmChar ) ) );
 
     // Debug
@@ -342,8 +342,8 @@ void Artwork::drawCMDelimiter( TQPainter& painter, const ContextStyle& style,
     LuPixelRect bound = fm.boundingRect( cmChar );
     painter.setBrush(TQt::NoBrush);
     painter.setPen(TQt::green);
-    painter.drawRect( style.tqlayoutUnitToPixelX( x ),
-                      style.tqlayoutUnitToPixelY( y ),
+    painter.drawRect( style.layoutUnitToPixelX( x ),
+                      style.layoutUnitToPixelY( y ),
                       fm.width( cmChar ),
                       bound.height() );
 #endif
@@ -359,7 +359,7 @@ Artwork::Artwork(SymbolType t)
 void Artwork::calcSizes( const ContextStyle& style,
                            ContextStyle::TextStyle tstyle,
                            double factor,
-                           luPt tqparentSize )
+                           luPt parentSize )
 {
     setBaseline( -1 );
     cmChar = -1;
@@ -367,86 +367,86 @@ void Artwork::calcSizes( const ContextStyle& style,
     switch (getType()) {
     case LeftSquareBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftSquareBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, leftSquareBracket, tqparentSize, mySize );
+        calcRoundBracket( style, leftSquareBracket, parentSize, mySize );
         break;
     case RightSquareBracket:
         if ( calcCMDelimiterSize( style, cmex_RightSquareBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, rightSquareBracket, tqparentSize, mySize );
+        calcRoundBracket( style, rightSquareBracket, parentSize, mySize );
         break;
     case LeftLineBracket:
-        calcRoundBracket( style, leftLineBracket, tqparentSize, mySize );
+        calcRoundBracket( style, leftLineBracket, parentSize, mySize );
         setWidth( getWidth()/2 );
         break;
     case RightLineBracket:
-        calcRoundBracket( style, rightLineBracket, tqparentSize, mySize );
+        calcRoundBracket( style, rightLineBracket, parentSize, mySize );
         setWidth( getWidth()/2 );
         break;
     case SlashBracket:
         if ( calcCMDelimiterSize( style, cmex_SlashBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_SlashBracket, mySize );
         break;
     case BackSlashBracket:
         if ( calcCMDelimiterSize( style, cmex_BackSlashBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_BackSlashBracket, mySize );
         break;
     case LeftCornerBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftCornerBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_LeftCornerBracket, mySize );
         break;
     case RightCornerBracket:
         if ( calcCMDelimiterSize( style, cmex_RightCornerBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
         calcLargest( style, cmex_RightCornerBracket, mySize );
         break;
     case LeftRoundBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftRoundBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, leftRoundBracket, tqparentSize, mySize );
+        calcRoundBracket( style, leftRoundBracket, parentSize, mySize );
         break;
     case RightRoundBracket:
         if ( calcCMDelimiterSize( style, cmex_RightRoundBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcRoundBracket( style, rightRoundBracket, tqparentSize, mySize );
+        calcRoundBracket( style, rightRoundBracket, parentSize, mySize );
         break;
     case EmptyBracket:
-        setHeight(tqparentSize);
+        setHeight(parentSize);
         //setWidth(style.getEmptyRectWidth());
         setWidth(0);
         break;
     case LeftCurlyBracket:
         if ( calcCMDelimiterSize( style, cmex_LeftCurlyBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcCurlyBracket( style, leftCurlyBracket, tqparentSize, mySize );
+        calcCurlyBracket( style, leftCurlyBracket, parentSize, mySize );
         break;
     case RightCurlyBracket:
         if ( calcCMDelimiterSize( style, cmex_RightCurlyBracket,
-                                  mySize, tqparentSize ) ) {
+                                  mySize, parentSize ) ) {
             return;
         }
-        calcCurlyBracket( style, rightCurlyBracket, tqparentSize, mySize );
+        calcCurlyBracket( style, rightCurlyBracket, parentSize, mySize );
         break;
     case Integral:
         calcCharSize( style, style.getBracketFont(), mySize, cmex_Int );
@@ -516,11 +516,11 @@ void Artwork::calcSizes( const ContextStyle& style,
 
 void Artwork::draw(TQPainter& painter, const LuPixelRect& /*r*/,
                    const ContextStyle& context, ContextStyle::TextStyle tstyle,
-                   StyleAttributes& style, const LuPixelPoint& tqparentOrigin)
+                   StyleAttributes& style, const LuPixelPoint& parentOrigin)
 {
     luPt mySize = context.getAdjustedSize( tstyle, style.sizeFactor() );
-    luPixel myX = tqparentOrigin.x() + getX();
-    luPixel myY = tqparentOrigin.y() + getY();
+    luPixel myX = parentOrigin.x() + getX();
+    luPixel myY = parentOrigin.y() + getY();
     /*
     if ( !LuPixelRect( myX, myY, getWidth(), getHeight() ).intersects( r ) )
         return;
@@ -685,10 +685,10 @@ void Artwork::draw(TQPainter& painter, const LuPixelRect& ,
     // debug
 //     painter.setBrush(TQt::NoBrush);
 //     painter.setPen(TQt::green);
-//     painter.drawRect( context.tqlayoutUnitToPixelX( myX ),
-//                       context.tqlayoutUnitToPixelY( myY ),
-//                       context.tqlayoutUnitToPixelX( getWidth() ),
-//                       context.tqlayoutUnitToPixelY( getHeight() ) );
+//     painter.drawRect( context.layoutUnitToPixelX( myX ),
+//                       context.layoutUnitToPixelY( myY ),
+//                       context.layoutUnitToPixelX( getWidth() ),
+//                       context.layoutUnitToPixelY( getHeight() ) );
 }
 
 void Artwork::calcCharSize( const ContextStyle& style, luPt height, TQChar ch )
@@ -708,7 +708,7 @@ void Artwork::drawCharacter( TQPainter& painter, const ContextStyle& style,
 void Artwork::calcCharSize( const ContextStyle& style, TQFont f,
                             luPt height, TQChar c )
 {
-    f.setPointSizeFloat( style.tqlayoutUnitPtToPt( height ) );
+    f.setPointSizeFloat( style.layoutUnitPtToPt( height ) );
     //f.setPointSize( height );
     TQFontMetrics fm(f);
     setWidth( style.ptToLayoutUnitPt( fm.width( c ) ) );
@@ -722,11 +722,11 @@ void Artwork::drawCharacter( TQPainter& painter, const ContextStyle& style,
                              TQFont f,
                              luPixel x, luPixel y, luPt height, uchar c )
 {
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( height, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( height, false ) );
 
     painter.setFont( f );
-    painter.drawText( style.tqlayoutUnitToPixelX( x ),
-                      style.tqlayoutUnitToPixelY( y+getBaseline() ),
+    painter.drawText( style.layoutUnitToPixelX( x ),
+                      style.layoutUnitToPixelY( y+getBaseline() ),
                       TQString( TQChar( c ) ) );
 }
 
@@ -739,7 +739,7 @@ void Artwork::calcRoundBracket( const ContextStyle& style, const TQChar chars[],
     //uchar line = style.symbolTable().character( chars[2] );
 
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitPtToPt( charHeight ) );
+    f.setPointSizeFloat( style.layoutUnitPtToPt( charHeight ) );
     TQFontMetrics fm( f );
     LuPtRect upperBound = fm.boundingRect( uppercorner );
     LuPtRect lowerBound = fm.boundingRect( lowercorner );
@@ -761,7 +761,7 @@ void Artwork::drawBigRoundBracket( TQPainter& p, const ContextStyle& style, cons
     uchar line = chars[2];
 
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( charHeight, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( charHeight, false ) );
     p.setFont(f);
 
     TQFontMetrics fm(f);
@@ -769,14 +769,14 @@ void Artwork::drawBigRoundBracket( TQPainter& p, const ContextStyle& style, cons
     TQRect lowerBound = fm.boundingRect(lowercorner);
     TQRect lineBound = fm.boundingRect(line);
 
-    pixel ptX = style.tqlayoutUnitToPixelX( x );
-    pixel ptY = style.tqlayoutUnitToPixelY( y );
-    pixel height = style.tqlayoutUnitToPixelY( getHeight() );
+    pixel ptX = style.layoutUnitToPixelX( x );
+    pixel ptY = style.layoutUnitToPixelY( y );
+    pixel height = style.layoutUnitToPixelY( getHeight() );
 
 //     p.setPen( TQt::red );
 //     //p.drawRect( ptX, ptY, upperBound.width(), upperBound.height() + lowerBound.height() );
-//     p.drawRect( ptX, ptY, style.tqlayoutUnitToPixelX( getWidth() ),
-//                 style.tqlayoutUnitToPixelY( getHeight() ) );
+//     p.drawRect( ptX, ptY, style.layoutUnitToPixelX( getWidth() ),
+//                 style.layoutUnitToPixelY( getHeight() ) );
 
 //     p.setPen( TQt::black );
     p.drawText( ptX, ptY-upperBound.top(), TQString( TQChar( uppercorner ) ) );
@@ -810,7 +810,7 @@ void Artwork::calcCurlyBracket( const ContextStyle& style, const TQChar chars[],
     uchar middle = chars[3];
 
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitPtToPt( charHeight ) );
+    f.setPointSizeFloat( style.layoutUnitPtToPt( charHeight ) );
     TQFontMetrics fm( f );
     LuPtRect upperBound = fm.boundingRect( uppercorner );
     LuPtRect lowerBound = fm.boundingRect( lowercorner );
@@ -832,7 +832,7 @@ void Artwork::drawBigCurlyBracket( TQPainter& p, const ContextStyle& style, cons
 {
     //TQFont f = style.getSymbolFont();
     TQFont f = style.getBracketFont();
-    f.setPointSizeFloat( style.tqlayoutUnitToFontSize( charHeight, false ) );
+    f.setPointSizeFloat( style.layoutUnitToFontSize( charHeight, false ) );
     p.setFont(f);
 
     uchar uppercorner = chars[0];
@@ -846,9 +846,9 @@ void Artwork::drawBigCurlyBracket( TQPainter& p, const ContextStyle& style, cons
     TQRect middleBound = fm.boundingRect(middle);
     TQRect lineBound = fm.boundingRect(line);
 
-    pixel ptX = style.tqlayoutUnitToPixelX( x );
-    pixel ptY = style.tqlayoutUnitToPixelY( y );
-    pixel height = style.tqlayoutUnitToPixelY( getHeight() );
+    pixel ptX = style.layoutUnitToPixelX( x );
+    pixel ptY = style.layoutUnitToPixelY( y );
+    pixel height = style.layoutUnitToPixelY( getHeight() );
 
     //p.setPen(TQt::gray);
     //p.drawRect(x, y, upperBound.width() + offset, height);
diff --git a/lib/kformula/fontstyle.h b/lib/kformula/fontstyle.h
index 72db8caf..8132bbb6 100644
--- a/lib/kformula/fontstyle.h
+++ b/lib/kformula/fontstyle.h
@@ -111,7 +111,7 @@ public:
     virtual void calcSizes( const ContextStyle& style,
                             ContextStyle::TextStyle tstyle,
 							double factor,
-                            luPt tqparentSize );
+                            luPt parentSize );
     virtual void calcSizes( const ContextStyle& style,
                             ContextStyle::TextStyle tstyle,
 							double factor );
@@ -120,12 +120,12 @@ public:
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
 					   StyleAttributes& style,
-					   luPt tqparentSize, const LuPixelPoint& origin );
+					   luPt parentSize, const LuPixelPoint& origin );
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     luPixel getWidth() const { return size.width(); }
     luPixel getHeight() const { return size.height(); }
@@ -179,7 +179,7 @@ private:
     SymbolType type;
 
     bool calcCMDelimiterSize( const ContextStyle& context, uchar c,
-                              luPt fontSize, luPt tqparentSize );
+                              luPt fontSize, luPt parentSize );
     void calcLargest( const ContextStyle& context, uchar c, luPt fontSize );
     void drawCMDelimiter( TQPainter& painter, const ContextStyle& style,
                           luPixel x, luPixel y, luPt height );
diff --git a/lib/kformula/formulaelement.cc b/lib/kformula/formulaelement.cc
index 84944150..29ae7cdd 100644
--- a/lib/kformula/formulaelement.cc
+++ b/lib/kformula/formulaelement.cc
@@ -130,9 +130,9 @@ void FormulaElement::draw( TQPainter& painter, const LuPixelRect& r,
                            ContextStyle::TextStyle tstyle,
                            ContextStyle::IndexStyle istyle,
                            StyleAttributes& style,
-                           const LuPixelPoint& tqparentOrigin )
+                           const LuPixelPoint& parentOrigin )
 {
-    inherited::draw( painter, r, context, tstyle, istyle, style, tqparentOrigin );
+    inherited::draw( painter, r, context, tstyle, istyle, style, parentOrigin );
 }
 
 
@@ -279,7 +279,7 @@ void FormulaElement::convertNames( TQDomNode node )
         TQDomNamedNodeMap attr = node.attributes();
         TQDomAttr ch = attr.namedItem( "CHAR" ).toAttr();
         if ( ch.value() == "\\" ) {
-            TQDomNode sequence = node.tqparentNode();
+            TQDomNode sequence = node.parentNode();
             TQDomDocument doc = sequence.ownerDocument();
             TQDomElement nameseq = doc.createElement( "NAMESEQUENCE" );
             sequence.tqreplaceChild( nameseq, node );
diff --git a/lib/kformula/formulaelement.h b/lib/kformula/formulaelement.h
index 831456a7..8f230128 100644
--- a/lib/kformula/formulaelement.h
+++ b/lib/kformula/formulaelement.h
@@ -113,7 +113,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
 						    ContextStyle::TextStyle tstyle,
@@ -122,15 +122,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates the formulas sizes and positions.
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc
index a8c1db9c..fb76a11e 100644
--- a/lib/kformula/fractionelement.cc
+++ b/lib/kformula/fractionelement.cc
@@ -81,12 +81,12 @@ void FractionElement::entered( SequenceElement* child )
 
 
 BasicElement* FractionElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                        const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                        const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
         e = numerator->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
             return e;
@@ -121,7 +121,7 @@ BasicElement* FractionElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void FractionElement::calcSizes( const ContextStyle& context, 
                                  ContextStyle::TextStyle tstyle,
@@ -156,17 +156,17 @@ void FractionElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void FractionElement::draw( TQPainter& painter, const LuPixelRect& r,
                             const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
                             ContextStyle::IndexStyle istyle,
                             StyleAttributes& style,
-                            const LuPixelPoint& tqparentOrigin )
+                            const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -185,11 +185,11 @@ void FractionElement::draw( TQPainter& painter, const LuPixelRect& r,
         double factor = style.sizeFactor();
         double linethickness = lineThickness( context, factor );
         painter.setPen( TQPen( style.color(),
-                              context.tqlayoutUnitToPixelY( linethickness ) ) );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ),
-                          context.tqlayoutUnitToPixelX( myPos.x() + getWidth() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ) );
+                              context.layoutUnitToPixelY( linethickness ) ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ),
+                          context.layoutUnitToPixelX( myPos.x() + getWidth() ),
+                          context.layoutUnitToPixelY( myPos.y() + axis( context, tstyle, factor ) ) );
     }
 }
 
diff --git a/lib/kformula/fractionelement.h b/lib/kformula/fractionelement.h
index c578ee5b..18c870fe 100644
--- a/lib/kformula/fractionelement.h
+++ b/lib/kformula/fractionelement.h
@@ -66,11 +66,11 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -79,15 +79,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& cstyle,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cc
index 381bbcf9..79421f40 100644
--- a/lib/kformula/glyphelement.cc
+++ b/lib/kformula/glyphelement.cc
@@ -69,7 +69,7 @@ bool GlyphElement::readAttributesFromMathMLDom( const TQDomElement& element )
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void GlyphElement::calcSizes( const ContextStyle& context, 
                               ContextStyle::TextStyle tstyle, 
@@ -82,14 +82,14 @@ void GlyphElement::calcSizes( const ContextStyle& context,
 
     if ( m_hasFont ) {
         TQFont font( m_fontFamily );
-        font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+        font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
         TQFontMetrics fm ( font );
         bound = fm.boundingRect( m_char );
         setWidth( context.ptToLayoutUnitPt( fm.width( m_char ) ) );
     }
     else {
         TQFont font( context.getDefaultFont() );
-        font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+        font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
         TQFontMetrics fm ( font );
         bound = fm.boundingRect( m_alt );
         setWidth( context.ptToLayoutUnitPt( fm.width( m_alt ) ) );
@@ -106,17 +106,17 @@ void GlyphElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle /*istyle*/,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -131,10 +131,10 @@ void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
         setCharFamily( style.charFamily() );
         font = TQFont( m_fontFamily );
         text = m_char;
-        painter.fillRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() ),
-                          context.tqlayoutUnitToPixelX( getWidth() ),
-                          context.tqlayoutUnitToPixelY( getHeight() ),
+        painter.fillRect( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y() ),
+                          context.layoutUnitToPixelX( getWidth() ),
+                          context.layoutUnitToPixelY( getHeight() ),
                           style.background() );
     }
     else {
@@ -142,10 +142,10 @@ void GlyphElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
         font = context.getDefaultFont();
         text = m_alt;
     }
-    font.setPointSizeFloat( context.tqlayoutUnitToFontSize( mySize, false ) );
+    font.setPointSizeFloat( context.layoutUnitToFontSize( mySize, false ) );
     painter.setFont( font );
-    painter.drawText( context.tqlayoutUnitToPixelX( myPos.x() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+getBaseline() ),
+    painter.drawText( context.layoutUnitToPixelX( myPos.x() ),
+                      context.layoutUnitToPixelY( myPos.y()+getBaseline() ),
                       text );
 }
     
diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h
index dd6c6e8c..1d3b6d8d 100644
--- a/lib/kformula/glyphelement.h
+++ b/lib/kformula/glyphelement.h
@@ -31,7 +31,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -40,15 +40,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 protected:
     virtual bool readAttributesFromMathMLDom( const TQDomElement &element );
diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc
index 5e2ee3e5..a8d3b68a 100644
--- a/lib/kformula/indexelement.cc
+++ b/lib/kformula/indexelement.cc
@@ -227,11 +227,11 @@ void IndexElement::entered( SequenceElement* child )
  * Returns the element the point is in.
  */
 BasicElement* IndexElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                     const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                     const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY());
+        LuPixelPoint myPos(parentOrigin.x()+getX(), parentOrigin.y()+getY());
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) return e;
 
@@ -341,7 +341,7 @@ void IndexElement::setMiddleX(int xOffset, int middleWidth)
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void IndexElement::calcSizes(const ContextStyle& context, 
 							 ContextStyle::TextStyle tstyle,
@@ -446,7 +446,7 @@ void IndexElement::calcSizes(const ContextStyle& context,
     if (content->isTextOnly()) {
         luPt mySize = context.getAdjustedSize( tstyle, factor );
         TQFont font = context.getDefaultFont();
-        font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+        font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
 
         TQFontMetrics fm(font);
         LuPixelRect bound = fm.boundingRect('x');
@@ -543,17 +543,17 @@ void IndexElement::calcSizes(const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void IndexElement::draw( TQPainter& painter, const LuPixelRect& r,
                          const ContextStyle& context,
                          ContextStyle::TextStyle tstyle,
                          ContextStyle::IndexStyle istyle,
                          StyleAttributes& style,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -645,7 +645,7 @@ int IndexElement::getFromPos(BasicElement* from)
     else if (from == upperLeft) {
         return upperLeftPos;
     }
-    return tqparentPos;
+    return parentPos;
 }
 
 /**
@@ -680,7 +680,7 @@ void IndexElement::moveLeft(FormulaCursor* cursor, BasicElement* from)
             }
         }
         switch (fromPos) {
-            case tqparentPos:
+            case parentPos:
                 if (hasLowerRight() && linear) {
                     lowerRight->moveLeft(cursor, this);
                     break;
@@ -751,7 +751,7 @@ void IndexElement::moveRight(FormulaCursor* cursor, BasicElement* from)
             }
         }
         switch (fromPos) {
-            case tqparentPos:
+            case parentPos:
                 if (hasUpperLeft() && linear) {
                     upperLeft->moveRight(cursor, this);
                     break;
@@ -1426,7 +1426,7 @@ int IndexElement::readContentFromMathMLDom( TQDomNode& node )
         node = node.nextSibling();
     }
 
-    TQString indexType = node.tqparentNode().toElement().tagName().lower();
+    TQString indexType = node.parentNode().toElement().tagName().lower();
     if ( indexType == "msub" ) {
         lowerRight = new SequenceElement( this );
         int lowerRightNumber = lowerRight->buildMathMLChild( node );
diff --git a/lib/kformula/indexelement.h b/lib/kformula/indexelement.h
index 49b03bc7..b86f0dc4 100644
--- a/lib/kformula/indexelement.h
+++ b/lib/kformula/indexelement.h
@@ -66,7 +66,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -77,7 +77,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -86,15 +86,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc
index 804b66c6..2a5e7ddd 100644
--- a/lib/kformula/kformulacommand.cc
+++ b/lib/kformula/kformulacommand.cc
@@ -534,9 +534,9 @@ void FontCommand::collectChildren()
 }
 
 
-void FontCommand::parseSequences( const TQMap<SequenceElement*, int>& tqparents )
+void FontCommand::parseSequences( const TQMap<SequenceElement*, int>& parents )
 {
-    TQValueList<SequenceElement*> sequences = tqparents.keys();
+    TQValueList<SequenceElement*> sequences = parents.keys();
     for ( TQValueList<SequenceElement*>::iterator i = sequences.begin();
           i != sequences.end();
           ++i ) {
@@ -553,7 +553,7 @@ CharStyleCommand::CharStyleCommand( CharStyle cs, const TQString& name, Containe
 void CharStyleCommand::execute()
 {
     collectChildren();
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
 
     styleList.clear();
     uint count = tqchildrenList().count();
@@ -562,23 +562,23 @@ void CharStyleCommand::execute()
         TextElement* child = tqchildrenList().at( i );
         styleList[i] = child->getCharStyle();
         child->setCharStyle( charStyle );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
 void CharStyleCommand::unexecute()
 {
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
     uint count = tqchildrenList().count();
     //styleList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
         TextElement* child = tqchildrenList().at( i );
         child->setCharStyle( styleList[i] );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
@@ -592,7 +592,7 @@ void CharFamilyCommand::execute()
 {
     collectChildren();
 
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
 
     familyList.clear();
     uint count = tqchildrenList().count();
@@ -601,23 +601,23 @@ void CharFamilyCommand::execute()
         TextElement* child = tqchildrenList().at( i );
         familyList[i] = child->getCharFamily();
         child->setCharFamily( charFamily );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
 void CharFamilyCommand::unexecute()
 {
-    TQMap<SequenceElement*, int> tqparentCollector;
+    TQMap<SequenceElement*, int> parentCollector;
     uint count = tqchildrenList().count();
     //familyList.reserve( count );
     for ( uint i=0; i<count; ++i ) {
         TextElement* child = tqchildrenList().at( i );
         child->setCharFamily( familyList[i] );
-        tqparentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
+        parentCollector[static_cast<SequenceElement*>( child->getParent() )] = 1;
     }
-    parseSequences( tqparentCollector );
+    parseSequences( parentCollector );
     testDirty();
 }
 
diff --git a/lib/kformula/kformulacommand.h b/lib/kformula/kformulacommand.h
index ec014604..8b1d2555 100644
--- a/lib/kformula/kformulacommand.h
+++ b/lib/kformula/kformulacommand.h
@@ -505,7 +505,7 @@ protected:
 
     void collectChildren();
 
-    void parseSequences( const TQMap<SequenceElement*, int>& tqparents );
+    void parseSequences( const TQMap<SequenceElement*, int>& parents );
 
 private:
 
diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc
index a141aa50..774c7e79 100644
--- a/lib/kformula/kformulacontainer.cc
+++ b/lib/kformula/kformulacontainer.cc
@@ -273,10 +273,10 @@ void Container::recalc()
     ContextStyle& context = impl->document->getContextStyle();
     rootElement()->calcSizes( context );
 
-    emit formulaChanged( context.tqlayoutUnitToPixelX( rootElement()->getWidth() ),
-                         context.tqlayoutUnitToPixelY( rootElement()->getHeight() ) );
-    emit formulaChanged( context.tqlayoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) ),
-                         context.tqlayoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) ) );
+    emit formulaChanged( context.layoutUnitToPixelX( rootElement()->getWidth() ),
+                         context.layoutUnitToPixelY( rootElement()->getHeight() ) );
+    emit formulaChanged( context.layoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) ),
+                         context.layoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) ) );
     emit cursorMoved( activeCursor() );
 }
 
@@ -408,10 +408,10 @@ void Container::execute(KCommand* command)
 TQRect Container::boundingRect() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    return TQRect( context.tqlayoutUnitToPixelX( rootElement()->getX() ),
-                  context.tqlayoutUnitToPixelY( rootElement()->getY() ),
-                  context.tqlayoutUnitToPixelX( rootElement()->getWidth() ),
-                  context.tqlayoutUnitToPixelY( rootElement()->getHeight() ) );
+    return TQRect( context.layoutUnitToPixelX( rootElement()->getX() ),
+                  context.layoutUnitToPixelY( rootElement()->getY() ),
+                  context.layoutUnitToPixelX( rootElement()->getWidth() ),
+                  context.layoutUnitToPixelY( rootElement()->getHeight() ) );
 }
 
 TQRect Container::coveredRect()
@@ -419,14 +419,14 @@ TQRect Container::coveredRect()
     if ( impl->activeCursor != 0 ) {
         const ContextStyle& context = document()->getContextStyle();
         const LuPixelRect& cursorRect = impl->activeCursor->getCursorSize();
-        return TQRect( context.tqlayoutUnitToPixelX( rootElement()->getX() ),
-                      context.tqlayoutUnitToPixelY( rootElement()->getY() ),
-                      context.tqlayoutUnitToPixelX( rootElement()->getWidth() ),
-                      context.tqlayoutUnitToPixelY( rootElement()->getHeight() ) ) |
-            TQRect( context.tqlayoutUnitToPixelX( cursorRect.x() ),
-                   context.tqlayoutUnitToPixelY( cursorRect.y() ),
-                   context.tqlayoutUnitToPixelX( cursorRect.width() ),
-                   context.tqlayoutUnitToPixelY( cursorRect.height() ) );
+        return TQRect( context.layoutUnitToPixelX( rootElement()->getX() ),
+                      context.layoutUnitToPixelY( rootElement()->getY() ),
+                      context.layoutUnitToPixelX( rootElement()->getWidth() ),
+                      context.layoutUnitToPixelY( rootElement()->getHeight() ) ) |
+            TQRect( context.layoutUnitToPixelX( cursorRect.x() ),
+                   context.layoutUnitToPixelY( cursorRect.y() ),
+                   context.layoutUnitToPixelX( cursorRect.width() ),
+                   context.layoutUnitToPixelY( cursorRect.height() ) );
     }
     return boundingRect();
 }
@@ -434,20 +434,20 @@ TQRect Container::coveredRect()
 double Container::width() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    return context.tqlayoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) );
+    return context.layoutUnitPtToPt( context.pixelXToPt( rootElement()->getWidth() ) );
 }
 
 double Container::height() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    return context.tqlayoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) );
+    return context.layoutUnitPtToPt( context.pixelYToPt( rootElement()->getHeight() ) );
 }
 
 double Container::baseline() const
 {
     const ContextStyle& context = document()->getContextStyle();
-    //return context.tqlayoutUnitToPixelY( rootElement()->getBaseline() );
-    return context.tqlayoutUnitPtToPt( context.pixelYToPt( rootElement()->getBaseline() ) );
+    //return context.layoutUnitToPixelY( rootElement()->getBaseline() );
+    return context.layoutUnitPtToPt( context.pixelYToPt( rootElement()->getBaseline() ) );
 }
 
 void Container::moveTo( int x, int y )
@@ -601,8 +601,8 @@ TQImage Container::drawImage( int width, int height )
     TQRect rect(impl->rootElement->getX(), impl->rootElement->getY(),
                impl->rootElement->getWidth(), impl->rootElement->getHeight());
 
-    int realWidth = context.tqlayoutUnitToPixelX( impl->rootElement->getWidth() );
-    int realHeight = context.tqlayoutUnitToPixelY( impl->rootElement->getHeight() );
+    int realWidth = context.layoutUnitToPixelX( impl->rootElement->getWidth() );
+    int realHeight = context.layoutUnitToPixelY( impl->rootElement->getHeight() );
 
     double f = TQMAX( static_cast<double>( width )/static_cast<double>( realWidth ),
                      static_cast<double>( height )/static_cast<double>( realHeight ) );
@@ -612,12 +612,12 @@ TQImage Container::drawImage( int width, int height )
 
     kdDebug( DEBUGID ) << "Container::drawImage "
                        << "(" << width << " " << height << ")"
-                       << "(" << context.tqlayoutUnitToPixelX( impl->rootElement->getWidth() )
-                       << " " << context.tqlayoutUnitToPixelY( impl->rootElement->getHeight() ) << ")"
+                       << "(" << context.layoutUnitToPixelX( impl->rootElement->getWidth() )
+                       << " " << context.layoutUnitToPixelY( impl->rootElement->getHeight() ) << ")"
                        << endl;
 
-    TQPixmap pm( context.tqlayoutUnitToPixelX( impl->rootElement->getWidth() ),
-                context.tqlayoutUnitToPixelY( impl->rootElement->getHeight() ) );
+    TQPixmap pm( context.layoutUnitToPixelX( impl->rootElement->getWidth() ),
+                context.layoutUnitToPixelY( impl->rootElement->getHeight() ) );
     pm.fill();
     TQPainter paint(&pm);
     impl->rootElement->draw(paint, rect, context);
diff --git a/lib/kformula/kformuladefs.h b/lib/kformula/kformuladefs.h
index 2e9d8a8b..80879f98 100644
--- a/lib/kformula/kformuladefs.h
+++ b/lib/kformula/kformuladefs.h
@@ -235,7 +235,7 @@ enum IndexPosition {
     lowerMiddlePos,
     upperRightPos,
     lowerRightPos,
-    tqparentPos
+    parentPos
 };
 
 
diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cc
index af727959..58a6ad35 100644
--- a/lib/kformula/kformulamimesource.cc
+++ b/lib/kformula/kformulamimesource.cc
@@ -122,8 +122,8 @@ TQByteArray MimeSource::tqencodedData ( const char *format ) const
         TQRect rect(rootElement->getX(), rootElement->getY(),
                    rootElement->getWidth(), rootElement->getHeight());
 
-    	TQPixmap pm( context.tqlayoutUnitToPixelX( rootElement->getWidth() ),
-                    context.tqlayoutUnitToPixelY( rootElement->getHeight() ) );
+    	TQPixmap pm( context.layoutUnitToPixelX( rootElement->getWidth() ),
+                    context.layoutUnitToPixelY( rootElement->getHeight() ) );
 	pm.fill();
 	TQPainter paint(&pm);
         rootElement->draw(paint, rect, context);
diff --git a/lib/kformula/kformulaview.cc b/lib/kformula/kformulaview.cc
index 8099f633..f4385b38 100644
--- a/lib/kformula/kformulaview.cc
+++ b/lib/kformula/kformulaview.cc
@@ -132,7 +132,7 @@ View::~View()
 
 TQPoint View::getCursorPoint() const
 {
-    return contextStyle().tqlayoutUnitToPixel( cursor()->getCursorPoint() );
+    return contextStyle().layoutUnitToPixel( cursor()->getCursorPoint() );
 }
 
 void View::setReadOnly(bool ro)
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc
index b8abd22b..38020904 100644
--- a/lib/kformula/matrixelement.cc
+++ b/lib/kformula/matrixelement.cc
@@ -339,12 +339,12 @@ void MatrixElement::entered( SequenceElement* /*child*/ )
 
 
 BasicElement* MatrixElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                      const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                      const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         uint rows = getRows();
         uint columns = getColumns();
@@ -430,7 +430,7 @@ BasicElement* MatrixElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void MatrixElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
@@ -509,17 +509,17 @@ void MatrixElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void MatrixElement::draw( TQPainter& painter, const LuPixelRect& rect,
                           const ContextStyle& context,
                           ContextStyle::TextStyle tstyle,
                           ContextStyle::IndexStyle istyle,
                           StyleAttributes& style,
-                          const LuPixelPoint& tqparentOrigin )
+                          const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( rect ) )
     //    return;
 
@@ -922,15 +922,15 @@ bool MatrixElement::readAttributesFromMathMLDom( const TQDomElement& element )
             }
         }
     }
-    TQString tqalignmentscopeStr = element.attribute( "tqalignmentscope" ).lower();
-    if ( ! tqalignmentscopeStr.isNull() ) {
-        TQStringList list = TQStringList::split( ' ', tqalignmentscopeStr );
+    TQString alignmentscopeStr = element.attribute( "alignmentscope" ).lower();
+    if ( ! alignmentscopeStr.isNull() ) {
+        TQStringList list = TQStringList::split( ' ', alignmentscopeStr );
         for ( TQStringList::iterator it = list.begin(); it != list.end(); it++ ) {
             if ( *it == "true" ) {
-                m_tqalignmentScope.append( true );
+                m_alignmentScope.append( true );
             }
             else if ( *it == "false" ) {
-                m_tqalignmentScope.append( false );
+                m_alignmentScope.append( false );
             }
         }
     }
@@ -1327,18 +1327,18 @@ void MatrixElement::writeMathMLAttributes( TQDomElement& element ) const
     if ( ! columnalign.isNull() ) {
         element.setAttribute( "columnalign", columnalign.stripWhiteSpace() );
     }
-    TQString tqalignmentscope;
-    for ( TQValueList< bool >::const_iterator it = m_tqalignmentScope.begin(); it != m_tqalignmentScope.end(); it++ )
+    TQString alignmentscope;
+    for ( TQValueList< bool >::const_iterator it = m_alignmentScope.begin(); it != m_alignmentScope.end(); it++ )
     {
         if ( *it ) {
-            tqalignmentscope.append( "true " );
+            alignmentscope.append( "true " );
         }
         else {
-            tqalignmentscope.append( "false " );
+            alignmentscope.append( "false " );
         }
     }
-    if ( ! tqalignmentscope.isNull() ) {
-        element.setAttribute( "tqalignmentscope", tqalignmentscope.stripWhiteSpace() );
+    if ( ! alignmentscope.isNull() ) {
+        element.setAttribute( "alignmentscope", alignmentscope.stripWhiteSpace() );
     }
     TQString columnwidth;
     TQValueList< double >::const_iterator lengthIt = m_columnWidth.begin();
@@ -1806,11 +1806,11 @@ public:
     }
 
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
@@ -1967,11 +1967,11 @@ MultilineSequenceElement::MultilineSequenceElement( BasicElement* tqparent )
 
 
 BasicElement* MultilineSequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                                 const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                                 const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    //LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-    //                   tqparentOrigin.y() + getY());
-    BasicElement* e = inherited::goToPos(cursor, handled, point, tqparentOrigin);
+    //LuPixelPoint myPos(parentOrigin.x() + getX(),
+    //                   parentOrigin.y() + getY());
+    BasicElement* e = inherited::goToPos(cursor, handled, point, parentOrigin);
 
     if (e == 0) {
         // If the mouse was behind this line put the cursor to the last position.
@@ -2184,12 +2184,12 @@ void MultilineElement::entered( SequenceElement* /*child*/ )
  * Returns the element the point is in.
  */
 BasicElement* MultilineElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                         const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                         const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = inherited::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = inherited::goToPos(cursor, handled, point, parentOrigin);
     if ( e != 0 ) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         uint count = content.count();
         for ( uint i = 0; i < count; ++i ) {
@@ -2400,7 +2400,7 @@ void MultilineElement::calcSizes( const ContextStyle& context,
     double factor = style.sizeFactor();
     luPt mySize = context.getAdjustedSize( tstyle, factor );
     TQFont font = context.getDefaultFont();
-    font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+    font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
     TQFontMetrics fm( font );
     luPixel leading = context.ptToLayoutUnitPt( fm.leading() );
     luPixel distY = context.ptToPixelY( context.getThinSpace( tstyle, factor ) );
@@ -2458,9 +2458,9 @@ void MultilineElement::draw( TQPainter& painter, const LuPixelRect& r,
                              ContextStyle::TextStyle tstyle,
                              ContextStyle::IndexStyle istyle,
                              StyleAttributes& style,
-                             const LuPixelPoint& tqparentOrigin )
+                             const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x() + getX(), tqparentOrigin.y() + getY() );
+    LuPixelPoint myPos( parentOrigin.x() + getX(), parentOrigin.y() + getY() );
     uint count = content.count();
 
     if ( context.edit() ) {
@@ -2471,10 +2471,10 @@ void MultilineElement::draw( TQPainter& painter, const LuPixelRect& r,
             if ( tabCount < line->tabCount() ) {
                 for ( uint t = tabCount; t < line->tabCount(); ++t ) {
                     BasicElement* marker = line->tab( t );
-                    painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x()+marker->getX() ),
-                                      context.tqlayoutUnitToPixelY( myPos.y() ),
-                                      context.tqlayoutUnitToPixelX( myPos.x()+marker->getX() ),
-                                      context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
+                    painter.drawLine( context.layoutUnitToPixelX( myPos.x()+marker->getX() ),
+                                      context.layoutUnitToPixelY( myPos.y() ),
+                                      context.layoutUnitToPixelX( myPos.x()+marker->getX() ),
+                                      context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
                 }
                 tabCount = line->tabCount();
             }
diff --git a/lib/kformula/matrixelement.h b/lib/kformula/matrixelement.h
index ede10114..04203257 100644
--- a/lib/kformula/matrixelement.h
+++ b/lib/kformula/matrixelement.h
@@ -69,7 +69,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -80,7 +80,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -89,15 +89,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
@@ -271,7 +271,7 @@ private:
     VerticalAlign m_align;
     TQValueList< VerticalAlign > m_rowAlign;
     TQValueList< HorizontalAlign > m_columnAlign;
-    TQValueList< bool > m_tqalignmentScope;
+    TQValueList< bool > m_alignmentScope;
     TQValueList< SizeType > m_columnWidthType;
     TQValueList< double > m_columnWidth;
     SizeType m_widthType;
@@ -337,7 +337,7 @@ public:
      * Returns the element the point is in.
      */
     BasicElement* goToPos( FormulaCursor* cursor, bool& handled,
-                           const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                           const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Sets the cursor inside this element to its start position.
@@ -375,7 +375,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -384,15 +384,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cc
index f79e6789..d84bb064 100644
--- a/lib/kformula/paddedelement.cc
+++ b/lib/kformula/paddedelement.cc
@@ -36,7 +36,7 @@ PaddedElement::PaddedElement( BasicElement* tqparent ) : SequenceElement( tqpare
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void PaddedElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h
index 6d552837..811f861e 100644
--- a/lib/kformula/paddedelement.h
+++ b/lib/kformula/paddedelement.h
@@ -32,7 +32,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cc
index 662ec53d..72b564a6 100644
--- a/lib/kformula/phantomelement.cc
+++ b/lib/kformula/phantomelement.cc
@@ -27,8 +27,8 @@ PhantomElement::PhantomElement( BasicElement* tqparent ) : SequenceElement( tqpa
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void PhantomElement::draw( TQPainter&, const LuPixelRect&, const ContextStyle&,
                            ContextStyle::TextStyle, ContextStyle::IndexStyle,
diff --git a/lib/kformula/phantomelement.h b/lib/kformula/phantomelement.h
index 885a9651..cf89d893 100644
--- a/lib/kformula/phantomelement.h
+++ b/lib/kformula/phantomelement.h
@@ -31,15 +31,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 private:
     virtual TQString getElementName() const { return "mphantom"; }
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc
index 098d069f..f9331f13 100644
--- a/lib/kformula/rootelement.cc
+++ b/lib/kformula/rootelement.cc
@@ -138,12 +138,12 @@ void RootElement::entered( SequenceElement* child )
 
 
 BasicElement* RootElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                    const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin)
+                                    const LuPixelPoint& point, const LuPixelPoint& parentOrigin)
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
@@ -176,7 +176,7 @@ BasicElement* RootElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void RootElement::calcSizes( const ContextStyle& context,
                              ContextStyle::TextStyle tstyle,
@@ -235,17 +235,17 @@ void RootElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void RootElement::draw( TQPainter& painter, const LuPixelRect& r,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle istyle,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -265,27 +265,27 @@ void RootElement::draw( TQPainter& painter, const LuPixelRect& r,
     luPixel unit = (content->getHeight() + distY)/ 3;
 
     painter.setPen( TQPen( style.color(),
-                          context.tqlayoutUnitToPixelX( 2*context.getLineWidth( factor ) ) ) );
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+unit+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+unit/2+unit/3 ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
+                          context.layoutUnitToPixelX( 2*context.getLineWidth( factor ) ) ) );
+    painter.drawLine( context.layoutUnitToPixelX( x+unit/3 ),
+                      context.layoutUnitToPixelY( y+unit+distY/3 ),
+                      context.layoutUnitToPixelX( x+unit/2+unit/3 ),
+                      context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
 
     painter.setPen( TQPen( style.color(),
-                          context.tqlayoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
-
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+unit/2+unit/3 ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ),
-                      context.tqlayoutUnitToPixelX( x+unit+unit/3+content->getWidth() ),
-                      context.tqlayoutUnitToPixelY( y+distY/3 ) );
-    painter.drawLine( context.tqlayoutUnitToPixelX( x+unit/3 ),
-                      context.tqlayoutUnitToPixelY( y+unit+distY/2 ),
-                      context.tqlayoutUnitToPixelX( x ),
-                      context.tqlayoutUnitToPixelY( y+unit+unit/2 ) );
+                          context.layoutUnitToPixelY( context.getLineWidth( factor ) ) ) );
+
+    painter.drawLine( context.layoutUnitToPixelX( x+unit+unit/3 ),
+                      context.layoutUnitToPixelY( y+distY/3 ),
+                      context.layoutUnitToPixelX( x+unit/2+unit/3 ),
+                      context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
+    painter.drawLine( context.layoutUnitToPixelX( x+unit+unit/3 ),
+                      context.layoutUnitToPixelY( y+distY/3 ),
+                      context.layoutUnitToPixelX( x+unit+unit/3+content->getWidth() ),
+                      context.layoutUnitToPixelY( y+distY/3 ) );
+    painter.drawLine( context.layoutUnitToPixelX( x+unit/3 ),
+                      context.layoutUnitToPixelY( y+unit+distY/2 ),
+                      context.layoutUnitToPixelX( x ),
+                      context.layoutUnitToPixelY( y+unit+unit/2 ) );
 }
 
 
diff --git a/lib/kformula/rootelement.h b/lib/kformula/rootelement.h
index b836228e..4908a643 100644
--- a/lib/kformula/rootelement.h
+++ b/lib/kformula/rootelement.h
@@ -62,11 +62,11 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -75,15 +75,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& cstyle,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc
index eb64a13e..46c00817 100644
--- a/lib/kformula/sequenceelement.cc
+++ b/lib/kformula/sequenceelement.cc
@@ -114,12 +114,12 @@ bool SequenceElement::readOnly( const FormulaCursor* ) const
  * Returns the element the point is in.
  */
 BasicElement* SequenceElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                        const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                        const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         uint count = tqchildren.count();
         for (uint i = 0; i < count; i++) {
@@ -174,7 +174,7 @@ bool SequenceElement::isEmpty()
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void SequenceElement::calcSizes( const ContextStyle& context,
 								 ContextStyle::TextStyle tstyle,
@@ -247,17 +247,17 @@ void SequenceElement::setChildrenPositions()
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r,
                             const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
                             ContextStyle::IndexStyle istyle,
                             StyleAttributes& style,
-                            const LuPixelPoint& tqparentOrigin )
+                            const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x() + getX(), tqparentOrigin.y() + getY() );
+    LuPixelPoint myPos( parentOrigin.x() + getX(), parentOrigin.y() + getY() );
     // There might be zero sized elements that still want to be drawn at least
     // in edit mode. (EmptyElement)
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
@@ -292,17 +292,17 @@ void SequenceElement::draw( TQPainter& painter, const LuPixelRect& r,
     }
     // Debug
     //painter.setPen(TQt::green);
-    //painter.drawRect(tqparentOrigin.x() + getX(), tqparentOrigin.y() + getY(),
+    //painter.drawRect(parentOrigin.x() + getX(), parentOrigin.y() + getY(),
     //                 getWidth(), getHeight());
-//     painter.drawLine( context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + axis( context, tstyle ) ),
-//                       context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() + getWidth() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + axis( context, tstyle ) ) );
+//     painter.drawLine( context.layoutUnitToPixelX( parentOrigin.x() + getX() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + axis( context, tstyle ) ),
+//                       context.layoutUnitToPixelX( parentOrigin.x() + getX() + getWidth() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + axis( context, tstyle ) ) );
 //     painter.setPen(TQt::red);
-//     painter.drawLine( context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + getBaseline() ),
-//                       context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() + getWidth() ),
-//                       context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() + getBaseline() ) );
+//     painter.drawLine( context.layoutUnitToPixelX( parentOrigin.x() + getX() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + getBaseline() ),
+//                       context.layoutUnitToPixelX( parentOrigin.x() + getX() + getWidth() ),
+//                       context.layoutUnitToPixelY( parentOrigin.y() + getY() + getBaseline() ) );
 }
 
 
@@ -322,11 +322,11 @@ void SequenceElement::drawEmptyRect( TQPainter& painter, const ContextStyle& con
     if ( context.edit() ) {
         painter.setBrush(TQt::NoBrush);
         painter.setPen( TQPen( context.getEmptyColor(),
-                              context.tqlayoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
-        painter.drawRect( context.tqlayoutUnitToPixelX( upperLeft.x() ),
-                          context.tqlayoutUnitToPixelY( upperLeft.y() ),
-                          context.tqlayoutUnitToPixelX( getWidth() ),
-                          context.tqlayoutUnitToPixelY( getHeight() ) );
+                              context.layoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
+        painter.drawRect( context.layoutUnitToPixelX( upperLeft.x() ),
+                          context.layoutUnitToPixelY( upperLeft.y() ),
+                          context.layoutUnitToPixelX( getWidth() ),
+                          context.layoutUnitToPixelY( getHeight() ) );
     }
 }
 
@@ -384,14 +384,14 @@ void SequenceElement::drawCursor( TQPainter& painter, const ContextStyle& contex
     painter.setRasterOp( TQt::XorROP );
     if ( cursor->isSelection() ) {
         const LuPixelRect& r = cursor->cursorSize;
-        painter.fillRect( context.tqlayoutUnitToPixelX( r.x() ),
-                          context.tqlayoutUnitToPixelY( r.y() ),
-                          context.tqlayoutUnitToPixelX( r.width() ),
-                          context.tqlayoutUnitToPixelY( r.height() ),
+        painter.fillRect( context.layoutUnitToPixelX( r.x() ),
+                          context.layoutUnitToPixelY( r.y() ),
+                          context.layoutUnitToPixelX( r.width() ),
+                          context.layoutUnitToPixelY( r.height() ),
                           TQt::white );
     }
     painter.setPen( TQPen( TQt::white,
-                          context.tqlayoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
+                          context.layoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
     const LuPixelPoint& point = cursor->getCursorPoint();
     const LuPixelRect& size = cursor->getCursorSize();
     if ( activeCursor )
@@ -399,20 +399,20 @@ void SequenceElement::drawCursor( TQPainter& painter, const ContextStyle& contex
         int offset = 0;
         if ( cursor->isSelection() && cursor->getPos() > cursor->getMark() )
             offset = -1;
-        painter.drawLine( context.tqlayoutUnitToPixelX( point.x() ) + offset,
-                          context.tqlayoutUnitToPixelY( size.top() ),
-                          context.tqlayoutUnitToPixelX( point.x() ) + offset,
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1 );
-        painter.drawLine( context.tqlayoutUnitToPixelX( point.x() ) + offset + 1,
-                          context.tqlayoutUnitToPixelY( size.top() ),
-                          context.tqlayoutUnitToPixelX( point.x() ) + offset + 1,
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1 );
+        painter.drawLine( context.layoutUnitToPixelX( point.x() ) + offset,
+                          context.layoutUnitToPixelY( size.top() ),
+                          context.layoutUnitToPixelX( point.x() ) + offset,
+                          context.layoutUnitToPixelY( size.bottom() )-1 );
+        painter.drawLine( context.layoutUnitToPixelX( point.x() ) + offset + 1,
+                          context.layoutUnitToPixelY( size.top() ),
+                          context.layoutUnitToPixelX( point.x() ) + offset + 1,
+                          context.layoutUnitToPixelY( size.bottom() )-1 );
     }
     if ( !smallCursor && !cursor->isSelection() )
-        painter.drawLine( context.tqlayoutUnitToPixelX( size.left() ),
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1,
-                          context.tqlayoutUnitToPixelX( size.right() )-1,
-                          context.tqlayoutUnitToPixelY( size.bottom() )-1 );
+        painter.drawLine( context.layoutUnitToPixelX( size.left() ),
+                          context.layoutUnitToPixelY( size.bottom() )-1,
+                          context.layoutUnitToPixelX( size.right() )-1,
+                          context.layoutUnitToPixelY( size.bottom() )-1 );
     // This might be wrong but probably isn't.
     painter.setRasterOp( TQt::CopyROP );
 }
@@ -1629,13 +1629,13 @@ void NameSequence::drawCursor( TQPainter& painter, const ContextStyle& context,
 {
     LuPixelPoint point = widgetPos();
     painter.setPen( TQPen( context.getEmptyColor(),
-                          context.tqlayoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
+                          context.layoutUnitToPixelX( context.getLineWidth( style.sizeFactor() )/2 ) ) );
     luPixel unitX = context.ptToLayoutUnitPixX( 1 );
     luPixel unitY = context.ptToLayoutUnitPixY( 1 );
-    painter.drawRect( context.tqlayoutUnitToPixelX( point.x()-unitX ),
-                      context.tqlayoutUnitToPixelY( point.y()-unitY ),
-                      context.tqlayoutUnitToPixelX( getWidth()+2*unitX ),
-                      context.tqlayoutUnitToPixelY( getHeight()+2*unitY ) );
+    painter.drawRect( context.layoutUnitToPixelX( point.x()-unitX ),
+                      context.layoutUnitToPixelY( point.y()-unitY ),
+                      context.layoutUnitToPixelX( getWidth()+2*unitX ),
+                      context.layoutUnitToPixelY( getHeight()+2*unitY ) );
 
     inherited::drawCursor( painter, context, style, cursor, smallCursor, activeCursor );
 }
diff --git a/lib/kformula/sequenceelement.h b/lib/kformula/sequenceelement.h
index 167c1ae3..ab6828fd 100644
--- a/lib/kformula/sequenceelement.h
+++ b/lib/kformula/sequenceelement.h
@@ -70,7 +70,7 @@ public:
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
                                    const LuPixelPoint& point,
-                                   const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -92,7 +92,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -101,15 +101,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cc
index 7bc21d24..f3f43d1c 100644
--- a/lib/kformula/spaceelement.cc
+++ b/lib/kformula/spaceelement.cc
@@ -99,24 +99,24 @@ void SpaceElement::calcSizes( const ContextStyle& context,
 
     double width = style.getSpace( m_widthType, m_width );
     if ( m_widthType == AbsoluteSize ) {
-        width = m_width / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        width = m_width / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     else if ( m_widthType == PixelSize ) {
-        width = context.pixelYToPt( m_width ) / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        width = context.pixelYToPt( m_width ) / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     double height = style.getSpace( m_heightType, m_height );
     if ( m_heightType == AbsoluteSize ) {
-        height = m_height / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        height = m_height / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     else if ( m_heightType == PixelSize ) {
-        height = context.pixelYToPt( m_height ) / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        height = context.pixelYToPt( m_height ) / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     double depth = style.getSpace( m_depthType, m_depth );
     if ( m_depthType == AbsoluteSize ) {
-        depth = m_depth / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        depth = m_depth / context.layoutUnitPtToPt( context.getBaseSize() );
     }
     else if ( m_depthType == PixelSize ) {
-        depth = context.pixelYToPt( m_depth ) / context.tqlayoutUnitPtToPt( context.getBaseSize() );
+        depth = context.pixelYToPt( m_depth ) / context.layoutUnitPtToPt( context.getBaseSize() );
     }
 
     setWidth( hbound.width() * width );
@@ -133,27 +133,27 @@ void SpaceElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                          ContextStyle::TextStyle /*tstyle*/,
                          ContextStyle::IndexStyle /*istyle*/,
                          StyleAttributes& /*style*/,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos(tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY());
+    LuPixelPoint myPos(parentOrigin.x()+getX(), parentOrigin.y()+getY());
     // there is such a thing as negative space!
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
     if ( context.edit() ) {
         painter.setPen( context.getEmptyColor() );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ),
-                          context.tqlayoutUnitToPixelX( myPos.x()+getWidth()-1 ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ),
-                          context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x()+getWidth()-1 ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ),
-                          context.tqlayoutUnitToPixelX( myPos.x()+getWidth()-1 ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ),
+                          context.layoutUnitToPixelX( myPos.x()+getWidth()-1 ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ),
+                          context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x()+getWidth()-1 ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ),
+                          context.layoutUnitToPixelX( myPos.x()+getWidth()-1 ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight()-getHeight()/5 ) );
     }
 }
 
diff --git a/lib/kformula/spaceelement.h b/lib/kformula/spaceelement.h
index 0f5db35d..856af25e 100644
--- a/lib/kformula/spaceelement.h
+++ b/lib/kformula/spaceelement.h
@@ -78,7 +78,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -87,15 +87,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Moves the cursor away from the given child. The cursor is
diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cc
index 1a8f20ae..fc61386c 100644
--- a/lib/kformula/styleelement.cc
+++ b/lib/kformula/styleelement.cc
@@ -193,7 +193,7 @@ void StyleElement::setStyleSize( const ContextStyle& context, StyleAttributes& s
 
     // Get scriptminsize attribute in absolute units, so we don't depend on 
     // context to get the default value
-    double basesize = context.tqlayoutUnitPtToPt( context.getBaseSize() );
+    double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
     double size = style.scriptMinSize();
     switch ( m_scriptMinSizeType ) {
     case AbsoluteSize:
@@ -236,7 +236,7 @@ void StyleElement::setStyleSize( const ContextStyle& context, StyleAttributes& s
 double StyleElement::sizeFactor( const ContextStyle& context, SizeType st, 
                                  double length, double defvalue )
 {
-    double basesize = context.tqlayoutUnitPtToPt( context.getBaseSize() );
+    double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
     switch ( st ) {
     case AbsoluteSize:
         return length / basesize;
diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cc
index 518fba2f..fb2eb69d 100644
--- a/lib/kformula/symbolelement.cc
+++ b/lib/kformula/symbolelement.cc
@@ -134,12 +134,12 @@ bool SymbolElement::accept( ElementVisitor* visitor )
 
 
 BasicElement* SymbolElement::goToPos( FormulaCursor* cursor, bool& handled,
-                                      const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin )
+                                      const LuPixelPoint& point, const LuPixelPoint& parentOrigin )
 {
-    BasicElement* e = BasicElement::goToPos(cursor, handled, point, tqparentOrigin);
+    BasicElement* e = BasicElement::goToPos(cursor, handled, point, parentOrigin);
     if (e != 0) {
-        LuPixelPoint myPos(tqparentOrigin.x() + getX(),
-                           tqparentOrigin.y() + getY());
+        LuPixelPoint myPos(parentOrigin.x() + getX(),
+                           parentOrigin.y() + getY());
 
         e = content->goToPos(cursor, handled, point, myPos);
         if (e != 0) {
@@ -192,7 +192,7 @@ BasicElement* SymbolElement::goToPos( FormulaCursor* cursor, bool& handled,
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void SymbolElement::calcSizes( const ContextStyle& context,
                                ContextStyle::TextStyle tstyle,
@@ -212,7 +212,7 @@ void SymbolElement::calcSizes( const ContextStyle& context,
     symbol->calcSizes(context, tstyle, factor, mySize);
     content->calcSizes( context, tstyle, istyle, style );
 
-    //symbol->scale(((double)tqparentSize)/symbol->getHeight()*2);
+    //symbol->scale(((double)parentSize)/symbol->getHeight()*2);
 
     luPixel upperWidth = 0;
     luPixel upperHeight = 0;
@@ -300,17 +300,17 @@ void SymbolElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void SymbolElement::draw( TQPainter& painter, const LuPixelRect& r,
                           const ContextStyle& context,
                           ContextStyle::TextStyle tstyle,
                           ContextStyle::IndexStyle istyle,
                           StyleAttributes& style,
-                          const LuPixelPoint& tqparentOrigin )
+                          const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -330,19 +330,19 @@ void SymbolElement::draw( TQPainter& painter, const LuPixelRect& r,
 #if 0
     painter.setBrush(TQt::NoBrush);
     painter.setPen(TQt::red);
-//     painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-//                       context.tqlayoutUnitToPixelY( myPos.y() ),
-//                       context.tqlayoutUnitToPixelX( getWidth() ),
-//                       context.tqlayoutUnitToPixelY( getHeight() ) );
-    painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x()+symbol->getX() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+symbol->getY() ),
-                      context.tqlayoutUnitToPixelX( symbol->getWidth() ),
-                      context.tqlayoutUnitToPixelY( symbol->getHeight() ) );
+//     painter.drawRect( context.layoutUnitToPixelX( myPos.x() ),
+//                       context.layoutUnitToPixelY( myPos.y() ),
+//                       context.layoutUnitToPixelX( getWidth() ),
+//                       context.layoutUnitToPixelY( getHeight() ) );
+    painter.drawRect( context.layoutUnitToPixelX( myPos.x()+symbol->getX() ),
+                      context.layoutUnitToPixelY( myPos.y()+symbol->getY() ),
+                      context.layoutUnitToPixelX( symbol->getWidth() ),
+                      context.layoutUnitToPixelY( symbol->getHeight() ) );
     painter.setPen(TQt::green);
-    painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+axis(context, tstyle) ),
-                      context.tqlayoutUnitToPixelX( myPos.x()+getWidth() ),
-                      context.tqlayoutUnitToPixelY( myPos.y()+axis(context, tstyle) ) );
+    painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                      context.layoutUnitToPixelY( myPos.y()+axis(context, tstyle) ),
+                      context.layoutUnitToPixelX( myPos.x()+getWidth() ),
+                      context.layoutUnitToPixelY( myPos.y()+axis(context, tstyle) ) );
 #endif
 }
 
diff --git a/lib/kformula/symbolelement.h b/lib/kformula/symbolelement.h
index 799703a6..877c4493 100644
--- a/lib/kformula/symbolelement.h
+++ b/lib/kformula/symbolelement.h
@@ -54,7 +54,7 @@ public:
      * is allowed to set the cursor.
      */
     virtual BasicElement* goToPos( FormulaCursor*, bool& handled,
-                                   const LuPixelPoint& point, const LuPixelPoint& tqparentOrigin );
+                                   const LuPixelPoint& point, const LuPixelPoint& parentOrigin );
 
     // drawing
     //
@@ -65,7 +65,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -74,15 +74,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cc
index 24eae2d8..c42a6e2f 100644
--- a/lib/kformula/textelement.cc
+++ b/lib/kformula/textelement.cc
@@ -106,7 +106,7 @@ bool TextElement::isInvisible() const
 
 /**
  * Calculates our width and height and
- * our tqchildren's tqparentPosition.
+ * our tqchildren's parentPosition.
  */
 void TextElement::calcSizes( const ContextStyle& context, 
                              ContextStyle::TextStyle tstyle, 
@@ -120,7 +120,7 @@ void TextElement::calcSizes( const ContextStyle& context,
     setCharFamily( style.charFamily() );
 
     TQFont font = getFont( context, style );
-    double fontsize = context.tqlayoutUnitPtToPt( mySize );
+    double fontsize = context.layoutUnitPtToPt( mySize );
     double scriptsize = pow( style.scriptSizeMultiplier(), style.scriptLevel() );
     double size = fontsize * scriptsize;
     font.setPointSizeFloat( size < style.scriptMinSize() ? style.scriptMinSize() : size );
@@ -156,21 +156,21 @@ void TextElement::calcSizes( const ContextStyle& context,
 
 /**
  * Draws the whole element including its tqchildren.
- * The `tqparentOrigin' is the point this element's tqparent starts.
- * We can use our tqparentPosition to get our own origin then.
+ * The `parentOrigin' is the point this element's tqparent starts.
+ * We can use our parentPosition to get our own origin then.
  */
 void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                         const ContextStyle& context,
                         ContextStyle::TextStyle tstyle,
                         ContextStyle::IndexStyle /*istyle*/,
                         StyleAttributes& style,
-                        const LuPixelPoint& tqparentOrigin )
+                        const LuPixelPoint& parentOrigin )
 {
     if ( character == applyFunctionChar || character == invisibleTimes || character == invisibleComma ) {
         return;
     }
 
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     //if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
     //    return;
 
@@ -184,7 +184,7 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
     double factor = style.sizeFactor();
     luPt mySize = context.getAdjustedSize( tstyle, factor );
     TQFont font = getFont( context, style );
-    double fontsize = context.tqlayoutUnitPtToPt( mySize );
+    double fontsize = context.layoutUnitPtToPt( mySize );
     double scriptsize = pow( style.scriptSizeMultiplier(), style.scriptLevel() );
     double size = fontsize * scriptsize;
     font.setPointSizeFloat( size < style.scriptMinSize() ? style.scriptMinSize() : size );
@@ -192,7 +192,7 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
 
     //kdDebug( DEBUGID ) << "TextElement::draw font=" << font.rawName() << endl;
     //kdDebug( DEBUGID ) << "TextElement::draw size=" << mySize << endl;
-    //kdDebug( DEBUGID ) << "TextElement::draw size=" << context.tqlayoutUnitToFontSize( mySize, false ) << endl;
+    //kdDebug( DEBUGID ) << "TextElement::draw size=" << context.layoutUnitToFontSize( mySize, false ) << endl;
     //kdDebug( DEBUGID ) << "TextElement::draw height: " << getHeight() << endl;
     //kdDebug( DEBUGID ) << "TextElement::draw width: " << getWidth() << endl;
     //kdDebug( DEBUGID ) << endl;
@@ -205,13 +205,13 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
 //         kdDebug() << "draw text: " << text[0].tqunicode()
 //                   << " " << painter.font().family().latin1()
 //                   << endl;
-        painter.fillRect( context.tqlayoutUnitToPixelX( tqparentOrigin.x() ),
-                          context.tqlayoutUnitToPixelY( tqparentOrigin.y() ),
-                          context.tqlayoutUnitToPixelX( getParent()->getWidth() ),
-                          context.tqlayoutUnitToPixelY( getParent()->getHeight() ),
+        painter.fillRect( context.layoutUnitToPixelX( parentOrigin.x() ),
+                          context.layoutUnitToPixelY( parentOrigin.y() ),
+                          context.layoutUnitToPixelX( getParent()->getWidth() ),
+                          context.layoutUnitToPixelY( getParent()->getHeight() ),
                           style.background() );
-        painter.drawText( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getBaseline() ),
+        painter.drawText( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getBaseline() ),
                           text );
     }
     else {
@@ -226,17 +226,17 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                 // baseline==0 glyphs without yet another flag.
                 bl = -( getHeight()/2 + context.axisHeight( tstyle, factor ) );
             }
-            painter.drawText( context.tqlayoutUnitToPixelX( myPos.x() ),
-                              context.tqlayoutUnitToPixelY( myPos.y()+bl ),
+            painter.drawText( context.layoutUnitToPixelX( myPos.x() ),
+                              context.layoutUnitToPixelY( myPos.y()+bl ),
                               TQString(ch) );
         }
         else {
             painter.setPen( TQPen( context.getErrorColor(),
-                                  context.tqlayoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
-            painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-                              context.tqlayoutUnitToPixelY( myPos.y() ),
-                              context.tqlayoutUnitToPixelX( getWidth() ),
-                              context.tqlayoutUnitToPixelY( getHeight() ) );
+                                  context.layoutUnitToPixelX( context.getLineWidth( factor ) ) ) );
+            painter.drawRect( context.layoutUnitToPixelX( myPos.x() ),
+                              context.layoutUnitToPixelY( myPos.y() ),
+                              context.layoutUnitToPixelX( getWidth() ),
+                              context.layoutUnitToPixelY( getHeight() ) );
         }
 //    }
 
@@ -244,10 +244,10 @@ void TextElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
     //painter.setBrush(TQt::NoBrush);
 //     if ( isSymbol() ) {
 //         painter.setPen( TQt::red );
-//         painter.drawRect( context.tqlayoutUnitToPixelX( myPos.x() ),
-//                           context.tqlayoutUnitToPixelX( myPos.y() ),
-//                           context.tqlayoutUnitToPixelX( getWidth() ),
-//                           context.tqlayoutUnitToPixelX( getHeight() ) );
+//         painter.drawRect( context.layoutUnitToPixelX( myPos.x() ),
+//                           context.layoutUnitToPixelX( myPos.y() ),
+//                           context.layoutUnitToPixelX( getWidth() ),
+//                           context.layoutUnitToPixelX( getHeight() ) );
 //         painter.setPen(TQt::green);
 //         painter.drawLine(myPos.x(), myPos.y()+axis( context, tstyle ),
 //                          myPos.x()+getWidth(), myPos.y()+axis( context, tstyle ));
@@ -527,7 +527,7 @@ void EmptyElement::calcSizes( const ContextStyle& context,
     //kdDebug( DEBUGID ) << "TextElement::calcSizes size=" << mySize << endl;
 
     TQFont font = context.getDefaultFont();
-    font.setPointSizeFloat( context.tqlayoutUnitPtToPt( mySize ) );
+    font.setPointSizeFloat( context.layoutUnitPtToPt( mySize ) );
 
     TQFontMetrics fm( font );
     TQChar ch = 'A';
@@ -542,9 +542,9 @@ void EmptyElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
                          ContextStyle::TextStyle /*tstyle*/,
                          ContextStyle::IndexStyle /*istyle*/,
                          StyleAttributes& /*style*/ ,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
-    LuPixelPoint myPos( tqparentOrigin.x()+getX(), tqparentOrigin.y()+getY() );
+    LuPixelPoint myPos( parentOrigin.x()+getX(), parentOrigin.y()+getY() );
     /*
     if ( !LuPixelRect( myPos.x(), myPos.y(), getWidth(), getHeight() ).intersects( r ) )
         return;
@@ -552,10 +552,10 @@ void EmptyElement::draw( TQPainter& painter, const LuPixelRect& /*r*/,
 
     if ( context.edit() ) {
         painter.setPen( context.getHelpColor() );
-        painter.drawLine( context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y() ),
-                          context.tqlayoutUnitToPixelX( myPos.x() ),
-                          context.tqlayoutUnitToPixelY( myPos.y()+getHeight() ) );
+        painter.drawLine( context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y() ),
+                          context.layoutUnitToPixelX( myPos.x() ),
+                          context.layoutUnitToPixelY( myPos.y()+getHeight() ) );
     }
 }
 
diff --git a/lib/kformula/textelement.h b/lib/kformula/textelement.h
index 0b97f441..48eb1d43 100644
--- a/lib/kformula/textelement.h
+++ b/lib/kformula/textelement.h
@@ -73,7 +73,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -82,15 +82,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
     /**
      * Dispatch this FontCommand to all our TextElement tqchildren.
@@ -244,7 +244,7 @@ public:
 
     /**
      * Calculates our width and height and
-     * our tqchildren's tqparentPosition.
+     * our tqchildren's parentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -253,15 +253,15 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `tqparentOrigin' is the point this element's tqparent starts.
-     * We can use our tqparentPosition to get our own origin then.
+     * The `parentOrigin' is the point this element's tqparent starts.
+     * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 
     /**
diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cc
index 43731425..3b1e6224 100644
--- a/lib/kformula/tokenstyleelement.cc
+++ b/lib/kformula/tokenstyleelement.cc
@@ -59,20 +59,20 @@ void TokenStyleElement::draw( TQPainter& painter, const LuPixelRect& r,
                          ContextStyle::TextStyle tstyle,
                          ContextStyle::IndexStyle istyle,
                          StyleAttributes& style,
-                         const LuPixelPoint& tqparentOrigin )
+                         const LuPixelPoint& parentOrigin )
 {
     setStyleSize( context, style );
     setStyleVariant( style );
     setStyleColor( style );
     setStyleBackground( style );
     if ( style.background() != TQt::color0 ) {
-        painter.fillRect( context.tqlayoutUnitToPixelX( tqparentOrigin.x() + getX() ),
-                          context.tqlayoutUnitToPixelY( tqparentOrigin.y() + getY() ),
-                          context.tqlayoutUnitToPixelX( getWidth() ),
-                          context.tqlayoutUnitToPixelY( getHeight() ),
+        painter.fillRect( context.layoutUnitToPixelX( parentOrigin.x() + getX() ),
+                          context.layoutUnitToPixelY( parentOrigin.y() + getY() ),
+                          context.layoutUnitToPixelX( getWidth() ),
+                          context.layoutUnitToPixelY( getHeight() ),
                           style.background() );
     }
-    inherited::draw( painter, r, context, tstyle, istyle, style, tqparentOrigin );
+    inherited::draw( painter, r, context, tstyle, istyle, style, parentOrigin );
     resetStyle( style );
 }
 
@@ -550,7 +550,7 @@ void TokenStyleElement::resetStyle( StyleAttributes& style )
 
 double TokenStyleElement::sizeFactor( const ContextStyle& context, double factor )
 {
-    double basesize = context.tqlayoutUnitPtToPt( context.getBaseSize() );
+    double basesize = context.layoutUnitPtToPt( context.getBaseSize() );
     switch ( m_mathSizeType ) {
     case AbsoluteSize:
         return m_mathSize / basesize;
diff --git a/lib/kformula/tokenstyleelement.h b/lib/kformula/tokenstyleelement.h
index db7d14f6..3e601ca8 100644
--- a/lib/kformula/tokenstyleelement.h
+++ b/lib/kformula/tokenstyleelement.h
@@ -48,7 +48,7 @@ public:
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
                        StyleAttributes& style,
-                       const LuPixelPoint& tqparentOrigin );
+                       const LuPixelPoint& parentOrigin );
 
 protected:
     virtual bool readAttributesFromMathMLDom( const TQDomElement &element );
diff --git a/lib/kofficecore/KoChild.h b/lib/kofficecore/KoChild.h
index b79f6802..4734bbd4 100644
--- a/lib/kofficecore/KoChild.h
+++ b/lib/kofficecore/KoChild.h
@@ -158,7 +158,7 @@ public:
 
   /**
    * @return true if the child part is an orthogonal rectangle relative
-   *         to its tqparents coordinate system.
+   *         to its parents coordinate system.
    */
   bool isRectangle() const;
 
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 695599d2..e9d985aa 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -222,7 +222,7 @@ void KoBrowserExtension::print()
         view->print( printer );
 }
 
-KoDocument::KoDocument( TQWidget * tqparentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
+KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode )
     : KParts::ReadWritePart( tqparent, name )
 {
     if(s_documentList==0L)
@@ -247,7 +247,7 @@ KoDocument::KoDocument( TQWidget * tqparentWidget, const char *widgetName, TQObj
 
     if ( singleViewMode )
     {
-        d->m_wrapperWidget = new KoViewWrapperWidget( tqparentWidget, widgetName );
+        d->m_wrapperWidget = new KoViewWrapperWidget( parentWidget, widgetName );
         setWidget( d->m_wrapperWidget );
         kdDebug(30003) << "creating KoBrowserExtension" << endl;
         (void) new KoBrowserExtension( this ); // ## only if embedded into a browser?
diff --git a/lib/kofficecore/KoDocument.h b/lib/kofficecore/KoDocument.h
index 0499ab6c..4051cca6 100644
--- a/lib/kofficecore/KoDocument.h
+++ b/lib/kofficecore/KoDocument.h
@@ -71,7 +71,7 @@ public:
      *  Constructor.
      * The first 4 arguments are the same as the ones passed to KParts::Factory::createPart.
      *
-     * @param tqparentWidget the tqparent widget, in case we create a wrapper widget
+     * @param parentWidget the tqparent 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.
@@ -81,12 +81,12 @@ public:
      *        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
-     *        (KoViewWrapperWidget) which is a child of @p tqparentWidget.
+     *        (KoViewWrapperWidget) which is a child of @p parentWidget.
      *        This widget can be retrieved by calling widget().
      *
      * @todo explain what the purpose of widgetName is.
      */
-    KoDocument( TQWidget* tqparentWidget,
+    KoDocument( TQWidget* parentWidget,
                 const char* widgetName,
                 TQObject* tqparent,
                 const char* name,
@@ -459,9 +459,9 @@ public:
      * Initializes an empty document (display the template dialog!).
      * You have to overload this method to initialize all your document variables.
      * @param flags see InitDocFlags
-     * @param tqparentWidget the widget this document belongs with
+     * @param parentWidget the widget this document belongs with
      */
-    virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0) = 0;
+    virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0) = 0;
 
     /**
      * Creates and shows the start up widget.
@@ -798,12 +798,12 @@ public:
     /**
      * Indicates that this document is currently viewed
      * and thus should control the title caption.
-     * Also resets current flag for all tqparents.
+     * Also resets current flag for all parents.
      */
     void setCurrent( bool on = true );
 
     /**
-     * Sets current flag for this document and all its tqparents
+     * Sets current flag for this document and all its parents
      */
     void forceCurrent( bool on );
     bool isCurrent() const;
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 308493ad..27d4a673 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -102,7 +102,7 @@ KoDocument *KoDocumentChild::document() const
   return d->m_doc;
 }
 
-KoDocument* KoDocumentChild::tqparentDocument() const
+KoDocument* KoDocumentChild::parentDocument() const
 {
   return d->m_parent;
 }
@@ -349,9 +349,9 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
 
     // see KoDocument::insertChild for an explanation what's going on
     // now :-)
-    if ( tqparentDocument() )
+    if ( parentDocument() )
     {
-        KoDocument *tqparent = tqparentDocument();
+        KoDocument *tqparent = parentDocument();
 
         if ( tqparent->manager() && tqparent->manager()->parts() )
         {
diff --git a/lib/kofficecore/KoDocumentChild.h b/lib/kofficecore/KoDocumentChild.h
index 228122dc..491f9b2d 100644
--- a/lib/kofficecore/KoDocumentChild.h
+++ b/lib/kofficecore/KoDocumentChild.h
@@ -73,7 +73,7 @@ public:
    *
    * @see KoDocument
    */
-  virtual KoDocument *tqparentDocument() const; // TODO: remove virtual, makes no sense
+  virtual KoDocument *parentDocument() const; // TODO: remove virtual, makes no sense
 
   virtual KoDocument* hitTest( const TQPoint& p, const TQWMatrix& _matrix = TQWMatrix() );
 
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index ecade093..e10e624b 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -46,7 +46,7 @@ KoFilterChain::ChainLink::ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr fi
 {
 }
 
-KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const tqparentChainLink )
+KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const ChainLink* const parentChainLink )
 {
     if ( !m_filterEntry ) {
         kdError( 30500 ) << "This filter entry is null. Strange stuff going on." << endl;
@@ -60,8 +60,8 @@ KoFilter::ConversiontqStatus KoFilterChain::ChainLink::invokeFilter( const Chain
         return KoFilter::CreationError;
     }
 
-    if ( tqparentChainLink )
-        setupCommunication( tqparentChainLink->m_filter );
+    if ( parentChainLink )
+        setupCommunication( parentChainLink->m_filter );
 
     KoFilter::ConversiontqStatus status = m_filter->convert( m_from, m_to );
     delete m_filter;
@@ -81,22 +81,22 @@ int KoFilterChain::ChainLink::lruPartIndex() const
     return -1;
 }
 
-void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const tqparentFilter ) const
+void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentFilter ) const
 {
     // progress information
     TQObject::connect( m_filter, TQT_SIGNAL( sigProgress( int ) ),
                       m_chain->manager(), TQT_SIGNAL( sigProgress( int ) ) );
 
-    if ( !tqparentFilter )
+    if ( !parentFilter )
         return;
 
-    const TQMetaObject* const tqparent = tqparentFilter->tqmetaObject();
+    const TQMetaObject* const tqparent = parentFilter->tqmetaObject();
     const TQMetaObject* const child = m_filter->tqmetaObject();
     if ( !tqparent || !child )
         return;
 
-    setupConnections( tqparentFilter, tqparent->signalNames(), m_filter, child->slotNames() );
-    setupConnections( m_filter, child->signalNames(), tqparentFilter, tqparent->slotNames() );
+    setupConnections( parentFilter, tqparent->signalNames(), m_filter, child->slotNames() );
+    setupConnections( m_filter, child->signalNames(), parentFilter, tqparent->slotNames() );
 }
 
 void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const TQStrList& sigs,
@@ -139,15 +139,15 @@ KoFilter::ConversiontqStatus KoFilterChain::invokeChain()
     int count = m_chainLinks.count();
 
     // This is needed due to nasty Microsoft design
-    const ChainLink* tqparentChainLink = 0;
+    const ChainLink* parentChainLink = 0;
     if ( filterManagerParentChain() )
-        tqparentChainLink = filterManagerParentChain()->m_chainLinks.current();
+        parentChainLink = filterManagerParentChain()->m_chainLinks.current();
 
     // No iterator here, as we need m_chainLinks.current() in outputDocument()
     m_chainLinks.first();
     for ( ; count > 1 && m_chainLinks.current() && status == KoFilter::OK;
           m_chainLinks.next(), --count ) {
-        status = m_chainLinks.current()->invokeFilter( tqparentChainLink );
+        status = m_chainLinks.current()->invokeFilter( parentChainLink );
         m_state = Middle;
         manageIO();
     }
@@ -162,7 +162,7 @@ KoFilter::ConversiontqStatus KoFilterChain::invokeChain()
             m_state |= End;
         else
             m_state = End;
-        status = m_chainLinks.current()->invokeFilter( tqparentChainLink );
+        status = m_chainLinks.current()->invokeFilter( parentChainLink );
         manageIO();
     }
 
@@ -373,7 +373,7 @@ int KoFilterChain::filterManagerDirection() const
 
 KoFilterChain* const KoFilterChain::filterManagerParentChain() const
 {
-    return m_manager->tqparentChain();
+    return m_manager->parentChain();
 }
 
 void KoFilterChain::manageIO()
diff --git a/lib/kofficecore/KoFilterChain.h b/lib/kofficecore/KoFilterChain.h
index 2936ae40..7760a217 100644
--- a/lib/kofficecore/KoFilterChain.h
+++ b/lib/kofficecore/KoFilterChain.h
@@ -182,7 +182,7 @@ private:
         ChainLink( KoFilterChain* chain, KoFilterEntry::Ptr filterEntry,
                    const TQCString& from, const TQCString& to );
 
-        KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const tqparentChainLink );
+        KoFilter::ConversiontqStatus invokeFilter( const ChainLink* const parentChainLink );
 
         TQCString from() const { return m_from; }
         TQCString to() const { return m_to; }
@@ -198,7 +198,7 @@ private:
         ChainLink( const ChainLink& rhs );
         ChainLink& operator=( const ChainLink& rhs );
 
-        void setupCommunication( const KoFilter* const tqparentFilter ) const;
+        void setupCommunication( const KoFilter* const parentFilter ) const;
         void setupConnections( const KoFilter* sender, const TQStrList& sigs,
                                const KoFilter* receiver, const TQStrList& sl0ts ) const;
 
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index 46c20c2f..bc4d48bc 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -125,8 +125,8 @@ KoFilterManager::KoFilterManager( KoDocument* document ) :
 
 
 KoFilterManager::KoFilterManager( const TQString& url, const TQCString& mimetypeHint,
-                                  KoFilterChain* const tqparentChain ) :
-    m_document( 0 ), m_parentChain( tqparentChain ), m_importUrl( url ), m_importUrlMimetypeHint( mimetypeHint ),
+                                  KoFilterChain* const parentChain ) :
+    m_document( 0 ), m_parentChain( parentChain ), m_importUrl( url ), m_importUrlMimetypeHint( mimetypeHint ),
     m_graph( "" ), d( 0 )
 {
     d = new KoFilterManager::Private;
diff --git a/lib/kofficecore/KoFilterManager.h b/lib/kofficecore/KoFilterManager.h
index 8405f49b..de75bf27 100644
--- a/lib/kofficecore/KoFilterManager.h
+++ b/lib/kofficecore/KoFilterManager.h
@@ -66,11 +66,11 @@ 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 tqparentChain The tqparent filter chain of this filter manager. Used
+     * @param parentChain The tqparent 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 = "",
-                     KoFilterChain* const tqparentChain = 0 );
+                     KoFilterChain* const parentChain = 0 );
 
     virtual ~KoFilterManager();
 
@@ -152,7 +152,7 @@ private:
     friend int KoFilterChain::filterManagerDirection() const;
     int direction() const { return static_cast<int>( m_direction ); }
     friend KoFilterChain* const KoFilterChain::filterManagerParentChain() const;
-    KoFilterChain* const tqparentChain() const { return m_parentChain; }
+    KoFilterChain* const parentChain() const { return m_parentChain; }
 
     // Private API
     KoFilterManager( const KoFilterManager& rhs );
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index b6f77b8a..e8722eaa 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -251,7 +251,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
 {
   if ( d->m_mode == 0 )
   {
-      TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+      TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
       move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(),
 		    p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) );
       // The other modes change the tqgeometry so they call resizeEvent.
@@ -261,7 +261,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 1 )
   {
-      TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+      TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
       int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() );
       int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() );
       setGeometry( d->m_framePos.x() - w + d->m_width,
@@ -269,7 +269,7 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 2 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() );
     int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() );
     setGeometry( d->m_framePos.x() - w + d->m_width,
@@ -277,14 +277,14 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 3 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() );
     int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() );
     resize( w, h );
   }
   else if ( d->m_mode == 4 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() );
     int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() );
     setGeometry( d->m_framePos.x(),
@@ -292,27 +292,27 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
   }
   else if ( d->m_mode == 5 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int h = TQMIN( TQMAX( d->m_height + d->m_mousePressPos.y() - p.y(), minimumHeight() ), maximumHeight() );
     setGeometry( d->m_framePos.x(),
 		 d->m_framePos.y() - h + d->m_height, d->m_width, h );
   }
   else if ( d->m_mode == 6 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int h = TQMIN( TQMAX( d->m_height - d->m_mousePressPos.y() + p.y(), minimumHeight() ), maximumHeight() );
     resize( d->m_width, h );
   }
   else if ( d->m_mode == 7 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width + d->m_mousePressPos.x() - p.x(), minimumWidth() ), maximumWidth() );
     setGeometry( d->m_framePos.x() - w + d->m_width,
 		 d->m_framePos.y(), w, d->m_height );
   }
   else if ( d->m_mode == 8 )
   {
-    TQPoint p = tqparentWidget()->mapFromGlobal( ev->globalPos() );
+    TQPoint p = parentWidget()->mapFromGlobal( ev->globalPos() );
     int w = TQMIN( TQMAX( d->m_width - d->m_mousePressPos.x() + p.x(), minimumWidth() ), maximumWidth() );
     resize( w, d->m_height );
   }
diff --git a/lib/kofficecore/KoGenStyles.cpp b/lib/kofficecore/KoGenStyles.cpp
index 0ee2e730..68b8477a 100644
--- a/lib/kofficecore/KoGenStyles.cpp
+++ b/lib/kofficecore/KoGenStyles.cpp
@@ -35,29 +35,29 @@ TQString KoGenStyles::lookup( const KoGenStyle& style, const TQString& name, int
     if ( it == m_styleMap.end() ) {
         // Not found, try if this style is in fact equal to its tqparent (the find above
         // wouldn't have found it, due to m_parentName being set).
-        if ( !style.tqparentName().isEmpty() ) {
+        if ( !style.parentName().isEmpty() ) {
             KoGenStyle testStyle( style );
-            const KoGenStyle* tqparentStyle = this->style( style.tqparentName() ); // ## linear search
-            if( !tqparentStyle ) {
-                kdDebug(30003) << "KoGenStyles::lookup(" << name << "): tqparent style '" << style.tqparentName() << "' not found in collection" << endl;
+            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;
             } else {
-                if ( testStyle.m_familyName != tqparentStyle->m_familyName )
+                if ( testStyle.m_familyName != parentStyle->m_familyName )
                 {
-                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.tqparentName() << "' has a different family: " << tqparentStyle->m_familyName << endl;
+                    kdWarning(30003) << "KoGenStyles::lookup(" << name << ", family=" << testStyle.m_familyName << ") tqparent style '" << style.parentName() << "' has a different family: " << parentStyle->m_familyName << endl;
                 }
 
-                testStyle.m_parentName = tqparentStyle->m_parentName;
+                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
-                testStyle.m_type = tqparentStyle->m_type;
+                testStyle.m_type = parentStyle->m_type;
                 // Also it's ok to not have the display name of the tqparent style
                 // in the auto style
-                TQMap<TQString, TQString>::const_iterator it = tqparentStyle->m_attributes.tqfind( "style:display-name" );
-                if ( it != tqparentStyle->m_attributes.end() )
+                TQMap<TQString, TQString>::const_iterator it = parentStyle->m_attributes.tqfind( "style:display-name" );
+                if ( it != parentStyle->m_attributes.end() )
                     testStyle.addAttribute( "style:display-name", *it );
 
-                if ( *tqparentStyle == testStyle )
-                    return style.tqparentName();
+                if ( *parentStyle == testStyle )
+                    return style.parentName();
             }
         }
 
@@ -173,8 +173,8 @@ static int compareMap( const TQMap<TQString, TQString>& map1, const TQMap<TQStri
 
 
 KoGenStyle::KoGenStyle( int type, const char* familyName,
-                        const TQString& tqparentName )
-    : m_type( type ), m_familyName( familyName ), m_parentName( tqparentName ),
+                        const TQString& parentName )
+    : m_type( type ), m_familyName( familyName ), m_parentName( parentName ),
       m_autoStyleInStylesDotXml( false ), m_defaultStyle( false )
 {
 }
@@ -184,14 +184,14 @@ KoGenStyle::~KoGenStyle()
 }
 
 void KoGenStyle::writeStyleProperties( KoXmlWriter* writer, PropertyType i,
-                                       const char* elementName, const KoGenStyle* tqparentStyle ) const
+                                       const char* elementName, const KoGenStyle* parentStyle ) const
 {
     if ( !m_properties[i].isEmpty() ) {
         writer->startElement( elementName );
         TQMap<TQString, TQString>::const_iterator it = m_properties[i].begin();
         const TQMap<TQString, TQString>::const_iterator end = m_properties[i].end();
         for ( ; it != end; ++it ) {
-            if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() )
+            if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() )
                 writer->addAttribute( it.key().utf8(), it.data().utf8() );
         }
         writer->endElement();
@@ -202,19 +202,19 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
 {
     //kdDebug(30003) << "writing out style " << name << " display-name=" << m_attributes["style:display-name"] << " family=" << m_familyName << endl;
     writer->startElement( elementName );
-    const KoGenStyle* tqparentStyle = 0;
+    const KoGenStyle* parentStyle = 0;
     if ( !m_defaultStyle ) {
         if ( !drawElement )
             writer->addAttribute( "style:name", name );
         else
             writer->addAttribute( "draw:name", name );
         if ( !m_parentName.isEmpty() ) {
-            tqparentStyle = styles.style( m_parentName );
-            if ( tqparentStyle && m_familyName.isEmpty() ) {
+            parentStyle = styles.style( m_parentName );
+            if ( parentStyle && m_familyName.isEmpty() ) {
                 // get family from tqparent style, just in case
                 // Note: this is saving code, don't convert to attributeNS!
                 const_cast<KoGenStyle *>( this )->
-                    m_familyName = tqparentStyle->attribute( "style:family" ).latin1();
+                    m_familyName = parentStyle->attribute( "style:family" ).latin1();
                 //kdDebug(30003) << "Got familyname " << m_familyName << " from tqparent" << endl;
             }
             writer->addAttribute( "style:tqparent-style-name", m_parentName );
@@ -234,9 +234,9 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
 #if 0 // #ifndef NDEBUG
     kdDebug() << "style: " << name << endl;
     printDebug();
-    if ( tqparentStyle ) {
+    if ( parentStyle ) {
         kdDebug() << " tqparent: " << m_parentName << endl;
-        tqparentStyle->printDebug();
+        parentStyle->printDebug();
     }
 #endif
 
@@ -247,8 +247,8 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
     TQMap<TQString, TQString>::const_iterator it = m_attributes.begin();
     for ( ; it != m_attributes.end(); ++it ) {
         bool writeit = true;
-        if ( tqparentStyle && it.key() != "style:family" // always write the family out
-             && tqparentStyle->attribute( it.key() ) == it.data() )
+        if ( parentStyle && it.key() != "style:family" // always write the family out
+             && parentStyle->attribute( it.key() ) == it.data() )
             writeit = false;
         if ( writeit )
             writer->addAttribute( it.key().utf8(), it.data().utf8() );
@@ -261,27 +261,27 @@ void KoGenStyle::writeStyle( KoXmlWriter* writer, KoGenStyles& styles, const cha
             writer->startElement( propertiesElementName ); // e.g. paragraph-properties
         it = m_properties[i].begin();
         for ( ; it != m_properties[i].end(); ++it ) {
-            if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() )
+            if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() )
                 writer->addAttribute( it.key().utf8(), it.data().utf8() );
         }
         i = KoGenStyle::ChildElement;
         it = m_properties[i].begin();
         for ( ; it != m_properties[i].end(); ++it ) {
-            if ( !tqparentStyle || tqparentStyle->property( it.key(), i ) != it.data() ) {
+            if ( !parentStyle || parentStyle->property( it.key(), i ) != it.data() ) {
                 writer->addCompleteElement( it.data().utf8() );
             }
         }
         if ( createPropertiesTag )
             writer->endElement();
     }
-    writeStyleProperties( writer, KoGenStyle::GraphicType, "style:graphic-properties", tqparentStyle );
-    writeStyleProperties( writer, KoGenStyle::ParagraphType, "style:paragraph-properties", tqparentStyle );
-    writeStyleProperties( writer, KoGenStyle::TextType, "style:text-properties", tqparentStyle );
+    writeStyleProperties( writer, KoGenStyle::GraphicType, "style:graphic-properties", parentStyle );
+    writeStyleProperties( writer, KoGenStyle::ParagraphType, "style:paragraph-properties", parentStyle );
+    writeStyleProperties( writer, KoGenStyle::TextType, "style:text-properties", parentStyle );
 
     // And now the style maps
     for ( uint i = 0; i < m_maps.count(); ++i ) {
         bool writeit = true;
-        if ( tqparentStyle && compareMap( m_maps[i], tqparentStyle->m_maps[i] ) == 0 )
+        if ( parentStyle && compareMap( m_maps[i], parentStyle->m_maps[i] ) == 0 )
             writeit = false;
         if ( writeit ) {
             writer->startElement( "style:map" );
diff --git a/lib/kofficecore/KoGenStyles.h b/lib/kofficecore/KoGenStyles.h
index 17771c69..ad25609e 100644
--- a/lib/kofficecore/KoGenStyles.h
+++ b/lib/kofficecore/KoGenStyles.h
@@ -216,10 +216,10 @@ 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 tqparentName If set, name of the tqparent style from which this one inherits.
+     * @param parentName If set, name of the tqparent style from which this one inherits.
      */
     explicit KoGenStyle( int type = 0, const char* familyName = 0,
-                         const TQString& tqparentName = TQString() );
+                         const TQString& parentName = TQString() );
     ~KoGenStyle();
 
     /*
@@ -250,7 +250,7 @@ public:
     const char* familyName() const { return m_familyName.data(); }
 
     /// Return the name of style's tqparent, if set
-    TQString tqparentName() const { return m_parentName; }
+    TQString parentName() const { return m_parentName; }
 
     /**
      *  @brief The types of properties
@@ -434,7 +434,7 @@ private:
     }
 
     void writeStyleProperties( KoXmlWriter* writer, PropertyType i,
-                               const char* elementName, const KoGenStyle* tqparentStyle ) const;
+                               const char* elementName, const KoGenStyle* parentStyle ) const;
 
 #ifndef NDEBUG
     void printDebug() const;
diff --git a/lib/kofficecore/KoOasisLoadingContext.cpp b/lib/kofficecore/KoOasisLoadingContext.cpp
index e5082dc8..3db850e4 100644
--- a/lib/kofficecore/KoOasisLoadingContext.cpp
+++ b/lib/kofficecore/KoOasisLoadingContext.cpp
@@ -68,21 +68,21 @@ 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 tqparents themselves
+    // this recursive function is necessary as tqparent styles can have parents themselves
     if ( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) ) {
-        const TQString tqparentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
-        const TQDomElement* tqparentStyle = 0;
+        const TQString parentStyleName = style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() );
+        const TQDomElement* parentStyle = 0;
         if ( usingStylesAutoStyles ) {
             // When loading something from styles.xml, look into the styles.xml auto styles first
-            tqparentStyle = m_styles.findStyleAutoStyle( tqparentStyleName, family );
+            parentStyle = m_styles.findStyleAutoStyle( parentStyleName, family );
             // and fallback to looking at styles(), which includes the user styles from styles.xml
         }
-        if ( !tqparentStyle )
-            tqparentStyle = m_styles.findStyle( tqparentStyleName, family );
-        if ( tqparentStyle )
-            addStyles( tqparentStyle, family, usingStylesAutoStyles );
+        if ( !parentStyle )
+            parentStyle = m_styles.findStyle( parentStyleName, family );
+        if ( parentStyle )
+            addStyles( parentStyle, family, usingStylesAutoStyles );
         else
-            kdWarning(32500) << "Parent style not found: " << tqparentStyleName << endl;
+            kdWarning(32500) << "Parent style not found: " << parentStyleName << endl;
     }
     else if ( family ) {
         const TQDomElement* def = m_styles.defaultStyle( family );
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index b8c0c098..fd42bcf3 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -224,7 +224,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
     TQString text;
 
     if (w->inherits("TQViewportWidget")) {
-        w = w->tqparentWidget();
+        w = w->parentWidget();
         if (!w) return false;
     }
 
diff --git a/lib/kofficecore/KoStyleStack.cpp b/lib/kofficecore/KoStyleStack.cpp
index 22799209..9920c289 100644
--- a/lib/kofficecore/KoStyleStack.cpp
+++ b/lib/kofficecore/KoStyleStack.cpp
@@ -258,7 +258,7 @@ bool KoStyleStack::isUserStyle( const TQDomElement& e, const TQString& family )
 {
     if ( e.attributeNS( m_styleNSURI, "family", TQString() ) != family )
         return false;
-    const TQDomElement tqparent = e.tqparentNode().toElement();
+    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*/;
 }
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index cfb508a4..cebd61be 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -361,7 +361,7 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event )
       emit childDeactivated( child );
     }
     else
-      emit tqinvalidated();
+      emit invalidated();
   }
   else
     emit activated( event->activated() );
@@ -390,7 +390,7 @@ void KoView::partSelectEvent( KParts::PartSelectEvent *event )
       emit childUnselected( child );
     }
     else
-      emit tqinvalidated();
+      emit invalidated();
   }
   else
     emit selected( event->selected() );
@@ -723,20 +723,20 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView )
   m_parentView = _parentView;
   m_child = child;
 
-  m_frame = new KoFrame( tqparentView()->canvas() );
+  m_frame = new KoFrame( parentView()->canvas() );
   KoView *view = child->document()->createView( m_frame );
   view->setXMLGUIBuildDocument( child->document()->viewBuildDocument( view ) );
 
-  view->setPartManager( tqparentView()->partManager() );
+  view->setPartManager( parentView()->partManager() );
 
   // hack? (Werner)
-  view->setZoom( tqparentView()->zoom() * TQMAX(child->xScaling(), child->yScaling()) );
+  view->setZoom( parentView()->zoom() * TQMAX(child->xScaling(), child->yScaling()) );
 
   m_frame->setView( view );
   m_frame->show();
   m_frame->raise();
 
-  tqparentView()->canvasAddChild( this );
+  parentView()->canvasAddChild( this );
 
 
   /*
@@ -764,7 +764,7 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView )
   // also called right after activation.
 
   connect( view, TQT_SIGNAL( activated( bool ) ),
-           tqparentView(), TQT_SLOT( slotChildActivated( bool ) ) );
+           parentView(), TQT_SLOT( slotChildActivated( bool ) ) );
 }
 
 KoViewChild::~KoViewChild()
@@ -782,8 +782,8 @@ void KoViewChild::slotFrameGeometryChanged()
   // Set our tqgeometry from the frame tqgeometry (R2 reversed)
   TQRect geom = m_frame->tqgeometry();
   int b = m_frame->border();
-  TQRect borderRect( geom.x() + b + tqparentView()->canvasXOffset(),
-                    geom.y() + b + tqparentView()->canvasYOffset(),
+  TQRect borderRect( geom.x() + b + parentView()->canvasXOffset(),
+                    geom.y() + b + parentView()->canvasYOffset(),
                     geom.width() - b * 2,
                     geom.height() - b * 2 );
   setGeometry( borderRect );
@@ -791,14 +791,14 @@ void KoViewChild::slotFrameGeometryChanged()
   if(m_child)
   {
     // Set the child tqgeometry from the frame tqgeometry (R1 reversed)
-    TQRect borderLessRect( geom.x() + m_frame->leftBorder() + tqparentView()->canvasXOffset(),
-                          geom.y() + m_frame->topBorder() + tqparentView()->canvasYOffset(),
+    TQRect borderLessRect( geom.x() + m_frame->leftBorder() + parentView()->canvasXOffset(),
+                          geom.y() + m_frame->topBorder() + parentView()->canvasYOffset(),
                           geom.width() - m_frame->leftBorder() - m_frame->rightBorder(),
                           geom.height() - m_frame->topBorder() - m_frame->bottomBorder() );
 
     // We don't want to trigger slotDocGeometryChanged again
     lock();
-    TQRect childGeom = tqparentView()->reverseViewTransformations( borderLessRect );
+    TQRect childGeom = parentView()->reverseViewTransformations( borderLessRect );
     kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry "
               << ( tqgeometry() == childGeom ? "already " : "set to " )
               << childGeom << endl;
@@ -813,9 +813,9 @@ void KoViewChild::slotDocGeometryChanged()
       return;
   // Set frame tqgeometry from child tqgeometry (R1)
   // The frame's resizeEvent will call slotFrameGeometryChanged.
-  TQRect geom = tqparentView()->applyViewTransformations( m_child->tqgeometry() );
-  TQRect borderRect( geom.x() - m_frame->leftBorder() - tqparentView()->canvasXOffset(),
-                    geom.y() - m_frame->topBorder() - tqparentView()->canvasYOffset(),
+  TQRect geom = parentView()->applyViewTransformations( m_child->tqgeometry() );
+  TQRect borderRect( geom.x() - m_frame->leftBorder() - parentView()->canvasXOffset(),
+                    geom.y() - m_frame->topBorder() - parentView()->canvasYOffset(),
                     geom.width() + m_frame->leftBorder() + m_frame->rightBorder(),
                     geom.height() + m_frame->topBorder() + m_frame->bottomBorder() );
   kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry "
diff --git a/lib/kofficecore/KoView.h b/lib/kofficecore/KoView.h
index dcab6745..42d78fb6 100644
--- a/lib/kofficecore/KoView.h
+++ b/lib/kofficecore/KoView.h
@@ -438,7 +438,7 @@ signals:
 
   void regionInvalidated( const TQRegion &region, bool erase );
 
-  void tqinvalidated();
+  void invalidated();
 
 // KDE invents public signals :)
 #undef signals
@@ -479,7 +479,7 @@ public:
   virtual ~KoViewChild();
 
   KoDocumentChild *documentChild() const { return m_child; }
-  KoView *tqparentView() const { return m_parentView; }
+  KoView *parentView() const { return m_parentView; }
   KoFrame *frame() const { return m_frame; }
 
   void setInitialFrameGeometry();
diff --git a/lib/kofficecore/KoXmlReader.cpp b/lib/kofficecore/KoXmlReader.cpp
index 323d0ad6..371b4d29 100644
--- a/lib/kofficecore/KoXmlReader.cpp
+++ b/lib/kofficecore/KoXmlReader.cpp
@@ -305,7 +305,7 @@ KoXmlNodeData::KoXmlNodeData()
   fastLoading = false;
 
   // assume true, it will be set to false by XML parser when this node
-  // aptqparently has tqchildren AND the tqchildren are not loaded
+  // apparently has tqchildren AND the tqchildren are not loaded
   loaded = true;
 }
 
@@ -1107,7 +1107,7 @@ KoXmlDocument KoXmlNode::ownerDocument() const
   return KoXmlDocument( node );
 }
 
-KoXmlNode KoXmlNode::tqparentNode() const
+KoXmlNode KoXmlNode::parentNode() const
 {
   return d->tqparent ? KoXmlNode( d->tqparent ) : KoXmlNode();
 }
@@ -1519,7 +1519,7 @@ TQString* errorMsg, int* errorLine, int* errorColumn )
   reader.setFeature( "http://xml.org/sax/features/namespace-prefixes", !namespaceProcessing );
   reader.setFeature( "http://trolltech.com/xml/features/report-whitespace-only-CharData", false );
 
-  // FIXME this hack is aptqparently private
+  // FIXME this hack is apparently private
   //reader.setUndefEntityInAttrHack(true);
 
   TQXmlInputSource source( device );
diff --git a/lib/kofficecore/KoXmlReader.h b/lib/kofficecore/KoXmlReader.h
index 919e566b..d4505398 100644
--- a/lib/kofficecore/KoXmlReader.h
+++ b/lib/kofficecore/KoXmlReader.h
@@ -101,7 +101,7 @@ public:
   virtual TQString localName() const;
 
   KoXmlDocument ownerDocument() const;
-  KoXmlNode tqparentNode() const;
+  KoXmlNode parentNode() const;
 
   bool hasChildNodes() const;
   KoXmlNode firstChild() const;
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 39f95948..a45e1334 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -412,8 +412,8 @@ void KKbdAccessExtensions::showIcon()
         TQDockWindow* dockWindow = dynamic_cast<TQDockWindow *>(d->panel);
         p = dockWindow->pos();
         if (dockWindow->area()) {
-            // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->tqparentWidget()->name() << endl;
-            p = dockWindow->tqparentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p);
+            // kdDebug() << "KKbdAccessExtensions::showIcon: pos = " << p << " of window = " << dockWindow->parentWidget()->name() << endl;
+            p = dockWindow->parentWidget()->mapTo(dockWindow->tqtopLevelWidget(), p);
             // kdDebug() << "KKbdAccessExtensions::showIcon: mapTo = " << p << " of window = " << dockWindow->tqtopLevelWidget()->name() << endl;
             // TODO: How to get the handle width?
             if (d->handleNdx == 1) {
diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui
index 056cd852..c29e4a46 100644
--- a/lib/kofficecore/koDetailsPaneBase.ui
+++ b/lib/kofficecore/koDetailsPaneBase.ui
@@ -228,8 +228,8 @@
     <tabstop>m_alwaysUseCheckBox</tabstop>
     <tabstop>m_detailsLabel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>ktextbrowser.h</includehint>
diff --git a/lib/kofficecore/koDocumentInfoAboutWidget.ui b/lib/kofficecore/koDocumentInfoAboutWidget.ui
index 2581cf07..cf65eb81 100644
--- a/lib/kofficecore/koDocumentInfoAboutWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAboutWidget.ui
@@ -339,8 +339,8 @@
     <tabstop>leDocKeywords</tabstop>
     <tabstop>meDocAbstract</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/lib/kofficecore/koDocumentInfoAuthorWidget.ui b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
index cb3a6ce0..60353b91 100644
--- a/lib/kofficecore/koDocumentInfoAuthorWidget.ui
+++ b/lib/kofficecore/koDocumentInfoAuthorWidget.ui
@@ -289,8 +289,8 @@
     <tabstop>leCountry</tabstop>
     <tabstop>pbLoadKABC</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
index 7edf0a92..2a8a531e 100644
--- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
+++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui
@@ -216,8 +216,8 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui
index 1537cada..a85ecb38 100644
--- a/lib/kofficecore/koOpenPaneBase.ui
+++ b/lib/kofficecore/koOpenPaneBase.ui
@@ -135,8 +135,8 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/lib/kofficecore/tests/kogenstylestest.cpp b/lib/kofficecore/tests/kogenstylestest.cpp
index 1068cdc4..ef9150f6 100644
--- a/lib/kofficecore/tests/kogenstylestest.cpp
+++ b/lib/kofficecore/tests/kogenstylestest.cpp
@@ -68,7 +68,7 @@ int testLookup()
     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
-    assert( third.tqparentName() == secondName );
+    assert( third.parentName() == secondName );
 
     TQString thirdName = coll.lookup( third, "P" );
     kdDebug() << "The third style got assigned the name " << thirdName << endl;
diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp
index aec06fae..5056e416 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -111,7 +111,7 @@ void testNode()
   CHECK( node1.isElement(), false );
   CHECK( node1.isDocument(), false );
   CHECK( node1.ownerDocument().isNull(), false );
-  CHECK( node1.tqparentNode().isNull(), true );
+  CHECK( node1.parentNode().isNull(), true );
   CHECK( node1.hasChildNodes(), false );
   CHECK( node1.firstChild().isNull(), true );
   CHECK( node1.lastChild().isNull(), true );
@@ -257,8 +257,8 @@ void testElement()
   CHECK( rootElement.isDocument(), false );
   CHECK( rootElement.ownerDocument().isNull(), false );
   CHECK( rootElement.ownerDocument()==doc, true );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
   CHECK( rootElement.hasChildNodes(), true );
   CHECK( rootElement.tagName(), TQString("html") );
   CHECK( rootElement.prefix().isNull(), true );
@@ -272,8 +272,8 @@ void testElement()
   CHECK( bodyElement.isDocument(), false );
   CHECK( bodyElement.ownerDocument().isNull(), false );
   CHECK( bodyElement.ownerDocument()==doc, true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==rootElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==rootElement, true );
   CHECK( bodyElement.hasChildNodes(), true );
   CHECK( bodyElement.tagName(), TQString("body") );
   CHECK( bodyElement.prefix().isNull(), true );
@@ -307,7 +307,7 @@ void testElement()
   CHECK( testElement.ownerDocument()!=doc, true );
   CHECK( testElement==rootElement, false );
   CHECK( testElement!=rootElement, true );
-  CHECK( testElement.tqparentNode().isNull(), true );
+  CHECK( testElement.parentNode().isNull(), true );
   CHECK( testElement.hasChildNodes(), false );
 
   // check assignment operator
@@ -318,8 +318,8 @@ void testElement()
   CHECK( testElement.isDocument(), false );
   CHECK( testElement==rootElement, true );
   CHECK( testElement!=rootElement, false );
-  CHECK( testElement.tqparentNode().isNull(), false );
-  CHECK( testElement.tqparentNode().toDocument()==doc, true );
+  CHECK( testElement.parentNode().isNull(), false );
+  CHECK( testElement.parentNode().toDocument()==doc, true );
   CHECK( testElement.tagName(), TQString("html") );
   CHECK( testElement.prefix().isNull(), true );
 
@@ -336,7 +336,7 @@ void testElement()
   CHECK( testElement.ownerDocument().isNull(), false );
   CHECK( testElement.ownerDocument()==doc, true );
   CHECK( testElement==bodyElement, true );
-  CHECK( testElement.tqparentNode().isNull(), false );
+  CHECK( testElement.parentNode().isNull(), false );
   CHECK( testElement.tagName(), TQString("body") );
   CHECK( testElement.prefix().isNull(), true );
   CHECK( testElement.hasChildNodes(), true );
@@ -349,7 +349,7 @@ void testElement()
   CHECK( dummyElement.ownerDocument().isNull(), false );
   CHECK( dummyElement.ownerDocument()==doc, true );
   CHECK( dummyElement==rootElement, true );
-  CHECK( dummyElement.tqparentNode().isNull(), false );
+  CHECK( dummyElement.parentNode().isNull(), false );
   CHECK( dummyElement.hasChildNodes(), true );
   CHECK( dummyElement.tagName(), TQString("html") );
   CHECK( dummyElement.prefix().isNull(), true );
@@ -400,8 +400,8 @@ void testAttributes()
   rootElement = doc.documentElement();
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
   CHECK( rootElement.tagName(), TQString("p") );
   CHECK( rootElement.prefix().isNull(), true );
 
@@ -456,8 +456,8 @@ void testText()
   CHECK( parElement.isDocument(), false );
   CHECK( parElement.ownerDocument().isNull(), false );
   CHECK( parElement.ownerDocument()==doc, true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode().toDocument()==doc, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode().toDocument()==doc, true );
   CHECK( parElement.hasChildNodes(), true );
   CHECK( parElement.tagName(), TQString("p") );
   CHECK( parElement.prefix().isNull(), true );
@@ -500,7 +500,7 @@ void testText()
   CHECK( boldElement.isDocument(), false );
   CHECK( boldElement.ownerDocument().isNull(), false );
   CHECK( boldElement.ownerDocument()==doc, true );
-  CHECK( boldElement.tqparentNode().isNull(), false );
+  CHECK( boldElement.parentNode().isNull(), false );
   CHECK( boldElement.hasChildNodes(), true );
   CHECK( boldElement.tagName(), TQString("b") );
   CHECK( boldElement.prefix().isNull(), true );
@@ -545,8 +545,8 @@ void testCDATA()
   CHECK( parElement.isDocument(), false );
   CHECK( parElement.ownerDocument().isNull(), false );
   CHECK( parElement.ownerDocument()==doc, true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode().toDocument()==doc, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode().toDocument()==doc, true );
   CHECK( parElement.hasChildNodes(), true );
   CHECK( parElement.tagName(), TQString("p") );
   CHECK( parElement.prefix().isNull(), true );
@@ -616,7 +616,7 @@ void testDocument()
   CHECK( doc.isNull(), false );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
   CHECK( doc.firstChild().isNull(), true );
   CHECK( doc.lastChild().isNull(), true );
   CHECK( doc.previousSibling().isNull(), true );
@@ -633,7 +633,7 @@ void testDocument()
   CHECK( doc.isNull(), false );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
   CHECK( doc.firstChild().isNull(), false );
   CHECK( doc.lastChild().isNull(), false );
   CHECK( doc.previousSibling().isNull(), true );
@@ -645,14 +645,14 @@ void testDocument()
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
   CHECK( rootElement.isDocument(), false );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
   rootElement = doc.lastChild().toElement();
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
   CHECK( rootElement.isDocument(), false );
-  CHECK( rootElement.tqparentNode().isNull(), false );
-  CHECK( rootElement.tqparentNode().toDocument()==doc, true );
+  CHECK( rootElement.parentNode().isNull(), false );
+  CHECK( rootElement.parentNode().toDocument()==doc, true );
 
   // clear() converts it into null node
   doc.clear();
@@ -660,7 +660,7 @@ void testDocument()
   CHECK( doc.isNull(), true );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
   CHECK( doc.firstChild().isNull(), true );
   CHECK( doc.lastChild().isNull(), true );
   CHECK( doc.previousSibling().isNull(), true );
@@ -672,7 +672,7 @@ void testDocument()
   CHECK( doc.isNull(), false );
   CHECK( doc.isElement(), false );
   CHECK( doc.isDocument(), true );
-  CHECK( doc.tqparentNode().isNull(), true );
+  CHECK( doc.parentNode().isNull(), true );
 }
 
 void testNamespace()
@@ -877,7 +877,7 @@ void testUnload()
   earthElement = doc.documentElement().toElement();
   CHECK( earthElement.isNull(), false );
   CHECK( earthElement.isElement(), true );
-  CHECK( earthElement.tqparentNode().isNull(), false );
+  CHECK( earthElement.parentNode().isNull(), false );
   CHECK( earthElement.hasChildNodes(), true );
   CHECK( earthElement.tagName(), TQString("earth") );
   CHECK( earthElement.prefix().isNull(), true );
@@ -941,7 +941,7 @@ void testSimpleXML()
   rootElement = doc.documentElement();
   CHECK( rootElement.isNull(), false );
   CHECK( rootElement.isElement(), true );
-  CHECK( rootElement.tqparentNode().isNull(), false );
+  CHECK( rootElement.parentNode().isNull(), false );
   CHECK( rootElement.hasChildNodes(), true );
   CHECK( rootElement.tagName(), TQString("solarsystem") );
   CHECK( rootElement.prefix().isNull(), true );
@@ -953,9 +953,9 @@ void testSimpleXML()
   CHECK( firstPlanetNode.isElement(), true );
   CHECK( firstPlanetNode.nextSibling().isNull(), false );
   CHECK( firstPlanetNode.previousSibling().isNull(), true );
-  CHECK( firstPlanetNode.tqparentNode().isNull(), false );
-  CHECK( firstPlanetNode.tqparentNode()==rootElement, true );
-  CHECK( firstPlanetNode.tqparentNode()!=rootElement, false );
+  CHECK( firstPlanetNode.parentNode().isNull(), false );
+  CHECK( firstPlanetNode.parentNode()==rootElement, true );
+  CHECK( firstPlanetNode.parentNode()!=rootElement, false );
   CHECK( firstPlanetNode.hasChildNodes(), false );
   CHECK( firstPlanetNode.firstChild().isNull(), true );
   CHECK( firstPlanetNode.lastChild().isNull(), true );
@@ -965,8 +965,8 @@ void testSimpleXML()
   firstPlanetElement = firstPlanetNode.toElement();
   CHECK( firstPlanetElement.isNull(), false );
   CHECK( firstPlanetElement.isElement(), true );
-  CHECK( firstPlanetElement.tqparentNode().isNull(), false );
-  CHECK( firstPlanetElement.tqparentNode()==rootElement, true );
+  CHECK( firstPlanetElement.parentNode().isNull(), false );
+  CHECK( firstPlanetElement.parentNode()==rootElement, true );
   CHECK( firstPlanetElement.hasChildNodes(), false );
   CHECK( firstPlanetElement.firstChild().isNull(), true );
   CHECK( firstPlanetElement.lastChild().isNull(), true );
@@ -982,9 +982,9 @@ void testSimpleXML()
   CHECK( secondPlanetNode.previousSibling().isNull(), false );
   CHECK( secondPlanetNode.previousSibling()==firstPlanetNode, true );
   CHECK( secondPlanetNode.previousSibling()==firstPlanetElement, true );
-  CHECK( secondPlanetNode.tqparentNode().isNull(), false );
-  CHECK( secondPlanetNode.tqparentNode()==rootElement, true );
-  CHECK( secondPlanetNode.tqparentNode()!=rootElement, false );
+  CHECK( secondPlanetNode.parentNode().isNull(), false );
+  CHECK( secondPlanetNode.parentNode()==rootElement, true );
+  CHECK( secondPlanetNode.parentNode()!=rootElement, false );
   CHECK( secondPlanetNode.hasChildNodes(), false );
   CHECK( secondPlanetNode.firstChild().isNull(), true );
   CHECK( secondPlanetNode.lastChild().isNull(), true );
@@ -998,9 +998,9 @@ void testSimpleXML()
   CHECK( secondPlanetElement.previousSibling().isNull(), false );
   CHECK( secondPlanetElement.previousSibling()==firstPlanetNode, true );
   CHECK( secondPlanetElement.previousSibling()==firstPlanetElement, true );
-  CHECK( secondPlanetElement.tqparentNode().isNull(), false );
-  CHECK( secondPlanetElement.tqparentNode()==rootElement, true );
-  CHECK( secondPlanetElement.tqparentNode()!=rootElement, false );
+  CHECK( secondPlanetElement.parentNode().isNull(), false );
+  CHECK( secondPlanetElement.parentNode()==rootElement, true );
+  CHECK( secondPlanetElement.parentNode()!=rootElement, false );
   CHECK( secondPlanetElement.hasChildNodes(), false );
   CHECK( secondPlanetElement.firstChild().isNull(), true );
   CHECK( secondPlanetElement.lastChild().isNull(), true );
@@ -1088,8 +1088,8 @@ void testSimpleOpenDocumentText()
   contentElement = doc.documentElement();
   CHECK( contentElement.isNull(), false );
   CHECK( contentElement.isElement(), true );
-  CHECK( contentElement.tqparentNode().isNull(), false );
-  CHECK( contentElement.tqparentNode().toDocument()==doc, true );
+  CHECK( contentElement.parentNode().isNull(), false );
+  CHECK( contentElement.parentNode().toDocument()==doc, true );
   CHECK( contentElement.firstChild().isNull(), false );
   CHECK( contentElement.lastChild().isNull(), false );
   CHECK( contentElement.previousSibling().isNull(), false );
@@ -1103,8 +1103,8 @@ void testSimpleOpenDocumentText()
   stylesElement = KoXml::namedItemNS( contentElement, officeNS, "automatic-styles" );
   CHECK( stylesElement.isNull(), false );
   CHECK( stylesElement.isElement(), true );
-  CHECK( stylesElement.tqparentNode().isNull(), false );
-  CHECK( stylesElement.tqparentNode()==contentElement, true );
+  CHECK( stylesElement.parentNode().isNull(), false );
+  CHECK( stylesElement.parentNode()==contentElement, true );
   CHECK( stylesElement.firstChild().isNull(), true );
   CHECK( stylesElement.lastChild().isNull(), true );
   CHECK( stylesElement.previousSibling().isNull(), true );
@@ -1116,8 +1116,8 @@ void testSimpleOpenDocumentText()
   styles2Element = contentElement.firstChild().toElement();
   CHECK( styles2Element.isNull(), false );
   CHECK( styles2Element.isElement(), true );
-  CHECK( styles2Element.tqparentNode().isNull(), false );
-  CHECK( styles2Element.tqparentNode()==contentElement, true );
+  CHECK( styles2Element.parentNode().isNull(), false );
+  CHECK( styles2Element.parentNode()==contentElement, true );
   CHECK( styles2Element.firstChild().isNull(), true );
   CHECK( styles2Element.lastChild().isNull(), true );
   CHECK( styles2Element.previousSibling().isNull(), true );
@@ -1129,8 +1129,8 @@ void testSimpleOpenDocumentText()
   bodyElement = KoXml::namedItemNS( contentElement, officeNS, "body" );
   CHECK( bodyElement.isNull(), false );
   CHECK( bodyElement.isElement(), true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==contentElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==contentElement, true );
   CHECK( bodyElement.firstChild().isNull(), false );
   CHECK( bodyElement.lastChild().isNull(), false );
   CHECK( bodyElement.previousSibling().isNull(), false );
@@ -1142,8 +1142,8 @@ void testSimpleOpenDocumentText()
   body2Element = stylesElement.nextSibling().toElement();
   CHECK( body2Element.isNull(), false );
   CHECK( body2Element.isElement(), true );
-  CHECK( body2Element.tqparentNode().isNull(), false );
-  CHECK( body2Element.tqparentNode()==contentElement, true );
+  CHECK( body2Element.parentNode().isNull(), false );
+  CHECK( body2Element.parentNode()==contentElement, true );
   CHECK( body2Element.firstChild().isNull(), false );
   CHECK( body2Element.lastChild().isNull(), false );
   CHECK( body2Element.previousSibling().isNull(), false );
@@ -1155,8 +1155,8 @@ void testSimpleOpenDocumentText()
   textElement = KoXml::namedItemNS( bodyElement, officeNS, "text" );
   CHECK( textElement.isNull(), false );
   CHECK( textElement.isElement(), true );
-  CHECK( textElement.tqparentNode().isNull(), false );
-  CHECK( textElement.tqparentNode()==bodyElement, true );
+  CHECK( textElement.parentNode().isNull(), false );
+  CHECK( textElement.parentNode()==bodyElement, true );
   CHECK( textElement.firstChild().isNull(), false );
   CHECK( textElement.lastChild().isNull(), false );
   CHECK( textElement.previousSibling().isNull(), true );
@@ -1168,8 +1168,8 @@ void testSimpleOpenDocumentText()
   text2Element = bodyElement.firstChild().toElement();
   CHECK( text2Element.isNull(), false );
   CHECK( text2Element.isElement(), true );
-  CHECK( text2Element.tqparentNode().isNull(), false );
-  CHECK( text2Element.tqparentNode()==bodyElement, true );
+  CHECK( text2Element.parentNode().isNull(), false );
+  CHECK( text2Element.parentNode()==bodyElement, true );
   CHECK( text2Element.firstChild().isNull(), false );
   CHECK( text2Element.lastChild().isNull(), false );
   CHECK( text2Element.previousSibling().isNull(), true );
@@ -1181,8 +1181,8 @@ void testSimpleOpenDocumentText()
   parElement = textElement.firstChild().toElement();
   CHECK( parElement.isNull(), false );
   CHECK( parElement.isElement(), true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode()==textElement, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode()==textElement, true );
   CHECK( parElement.firstChild().isNull(), false );
   CHECK( parElement.lastChild().isNull(), false );
   CHECK( parElement.previousSibling().isNull(), true );
@@ -1253,8 +1253,8 @@ void testSimpleOpenDocumentSpreadsheet()
   contentElement = doc.documentElement();
   CHECK( contentElement.isNull(), false );
   CHECK( contentElement.isElement(), true );
-  CHECK( contentElement.tqparentNode().isNull(), false );
-  CHECK( contentElement.tqparentNode().toDocument()==doc, true );
+  CHECK( contentElement.parentNode().isNull(), false );
+  CHECK( contentElement.parentNode().toDocument()==doc, true );
   CHECK( contentElement.firstChild().isNull(), false );
   CHECK( contentElement.lastChild().isNull(), false );
   CHECK( contentElement.previousSibling().isNull(), false );
@@ -1266,8 +1266,8 @@ void testSimpleOpenDocumentSpreadsheet()
   bodyElement = contentElement.firstChild().toElement();
   CHECK( bodyElement.isNull(), false );
   CHECK( bodyElement.isElement(), true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==contentElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==contentElement, true );
   CHECK( bodyElement.firstChild().isNull(), false );
   CHECK( bodyElement.lastChild().isNull(), false );
   CHECK( bodyElement.previousSibling().isNull(), true );
@@ -1279,8 +1279,8 @@ void testSimpleOpenDocumentSpreadsheet()
   spreadsheetElement = bodyElement.firstChild().toElement();
   CHECK( spreadsheetElement.isNull(), false );
   CHECK( spreadsheetElement.isElement(), true );
-  CHECK( spreadsheetElement.tqparentNode().isNull(), false );
-  CHECK( spreadsheetElement.tqparentNode()==bodyElement, true );
+  CHECK( spreadsheetElement.parentNode().isNull(), false );
+  CHECK( spreadsheetElement.parentNode()==bodyElement, true );
   CHECK( spreadsheetElement.firstChild().isNull(), false );
   CHECK( spreadsheetElement.lastChild().isNull(), false );
   CHECK( spreadsheetElement.previousSibling().isNull(), true );
@@ -1292,8 +1292,8 @@ void testSimpleOpenDocumentSpreadsheet()
   sheet1Element = spreadsheetElement.firstChild().toElement();
   CHECK( sheet1Element.isNull(), false );
   CHECK( sheet1Element.isElement(), true );
-  CHECK( sheet1Element.tqparentNode().isNull(), false );
-  CHECK( sheet1Element.tqparentNode()==spreadsheetElement, true );
+  CHECK( sheet1Element.parentNode().isNull(), false );
+  CHECK( sheet1Element.parentNode()==spreadsheetElement, true );
   CHECK( sheet1Element.firstChild().isNull(), false );
   CHECK( sheet1Element.lastChild().isNull(), false );
   CHECK( sheet1Element.previousSibling().isNull(), true );
@@ -1311,8 +1311,8 @@ void testSimpleOpenDocumentSpreadsheet()
   columnElement = sheet1Element.firstChild().toElement();
   CHECK( columnElement.isNull(), false );
   CHECK( columnElement.isElement(), true );
-  CHECK( columnElement.tqparentNode().isNull(), false );
-  CHECK( columnElement.tqparentNode()==sheet1Element, true );
+  CHECK( columnElement.parentNode().isNull(), false );
+  CHECK( columnElement.parentNode()==sheet1Element, true );
   CHECK( columnElement.firstChild().isNull(), true );
   CHECK( columnElement.lastChild().isNull(), true );
   CHECK( columnElement.previousSibling().isNull(), true );
@@ -1326,8 +1326,8 @@ void testSimpleOpenDocumentSpreadsheet()
   rowElement = columnElement.nextSibling().toElement();
   CHECK( rowElement.isNull(), false );
   CHECK( rowElement.isElement(), true );
-  CHECK( rowElement.tqparentNode().isNull(), false );
-  CHECK( rowElement.tqparentNode()==sheet1Element, true );
+  CHECK( rowElement.parentNode().isNull(), false );
+  CHECK( rowElement.parentNode()==sheet1Element, true );
   CHECK( rowElement.firstChild().isNull(), false );
   CHECK( rowElement.lastChild().isNull(), false );
   CHECK( rowElement.previousSibling().isNull(), false );
@@ -1340,8 +1340,8 @@ void testSimpleOpenDocumentSpreadsheet()
   cellElement = rowElement.firstChild().toElement();
   CHECK( cellElement.isNull(), false );
   CHECK( cellElement.isElement(), true );
-  CHECK( cellElement.tqparentNode().isNull(), false );
-  CHECK( cellElement.tqparentNode()==rowElement, true );
+  CHECK( cellElement.parentNode().isNull(), false );
+  CHECK( cellElement.parentNode()==rowElement, true );
   CHECK( cellElement.firstChild().isNull(), false );
   CHECK( cellElement.lastChild().isNull(), false );
   CHECK( cellElement.previousSibling().isNull(), true );
@@ -1354,8 +1354,8 @@ void testSimpleOpenDocumentSpreadsheet()
   parElement = cellElement.firstChild().toElement();
   CHECK( parElement.isNull(), false );
   CHECK( parElement.isElement(), true );
-  CHECK( parElement.tqparentNode().isNull(), false );
-  CHECK( parElement.tqparentNode()==cellElement, true );
+  CHECK( parElement.parentNode().isNull(), false );
+  CHECK( parElement.parentNode()==cellElement, true );
   CHECK( parElement.firstChild().isNull(), false );
   CHECK( parElement.lastChild().isNull(), false );
   CHECK( parElement.previousSibling().isNull(), true );
@@ -1368,8 +1368,8 @@ void testSimpleOpenDocumentSpreadsheet()
   sheet2Element = sheet1Element.nextSibling().toElement();
   CHECK( sheet2Element.isNull(), false );
   CHECK( sheet2Element.isElement(), true );
-  CHECK( sheet2Element.tqparentNode().isNull(), false );
-  CHECK( sheet2Element.tqparentNode()==spreadsheetElement, true );
+  CHECK( sheet2Element.parentNode().isNull(), false );
+  CHECK( sheet2Element.parentNode()==spreadsheetElement, true );
   CHECK( sheet2Element.firstChild().isNull(), false );
   CHECK( sheet2Element.lastChild().isNull(), false );
   CHECK( sheet2Element.previousSibling().isNull(), false );
@@ -1381,8 +1381,8 @@ void testSimpleOpenDocumentSpreadsheet()
   sheet3Element = sheet2Element.nextSibling().toElement();
   CHECK( sheet3Element.isNull(), false );
   CHECK( sheet3Element.isElement(), true );
-  CHECK( sheet3Element.tqparentNode().isNull(), false );
-  CHECK( sheet3Element.tqparentNode()==spreadsheetElement, true );
+  CHECK( sheet3Element.parentNode().isNull(), false );
+  CHECK( sheet3Element.parentNode()==spreadsheetElement, true );
   CHECK( sheet3Element.firstChild().isNull(), false );
   CHECK( sheet3Element.lastChild().isNull(), false );
   CHECK( sheet3Element.previousSibling().isNull(), false );
@@ -1469,8 +1469,8 @@ void testSimpleOpenDocumentPresentation()
   CHECK( contentElement.isNull(), false );
   
   CHECK( contentElement.isElement(), true );
-  CHECK( contentElement.tqparentNode().isNull(), false );
-  CHECK( contentElement.tqparentNode().toDocument()==doc, true );
+  CHECK( contentElement.parentNode().isNull(), false );
+  CHECK( contentElement.parentNode().toDocument()==doc, true );
   CHECK( contentElement.firstChild().isNull(), false );
   CHECK( contentElement.lastChild().isNull(), false );
   CHECK( contentElement.previousSibling().isNull(), false );
@@ -1485,8 +1485,8 @@ void testSimpleOpenDocumentPresentation()
   scriptsElement = KoXml::namedItemNS( contentElement, officeNS, "scripts" );
   CHECK( scriptsElement.isNull(), false );
   CHECK( scriptsElement.isElement(), true );
-  CHECK( scriptsElement.tqparentNode().isNull(), false );
-  CHECK( scriptsElement.tqparentNode()==contentElement, true );
+  CHECK( scriptsElement.parentNode().isNull(), false );
+  CHECK( scriptsElement.parentNode()==contentElement, true );
   CHECK( scriptsElement.firstChild().isNull(), true );
   CHECK( scriptsElement.lastChild().isNull(), true );
   CHECK( scriptsElement.previousSibling().isNull(), true );
@@ -1498,8 +1498,8 @@ void testSimpleOpenDocumentPresentation()
   stylesElement = KoXml::namedItemNS( contentElement, officeNS, "automatic-styles" );
   CHECK( stylesElement.isNull(), false );
   CHECK( stylesElement.isElement(), true );
-  CHECK( stylesElement.tqparentNode().isNull(), false );
-  CHECK( stylesElement.tqparentNode()==contentElement, true );
+  CHECK( stylesElement.parentNode().isNull(), false );
+  CHECK( stylesElement.parentNode()==contentElement, true );
   CHECK( stylesElement.firstChild().isNull(), true );
   CHECK( stylesElement.lastChild().isNull(), true );
   CHECK( stylesElement.previousSibling().isNull(), false );
@@ -1511,8 +1511,8 @@ void testSimpleOpenDocumentPresentation()
   styles2Element = scriptsElement.nextSibling().toElement();
   CHECK( styles2Element.isNull(), false );
   CHECK( styles2Element.isElement(), true );
-  CHECK( styles2Element.tqparentNode().isNull(), false );
-  CHECK( styles2Element.tqparentNode()==contentElement, true );
+  CHECK( styles2Element.parentNode().isNull(), false );
+  CHECK( styles2Element.parentNode()==contentElement, true );
   CHECK( styles2Element.firstChild().isNull(), true );
   CHECK( styles2Element.lastChild().isNull(), true );
   CHECK( styles2Element.previousSibling().isNull(), false );
@@ -1524,8 +1524,8 @@ void testSimpleOpenDocumentPresentation()
   bodyElement = KoXml::namedItemNS( contentElement, officeNS, "body" );
   CHECK( bodyElement.isNull(), false );
   CHECK( bodyElement.isElement(), true );
-  CHECK( bodyElement.tqparentNode().isNull(), false );
-  CHECK( bodyElement.tqparentNode()==contentElement, true );
+  CHECK( bodyElement.parentNode().isNull(), false );
+  CHECK( bodyElement.parentNode()==contentElement, true );
   CHECK( bodyElement.firstChild().isNull(), false );
   CHECK( bodyElement.lastChild().isNull(), false );
   CHECK( bodyElement.previousSibling().isNull(), false );
@@ -1537,8 +1537,8 @@ void testSimpleOpenDocumentPresentation()
   body2Element = stylesElement.nextSibling().toElement();
   CHECK( body2Element.isNull(), false );
   CHECK( body2Element.isElement(), true );
-  CHECK( body2Element.tqparentNode().isNull(), false );
-  CHECK( body2Element.tqparentNode()==contentElement, true );
+  CHECK( body2Element.parentNode().isNull(), false );
+  CHECK( body2Element.parentNode()==contentElement, true );
   CHECK( body2Element.firstChild().isNull(), false );
   CHECK( body2Element.lastChild().isNull(), false );
   CHECK( body2Element.previousSibling().isNull(), false );
@@ -1550,8 +1550,8 @@ void testSimpleOpenDocumentPresentation()
   presentationElement = KoXml::namedItemNS( bodyElement, officeNS, "presentation" );
   CHECK( presentationElement.isNull(), false );
   CHECK( presentationElement.isElement(), true );
-  CHECK( presentationElement.tqparentNode().isNull(), false );
-  CHECK( presentationElement.tqparentNode()==bodyElement, true );
+  CHECK( presentationElement.parentNode().isNull(), false );
+  CHECK( presentationElement.parentNode()==bodyElement, true );
   CHECK( presentationElement.firstChild().isNull(), false );
   CHECK( presentationElement.lastChild().isNull(), false );
   CHECK( presentationElement.previousSibling().isNull(), true );
@@ -1563,8 +1563,8 @@ void testSimpleOpenDocumentPresentation()
   presentation2Element = bodyElement.firstChild().toElement();
   CHECK( presentation2Element.isNull(), false );
   CHECK( presentation2Element.isElement(), true );
-  CHECK( presentation2Element.tqparentNode().isNull(), false );
-  CHECK( presentation2Element.tqparentNode()==bodyElement, true );
+  CHECK( presentation2Element.parentNode().isNull(), false );
+  CHECK( presentation2Element.parentNode()==bodyElement, true );
   CHECK( presentation2Element.firstChild().isNull(), false );
   CHECK( presentation2Element.lastChild().isNull(), false );
   CHECK( presentation2Element.previousSibling().isNull(), true );
@@ -1576,8 +1576,8 @@ void testSimpleOpenDocumentPresentation()
   titlePageElement = presentationElement.firstChild().toElement();
   CHECK( titlePageElement.isNull(), false );
   CHECK( titlePageElement.isElement(), true );
-  CHECK( titlePageElement.tqparentNode().isNull(), false );
-  CHECK( titlePageElement.tqparentNode()==presentationElement, true );
+  CHECK( titlePageElement.parentNode().isNull(), false );
+  CHECK( titlePageElement.parentNode()==presentationElement, true );
   CHECK( titlePageElement.firstChild().isNull(), false );
   CHECK( titlePageElement.lastChild().isNull(), false );
   CHECK( titlePageElement.previousSibling().isNull(), true );
@@ -1594,8 +1594,8 @@ void testSimpleOpenDocumentPresentation()
   titleFrameElement = titlePageElement.firstChild().toElement();
   CHECK( titleFrameElement.isNull(), false );
   CHECK( titleFrameElement.isElement(), true );
-  CHECK( titleFrameElement.tqparentNode().isNull(), false );
-  CHECK( titleFrameElement.tqparentNode()==titlePageElement, true );
+  CHECK( titleFrameElement.parentNode().isNull(), false );
+  CHECK( titleFrameElement.parentNode()==titlePageElement, true );
   CHECK( titleFrameElement.firstChild().isNull(), false );
   CHECK( titleFrameElement.lastChild().isNull(), false );
   CHECK( titleFrameElement.previousSibling().isNull(), true );
@@ -1616,8 +1616,8 @@ void testSimpleOpenDocumentPresentation()
   titleBoxElement = titleFrameElement.firstChild().toElement();
   CHECK( titleBoxElement.isNull(), false );
   CHECK( titleBoxElement.isElement(), true );
-  CHECK( titleBoxElement.tqparentNode().isNull(), false );
-  CHECK( titleBoxElement.tqparentNode()==titleFrameElement, true );
+  CHECK( titleBoxElement.parentNode().isNull(), false );
+  CHECK( titleBoxElement.parentNode()==titleFrameElement, true );
   CHECK( titleBoxElement.firstChild().isNull(), false );
   CHECK( titleBoxElement.lastChild().isNull(), false );
   CHECK( titleBoxElement.previousSibling().isNull(), true );
@@ -1629,8 +1629,8 @@ void testSimpleOpenDocumentPresentation()
   titleParElement = titleBoxElement.firstChild().toElement();
   CHECK( titleParElement.isNull(), false );
   CHECK( titleParElement.isElement(), true );
-  CHECK( titleParElement.tqparentNode().isNull(), false );
-  CHECK( titleParElement.tqparentNode()==titleBoxElement, true );
+  CHECK( titleParElement.parentNode().isNull(), false );
+  CHECK( titleParElement.parentNode()==titleBoxElement, true );
   CHECK( titleParElement.firstChild().isNull(), false );
   CHECK( titleParElement.lastChild().isNull(), false );
   CHECK( titleParElement.previousSibling().isNull(), true );
@@ -1644,8 +1644,8 @@ void testSimpleOpenDocumentPresentation()
   subtitleFrameElement = titleFrameElement.nextSibling().toElement();
   CHECK( subtitleFrameElement.isNull(), false );
   CHECK( subtitleFrameElement.isElement(), true );
-  CHECK( subtitleFrameElement.tqparentNode().isNull(), false );
-  CHECK( subtitleFrameElement.tqparentNode()==titlePageElement, true );
+  CHECK( subtitleFrameElement.parentNode().isNull(), false );
+  CHECK( subtitleFrameElement.parentNode()==titlePageElement, true );
   CHECK( subtitleFrameElement.firstChild().isNull(), false );
   CHECK( subtitleFrameElement.lastChild().isNull(), false );
   CHECK( subtitleFrameElement.previousSibling().isNull(), false );
@@ -1666,8 +1666,8 @@ void testSimpleOpenDocumentPresentation()
   subtitleBoxElement = subtitleFrameElement.firstChild().toElement();
   CHECK( subtitleBoxElement.isNull(), false );
   CHECK( subtitleBoxElement.isElement(), true );
-  CHECK( subtitleBoxElement.tqparentNode().isNull(), false );
-  CHECK( subtitleBoxElement.tqparentNode()==subtitleFrameElement, true );
+  CHECK( subtitleBoxElement.parentNode().isNull(), false );
+  CHECK( subtitleBoxElement.parentNode()==subtitleFrameElement, true );
   CHECK( subtitleBoxElement.firstChild().isNull(), false );
   CHECK( subtitleBoxElement.lastChild().isNull(), false );
   CHECK( subtitleBoxElement.previousSibling().isNull(), true );
@@ -1679,8 +1679,8 @@ void testSimpleOpenDocumentPresentation()
   subtitleParElement = subtitleBoxElement.firstChild().toElement();
   CHECK( subtitleParElement.isNull(), false );
   CHECK( subtitleParElement.isElement(), true );
-  CHECK( subtitleParElement.tqparentNode().isNull(), false );
-  CHECK( subtitleParElement.tqparentNode()==subtitleBoxElement, true );
+  CHECK( subtitleParElement.parentNode().isNull(), false );
+  CHECK( subtitleParElement.parentNode()==subtitleBoxElement, true );
   CHECK( subtitleParElement.firstChild().isNull(), false );
   CHECK( subtitleParElement.lastChild().isNull(), false );
   CHECK( subtitleParElement.previousSibling().isNull(), true );
@@ -1731,8 +1731,8 @@ void testSimpleOpenDocumentFormula()
   mathElement = doc.documentElement();
   CHECK( mathElement.isNull(), false );
   CHECK( mathElement.isElement(), true );
-  CHECK( mathElement.tqparentNode().isNull(), false );
-  CHECK( mathElement.tqparentNode().toDocument()==doc, true );
+  CHECK( mathElement.parentNode().isNull(), false );
+  CHECK( mathElement.parentNode().toDocument()==doc, true );
   CHECK( mathElement.firstChild().isNull(), false );
   CHECK( mathElement.lastChild().isNull(), false );
   CHECK( mathElement.previousSibling().isNull(), false );
@@ -1744,8 +1744,8 @@ void testSimpleOpenDocumentFormula()
   semanticsElement = KoXml::namedItemNS( mathElement, mathNS, "semantics" );
   CHECK( semanticsElement.isNull(), false );
   CHECK( semanticsElement.isElement(), true );
-  CHECK( semanticsElement.tqparentNode().isNull(), false );
-  CHECK( semanticsElement.tqparentNode().toElement()==mathElement, true );
+  CHECK( semanticsElement.parentNode().isNull(), false );
+  CHECK( semanticsElement.parentNode().toElement()==mathElement, true );
   CHECK( semanticsElement.firstChild().isNull(), false );
   CHECK( semanticsElement.lastChild().isNull(), false );
   CHECK( semanticsElement.previousSibling().isNull(), true );
@@ -1757,8 +1757,8 @@ void testSimpleOpenDocumentFormula()
   semantics2Element = mathElement.firstChild().toElement();
   CHECK( semantics2Element.isNull(), false );
   CHECK( semantics2Element.isElement(), true );
-  CHECK( semantics2Element.tqparentNode().isNull(), false );
-  CHECK( semantics2Element.tqparentNode().toElement()==mathElement, true );
+  CHECK( semantics2Element.parentNode().isNull(), false );
+  CHECK( semantics2Element.parentNode().toElement()==mathElement, true );
   CHECK( semantics2Element.firstChild().isNull(), false );
   CHECK( semantics2Element.lastChild().isNull(), false );
   CHECK( semantics2Element.previousSibling().isNull(), true );
@@ -1770,8 +1770,8 @@ void testSimpleOpenDocumentFormula()
   mrowElement = semanticsElement.firstChild().toElement();
   CHECK( mrowElement.isNull(), false );
   CHECK( mrowElement.isElement(), true );
-  CHECK( mrowElement.tqparentNode().isNull(), false );
-  CHECK( mrowElement.tqparentNode().toElement()==semanticsElement, true );
+  CHECK( mrowElement.parentNode().isNull(), false );
+  CHECK( mrowElement.parentNode().toElement()==semanticsElement, true );
   CHECK( mrowElement.firstChild().isNull(), false );
   CHECK( mrowElement.lastChild().isNull(), false );
   CHECK( mrowElement.previousSibling().isNull(), true );
@@ -1783,8 +1783,8 @@ void testSimpleOpenDocumentFormula()
   miElement = mrowElement.firstChild().toElement();
   CHECK( miElement.isNull(), false );
   CHECK( miElement.isElement(), true );
-  CHECK( miElement.tqparentNode().isNull(), false );
-  CHECK( miElement.tqparentNode().toElement()==mrowElement, true );
+  CHECK( miElement.parentNode().isNull(), false );
+  CHECK( miElement.parentNode().toElement()==mrowElement, true );
   CHECK( miElement.firstChild().isNull(), false );
   CHECK( miElement.lastChild().isNull(), false );
   CHECK( miElement.previousSibling().isNull(), true );
@@ -1796,8 +1796,8 @@ void testSimpleOpenDocumentFormula()
   moElement = miElement.nextSibling().toElement();
   CHECK( moElement.isNull(), false );
   CHECK( moElement.isElement(), true );
-  CHECK( moElement.tqparentNode().isNull(), false );
-  CHECK( moElement.tqparentNode().toElement()==mrowElement, true );
+  CHECK( moElement.parentNode().isNull(), false );
+  CHECK( moElement.parentNode().toElement()==mrowElement, true );
   CHECK( moElement.firstChild().isNull(), false );
   CHECK( moElement.lastChild().isNull(), false );
   CHECK( moElement.previousSibling().isNull(), false );
@@ -1810,8 +1810,8 @@ void testSimpleOpenDocumentFormula()
   msupElement = moElement.nextSibling().toElement();
   CHECK( msupElement.isNull(), false );
   CHECK( msupElement.isElement(), true );
-  CHECK( msupElement.tqparentNode().isNull(), false );
-  CHECK( msupElement.tqparentNode().toElement()==mrowElement, true );
+  CHECK( msupElement.parentNode().isNull(), false );
+  CHECK( msupElement.parentNode().toElement()==mrowElement, true );
   CHECK( msupElement.firstChild().isNull(), false );
   CHECK( msupElement.lastChild().isNull(), false );
   CHECK( msupElement.previousSibling().isNull(), false );
@@ -1823,8 +1823,8 @@ void testSimpleOpenDocumentFormula()
   mcElement = msupElement.firstChild().toElement();
   CHECK( mcElement.isNull(), false );
   CHECK( mcElement.isElement(), true );
-  CHECK( mcElement.tqparentNode().isNull(), false );
-  CHECK( mcElement.tqparentNode().toElement()==msupElement, true );
+  CHECK( mcElement.parentNode().isNull(), false );
+  CHECK( mcElement.parentNode().toElement()==msupElement, true );
   CHECK( mcElement.firstChild().isNull(), false );
   CHECK( mcElement.lastChild().isNull(), false );
   CHECK( mcElement.previousSibling().isNull(), true );
@@ -1838,8 +1838,8 @@ void testSimpleOpenDocumentFormula()
   mnElement = mcElement.nextSibling().toElement();
   CHECK( mnElement.isNull(), false );
   CHECK( mnElement.isElement(), true );
-  CHECK( mnElement.tqparentNode().isNull(), false );
-  CHECK( mnElement.tqparentNode().toElement()==msupElement, true );
+  CHECK( mnElement.parentNode().isNull(), false );
+  CHECK( mnElement.parentNode().toElement()==msupElement, true );
   CHECK( mnElement.firstChild().isNull(), false );
   CHECK( mnElement.lastChild().isNull(), false );
   CHECK( mnElement.previousSibling().isNull(), false );
@@ -1852,8 +1852,8 @@ void testSimpleOpenDocumentFormula()
   annotationElement = semanticsElement.lastChild().toElement();
   CHECK( annotationElement.isNull(), false );
   CHECK( annotationElement.isElement(), true );
-  CHECK( annotationElement.tqparentNode().isNull(), false );
-  CHECK( annotationElement.tqparentNode().toElement()==semanticsElement, true );
+  CHECK( annotationElement.parentNode().isNull(), false );
+  CHECK( annotationElement.parentNode().toElement()==semanticsElement, true );
   CHECK( annotationElement.firstChild().isNull(), false );
   CHECK( annotationElement.lastChild().isNull(), false );
   CHECK( annotationElement.previousSibling().isNull(), false );
@@ -1992,8 +1992,8 @@ void testLargeOpenDocumentSpreadsheet()
     // load everything for this table
     KoXml::load( tableElement, 99 );
 
-    CHECK( tableElement.tqparentNode().isNull(), false );
-    CHECK( tableElement.tqparentNode()==spreadsheetElement, true );
+    CHECK( tableElement.parentNode().isNull(), false );
+    CHECK( tableElement.parentNode()==spreadsheetElement, true );
     CHECK( tableElement.firstChild().isNull(), false );
     CHECK( tableElement.lastChild().isNull(), false );
 
@@ -2004,8 +2004,8 @@ void testLargeOpenDocumentSpreadsheet()
       CHECK( rowElement.isNull(), false );
       CHECK( rowElement.isElement(), true );
       CHECK( rowElement.localName(), TQString("table-row") );
-      CHECK( rowElement.tqparentNode().isNull(), false );
-      CHECK( rowElement.tqparentNode()==tableElement, true );
+      CHECK( rowElement.parentNode().isNull(), false );
+      CHECK( rowElement.parentNode()==tableElement, true );
       CHECK( rowElement.firstChild().isNull(), false );
       CHECK( rowElement.lastChild().isNull(), false );
 
@@ -2019,8 +2019,8 @@ void testLargeOpenDocumentSpreadsheet()
         CHECK( cellElement.text(), TQString("Hello, world") );
         CHECK( cellElement.hasAttributeNS(officeNS,"value-type"), true );
         CHECK( cellElement.attributeNS(officeNS,"value-type",""), TQString("string" ) );
-        CHECK( cellElement.tqparentNode().isNull(), false );
-        CHECK( cellElement.tqparentNode()==rowElement, true );
+        CHECK( cellElement.parentNode().isNull(), false );
+        CHECK( cellElement.parentNode()==rowElement, true );
         CHECK( cellElement.firstChild().isNull(), false );
         CHECK( cellElement.lastChild().isNull(), false );
         cellElement = cellElement.nextSibling().toElement();
diff --git a/lib/kofficeui/KoCommandHistory.h b/lib/kofficeui/KoCommandHistory.h
index 08de0e45..34fd1b50 100644
--- a/lib/kofficeui/KoCommandHistory.h
+++ b/lib/kofficeui/KoCommandHistory.h
@@ -85,7 +85,7 @@ public:
 
     /**
      * Erases all the undo/redo history.
-     * Use this when reloading the data, for instance, since this tqinvalidates
+     * Use this when reloading the data, for instance, since this invalidates
      * all the commands.
      */
     void clear();
diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h
index 36c51366..b21eba5b 100644
--- a/lib/kofficeui/KoContextCelp.h
+++ b/lib/kofficeui/KoContextCelp.h
@@ -220,7 +220,7 @@ class KOFFICEUI_EXPORT KoContextHelpAction : public KToggleAction
   TQ_OBJECT
 
 	public:
-		KoContextHelpAction( KActionCollection* tqparentCollection, TQWidget* tqparent = 0 );
+		KoContextHelpAction( KActionCollection* parentCollection, TQWidget* tqparent = 0 );
 		virtual ~KoContextHelpAction();
 
 	public slots:
diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui
index c3191b46..688688c2 100644
--- a/lib/kofficeui/KoGeneralPropertyUi.ui
+++ b/lib/kofficeui/KoGeneralPropertyUi.ui
@@ -189,5 +189,5 @@
         <data format="PNG" length="1008">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b749444154388db59541681d551486bf49aef55c4965061b98815a5e20a5790b912c0d66d12c0381361004219bae0a45041111a92d28086a4110eaa68a8bd8b8a97121348b96b810cca6988281111a9c27446720afcc8516efa94e3b2e665e6244832e3c70b8cce5f2cf77cffc734e50d735830882600818060c3004046d1e14759b8f800a7858d7f5a360207cfe8df34f7627ba679d7367f27e7ea27425168bc71fb896ae24bd936eaddf5a5fa6e213e02ef0c00c48af5dbd76364a7837390e9d4a5b98128c0025d608e0f7f6d97b4eefc8389f8617d66f3a0b7c0894a63d395cf48b33d1d390f5bf40ef65f84ab116fcefe00a212f1441b04760ec38882854a0801c866854015e00aeee1203a6ec97273c0ebd57e02b873d1c926dc0daaab271ab400c68a5880989c785d98588a9698fd0ec872302e83120fa33f150ee7226517c95636dc8b73794e52b0e2a08432119174420ef29bd2de5a3b7338ac598f9451069c4dbb0c0a18170608d05147b58c83660a5159d3d1573720e92c482f1a846acad7a56ae3856967ac4719799d316314a53188681606820ec2b0f08dec3f5af1c5a29b3a762e6cf4094286a72dc8ee5fa9725b30b112fbe148211969772b4bfcf7e01100c88b1c682297145447a3b230c1b5291e68aee7ec2e5f74bb24d47b903e75e4b58bfe1c87e50d2d423b2dfdc03627ce5b146c88b120c241d884641519c8bb8fc564ebae99050989a8e60a4a43b19a295926f8356ff20dcd41804814a0947da8fb29370f99d926cb3b157382224472112c08018412b90bf20ef2306b047001392f61455cbda4ddf908e08f1d1905eafe0d2c59c742322cf14ad94b18e853d5734fedd4f5cd23d0e9d8e50f494b555cffc6244b9a34c9d8c4862b874117a5b05e75fced1fb8e380ee94e425e1c50631010657641d04a59b9e2585b2d39f74ac2e4b4a733e979f5cd84380e71fd022a989a0b199bd8e7e3bf23f6500953d3506cc7ac2cf558fe00d66f38bacf846020cf4a5c5f9bdaa2a4df28e96d4b2842ebe37dc275d92fdb7f5f11607e5188e32e2b9fe7a49b4a7abbd79cae203c1232733ae4bbaf95fcbe43ab88a2bf2b5a03f5ae707a27dd4a331997a821110333739ea9e98434f5e4db8d68d2b17427616c02d2390b5502a624fb1e805f8087401dd4754d100416c3ebcf3d2f17a2a4b194aa3270bdb4af17d37633da9b19c139483794bc505cc155e063e047da46ff18700c780ff889bda9f06ff367e033e034f02c303a201ea2e94a11f054bb5ada86c2c151b7d7f73413e02e50ee8ea620080cf038f0442b7a88ff36f37e6bc57f051e04ffd730fd03ef8bd61b5b2ca6900000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index 016eb767..09bad9d5 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -19,8 +19,8 @@
 
 // Description: Page Layout Dialog (sources)
 
-#ifndef kopagetqlayoutcolumns_h
-#define kopagetqlayoutcolumns_h
+#ifndef kopagelayoutcolumns_h
+#define kopagelayoutcolumns_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/lib/kofficeui/KoPageLayoutColumnsBase.ui b/lib/kofficeui/KoPageLayoutColumnsBase.ui
index 780bc792..325fe45e 100644
--- a/lib/kofficeui/KoPageLayoutColumnsBase.ui
+++ b/lib/kofficeui/KoPageLayoutColumnsBase.ui
@@ -95,5 +95,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutHeader.h b/lib/kofficeui/KoPageLayoutHeader.h
index f1f9664f..da97f34c 100644
--- a/lib/kofficeui/KoPageLayoutHeader.h
+++ b/lib/kofficeui/KoPageLayoutHeader.h
@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutheader_h
-#define kopagetqlayoutheader_h
+#ifndef kopagelayoutheader_h
+#define kopagelayoutheader_h
 
 #include <KoUnit.h>
 #include <KoPageLayout.h>
diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui
index 4488c6f4..b3bd7978 100644
--- a/lib/kofficeui/KoPageLayoutHeaderBase.ui
+++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui
@@ -217,5 +217,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index aa5f23bd..f1f4f358 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef kopagetqlayoutsize_h
-#define kopagetqlayoutsize_h
+#ifndef kopagelayoutsize_h
+#define kopagelayoutsize_h
 
 #include <tqgroupbox.h>
 #include <KoGlobal.h>
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index 002f3ebe..b2e7c94b 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -91,10 +91,10 @@ public:
     bool autoScroll;
 
     // calculate the bounding rectangle for each visible tab
-    void tqlayoutTabs();
+    void layoutTabs();
 
     // reposition scroll buttons
-    void tqlayoutButtons();
+    void layoutButtons();
 
     // find a tab whose bounding rectangle contains the pos
     // return -1 if no such tab is found
@@ -176,7 +176,7 @@ static const char * arrow_right_xpm[] = {
 "          "};
 
 
-void KoTabBarPrivate::tqlayoutTabs()
+void KoTabBarPrivate::layoutTabs()
 {
     tabRects.clear();
 
@@ -308,7 +308,7 @@ void KoTabBarPrivate::drawMoveMarker( TQPainter& painter, int x, int y )
     painter.setBrush( oldBrush );
 }
 
-void KoTabBarPrivate::tqlayoutButtons()
+void KoTabBarPrivate::layoutButtons()
 {
     int bw = tabbar->height();
     int w = tabbar->width();
@@ -375,7 +375,7 @@ KoTabBar::KoTabBar( TQWidget* tqparent, const char* name )
     d->scrollForwardButton = new TQToolButton( this );
     connect( d->scrollForwardButton, TQT_SIGNAL( clicked() ),
       this, TQT_SLOT( scrollForward() ) );
-    d->tqlayoutButtons();
+    d->layoutButtons();
     d->updateButtons();
 }
 
@@ -437,8 +437,8 @@ void KoTabBar::setReverseLayout( bool reverse )
     if( reverse != d->reverseLayout )
     {
         d->reverseLayout = reverse;
-        d->tqlayoutTabs();
-        d->tqlayoutButtons();
+        d->layoutTabs();
+        d->layoutButtons();
         d->updateButtons();
         update();
     }
@@ -505,7 +505,7 @@ void KoTabBar::scrollBack()
     d->firstTab--;
     if( d->firstTab < 1 ) d->firstTab = 1;
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -519,7 +519,7 @@ void KoTabBar::scrollForward()
     if( d->firstTab > (int)d->tabs.count() )
         d->firstTab = d->tabs.count();
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -530,7 +530,7 @@ void KoTabBar::scrollFirst()
         return;
 
     d->firstTab = 1;
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -540,7 +540,7 @@ void KoTabBar::scrollLast()
     if ( !canScrollForward() )
         return;
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
 
     if( !d->reverseLayout )
     {
@@ -561,11 +561,11 @@ void KoTabBar::scrollLast()
             int x = d->tabRects[ d->tabRects.count()-1 ].x();
             if( x > 0 ) break;
             d->firstTab++;
-            d->tqlayoutTabs();
+            d->layoutTabs();
         }
     }
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     update();
 }
@@ -669,7 +669,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
     if( !d->reverseLayout )
         painter.translate( 5, 0 );
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
     d->updateButtons();
     
     // draw first all non-active, visible tabs
@@ -717,7 +717,7 @@ void KoTabBar::paintEvent( TQPaintEvent* )
 
 void KoTabBar::resizeEvent( TQResizeEvent* )
 {
-    d->tqlayoutButtons();
+    d->layoutButtons();
     d->updateButtons();
     update();
 }
@@ -751,7 +751,7 @@ void KoTabBar::mousePressEvent( TQMouseEvent* ev )
         return;
     }
 
-    d->tqlayoutTabs();
+    d->layoutTabs();
 
     TQPoint pos = ev->pos();
     if( !d->reverseLayout ) pos = pos - TQPoint( d->offset,0 );
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index 566a3722..4b5b1b4d 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -309,8 +309,8 @@ void KoColorPanel::mousePressEvent( TQMouseEvent* e )
 
 void KoColorPanel::mouseReleaseEvent( TQMouseEvent* )
 {
-    if ( isVisible() && tqparentWidget() && tqparentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
-        tqparentWidget()->close();
+    if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+        parentWidget()->close();
     emit colorSelected( mapToColor( m_pressedPos ) );
 }
 
@@ -425,8 +425,8 @@ void KoColorPanel::keyPressEvent( TQKeyEvent* e )
             e->ignore();
     }
     else if ( e->key() == TQt::Key_Return ) {
-        if ( isVisible() && tqparentWidget() && tqparentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
-            tqparentWidget()->close();
+        if ( isVisible() && parentWidget() && parentWidget()->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) )
+            parentWidget()->close();
         emit colorSelected( mapToColor( m_focusPosition ) );
     }
     updateFocusPosition( newPos );
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index a0f514e2..2a9b383e 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -246,8 +246,8 @@ int KSelectColorAction::plug( TQWidget* w, int index )
         {
             /* ###### CHECK: We're not allowed to specify the instance in iconSet()
             KInstance *instance;
-            if ( tqparentCollection() )
-                instance = tqparentCollection()->instance();
+            if ( parentCollection() )
+                instance = parentCollection()->instance();
             else
                 instance = KGlobal::instance();
             */
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index e8040496..d3def7c9 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -332,7 +332,7 @@ bool TKToolBarButton::eventFilter(TQObject *o, TQEvent *ev)
       case TQEvent::Hide:
         on(false);
         setDown(false);
-        if ( !tqgeometry().tqcontains(tqparentWidget()->mapFromGlobal(TQCursor::pos())) )
+        if ( !tqgeometry().tqcontains(parentWidget()->mapFromGlobal(TQCursor::pos())) )
           leaveEvent(0L);
         return false;
         break;
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cc
index a7674e4b..46f4d249 100644
--- a/lib/kopainter/koColorSlider.cc
+++ b/lib/kopainter/koColorSlider.cc
@@ -211,7 +211,7 @@ void KoSliderWidget::mouseMoveEvent(TQMouseEvent *e)
 {
   if(mDragging)
   {
-    TQWidget *p = tqparentWidget();
+    TQWidget *p = parentWidget();
 
     if(!p)
       return;
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 880ccc9c..3c0a0940 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -474,9 +474,9 @@ Editor::slotPropertyChanged(Set& set, Property& property)
 		}
 
 /*	if (widget->property() && (TQWidget*)d->currentWidget==widget && d->currentItem->tqparent()) {
-		EditorItem *tqparentItem = static_cast<EditorItem*>(d->currentItem->tqparent());
+		EditorItem *parentItem = static_cast<EditorItem*>(d->currentItem->tqparent());
 		const int thisType = ;
-			&& tqparentItem->property()->type()==Rect) {
+			&& parentItem->property()->type()==Rect) {
 			//changing x or y components of Rect type shouldn't change width or height, respectively
 			if (thisType==Rect_X) {
 				EditorItem *rectWidthItem = static_cast<EditorItem*>(d->currentItem->nextSibling()->nextSibling());
@@ -981,8 +981,8 @@ Editor::handleKeyPress(TQKeyEvent* ev)
 void
 Editor::updateFont()
 {
-	setFont(tqparentWidget()->font());
-	d->baseRowHeight = TQFontMetrics(tqparentWidget()->font()).height() + itemMargin() * 2;
+	setFont(parentWidget()->font());
+	d->baseRowHeight = TQFontMetrics(parentWidget()->font()).height() + itemMargin() * 2;
 	if (!d->currentItem)
 		d->undoButton->resize(d->baseRowHeight, d->baseRowHeight);
 	else {
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 385ec891..ca6fe6c7 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -176,9 +176,9 @@ class GroupWidgetBase : public TQWidget
 class GroupWidget : public GroupWidgetBase
 {
 	public:
-		GroupWidget(EditorGroupItem *tqparentItem)
-		: GroupWidgetBase(tqparentItem->listView()->viewport())
-		, m_parentItem(tqparentItem)
+		GroupWidget(EditorGroupItem *parentItem)
+		: GroupWidgetBase(parentItem->listView()->viewport())
+		, m_parentItem(parentItem)
 		{
 		}
 
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index b90485bb..c72a060d 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -48,7 +48,7 @@ IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntE
 
 void IntSpinBox::setValue(const TQVariant &value)
 {
-	if (dynamic_cast<IntEdit*>(tqparentWidget()) && dynamic_cast<IntEdit*>(tqparentWidget())->isReadOnly())
+	if (dynamic_cast<IntEdit*>(parentWidget()) && dynamic_cast<IntEdit*>(parentWidget())->isReadOnly())
 		return;
 	if (value.isNull())
 		editor()->clear();
@@ -66,13 +66,13 @@ IntSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			TQKeyEvent* ev = TQT_TQKEYEVENT(e);
 			if((ev->key()==Key_Up || ev->key()==Key_Down) && ev->state() !=ControlButton)
 			{
-				tqparentWidget()->eventFilter(o, e);
+				parentWidget()->eventFilter(o, e);
 				return true;
 			}
 		}
 	}
 	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)) 
-		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(tqparentWidget())->isReadOnly())
+		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
 	}
@@ -199,13 +199,13 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
 			TQKeyEvent* ev = TQT_TQKEYEVENT(e);
 			if((ev->key()==Key_Up || ev->key()==Key_Down) && ev->state()!=ControlButton)
 			{
-				tqparentWidget()->eventFilter(o, e);
+				parentWidget()->eventFilter(o, e);
 				return true;
 			}
 		}
 	}
 	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)) 
-		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(tqparentWidget())->isReadOnly())
+		&& e->type() == TQEvent::Wheel && static_cast<IntEdit*>(parentWidget())->isReadOnly())
 	{
 		return true; //avoid value changes for read-only widget
 	}
@@ -216,7 +216,7 @@ DoubleSpinBox::eventFilter(TQObject *o, TQEvent *e)
 
 void DoubleSpinBox::setValue( const TQVariant& value )
 {
-	if (dynamic_cast<DoubleEdit*>(tqparentWidget()) && dynamic_cast<DoubleEdit*>(tqparentWidget())->isReadOnly())
+	if (dynamic_cast<DoubleEdit*>(parentWidget()) && dynamic_cast<DoubleEdit*>(parentWidget())->isReadOnly())
 		return;
 	if (value.isNull())
 		editor()->clear();
diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp
index 1efeb5c0..dd44c2b0 100644
--- a/lib/koproperty/widget.cpp
+++ b/lib/koproperty/widget.cpp
@@ -122,7 +122,7 @@ Widget::eventFilter(TQObject*, TQEvent* e)
 			return true;
 		}
 		else {
-			Editor *list = static_cast<KoProperty::Editor*>(tqparentWidget()->tqparentWidget());
+			Editor *list = static_cast<KoProperty::Editor*>(parentWidget()->parentWidget());
 			if (!list)
 				return false; //for sanity
 			return list->handleKeyPress(ev);
diff --git a/lib/kotext/DESIGN b/lib/kotext/DESIGN
index dcb08ca7..4fd1e479 100644
--- a/lib/kotext/DESIGN
+++ b/lib/kotext/DESIGN
@@ -87,11 +87,11 @@ However font metrics are calculated from the 100%-zoom-level font (e.g. 12pt for
 and _then_ multiplied by 20, instead of loading a 240pt font for that as we did before.
 This is implemented by KoTextFormat::charWidth().
 
-On screen, at 100%, a tqlayoutUnitToFontSize(240,false)=(240/20)*1.0=20.0pt font size will be used.
+On screen, at 100%, a layoutUnitToFontSize(240,false)=(240/20)*1.0=20.0pt font size will be used.
 This does NOT depend on the DPI settings. Qt takes care of pt->pixel conversion for fonts.
 
 When printing... TODO, double-check whether Qt does pt->pixel conversion correctly
-(aptqparently it didn't, in Qt 2).
+(apparently it didn't, in Qt 2).
 
 QFont multiplies by 10 and stores into a 'short'... So for QFont the maximum font size
 is 3276, and in KOffice the maximum font size in points is around 163.
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index d979fc66..bcbdde6b 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -733,11 +733,11 @@ void KFontChooser_local::showXLFDArea(bool show)
 {
   if( show )
   {
-    xlfdEdit->tqparentWidget()->show();
+    xlfdEdit->parentWidget()->show();
   }
   else
   {
-    xlfdEdit->tqparentWidget()->hide();
+    xlfdEdit->parentWidget()->hide();
   }
 }
 
diff --git a/lib/kotext/KoCompletionBase.ui b/lib/kotext/KoCompletionBase.ui
index 97beae8c..12ae9d5d 100644
--- a/lib/kotext/KoCompletionBase.ui
+++ b/lib/kotext/KoCompletionBase.ui
@@ -366,5 +366,5 @@ This option is most important when Automatically add words to completion list is
         <slot>setValue(int)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/lib/kotext/KoComplexText.cpp b/lib/kotext/KoComplexText.cpp
index 41c10239..e3196085 100644
--- a/lib/kotext/KoComplexText.cpp
+++ b/lib/kotext/KoComplexText.cpp
@@ -48,7 +48,7 @@
 
 /* a small helper class used internally to resolve Bidi embedding levels.
    Each line of text caches the embedding level at the start of the line for faster
-   retqlayouting
+   relayouting
 */
 KoBidiContext::KoBidiContext( uchar l, TQChar::Direction e, KoBidiContext *p, bool o )
     : level(l) , override(o), dir(e)
diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp
index 7373ec0e..93f3a21e 100644
--- a/lib/kotext/KoFontDia.cpp
+++ b/lib/kotext/KoFontDia.cpp
@@ -90,12 +90,12 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat,
     connect( decorationTab, TQT_SIGNAL( shadowDirectionChanged( int ) ), this, TQT_SLOT( slotShadowDirectionChanged( int ) ) );
 
     //Layout tab
-    tqlayoutTab = new KoLayoutTab( true, this );
-    fontTabWidget->addTab( tqlayoutTab, i18n( "Layout" ) );
-    connect( tqlayoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );;
-    connect( tqlayoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) );
-    connect( tqlayoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) );
-    connect( tqlayoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) );
+    layoutTab = new KoLayoutTab( true, this );
+    fontTabWidget->addTab( layoutTab, i18n( "Layout" ) );
+    connect( layoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );;
+    connect( layoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) );
+    connect( layoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) );
+    connect( layoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) );
 
     //Language tab
     languageTab = new KoLanguageTab( broker, this );
@@ -123,7 +123,7 @@ void KoFontDia::init()
 KoTextFormat KoFontDia::newFormat() const
 {
     return KoTextFormat( fontTab->getSelection(),
-                         tqlayoutTab->getSubSuperScript(),
+                         layoutTab->getSubSuperScript(),
                          decorationTab->getTextColor(),
                          decorationTab->getBackgroundColor(),
                          highlightingTab->getUnderlineColor(),
@@ -133,10 +133,10 @@ KoTextFormat KoFontDia::newFormat() const
                          highlightingTab->getStrikethroughStyle(),
                          highlightingTab->getCapitalisation(),
                          languageTab->getLanguage(),
-                         tqlayoutTab->getRelativeTextSize(),
-                         tqlayoutTab->getOffsetFromBaseline(),
+                         layoutTab->getRelativeTextSize(),
+                         layoutTab->getOffsetFromBaseline(),
                          highlightingTab->getWordByWord(),
-                         tqlayoutTab->getAutoHyphenation(),
+                         layoutTab->getAutoHyphenation(),
                          decorationTab->getShadowDistanceX(),
                          decorationTab->getShadowDistanceY(),
                          decorationTab->getShadowColor()
@@ -167,8 +167,8 @@ void KoFontDia::slotReset()
     decorationTab->setTextColor( m_initialFormat.color() );
     decorationTab->setBackgroundColor( m_initialFormat.textBackgroundColor() );
     decorationTab->setShadow( m_initialFormat.shadowDistanceX(), m_initialFormat.shadowDistanceY(), m_initialFormat.shadowColor() );
-    tqlayoutTab->setSubSuperScript( m_initialFormat.vAlign(), m_initialFormat.offsetFromBaseLine(), m_initialFormat.relativeTextSize() );
-    tqlayoutTab->setAutoHyphenation( m_initialFormat.hyphenation() );
+    layoutTab->setSubSuperScript( m_initialFormat.vAlign(), m_initialFormat.offsetFromBaseLine(), m_initialFormat.relativeTextSize() );
+    layoutTab->setAutoHyphenation( m_initialFormat.hyphenation() );
     languageTab->setLanguage( m_initialFormat.language() );
 }
 
@@ -276,19 +276,19 @@ void KoFontDia::slotShadowColorChanged( const TQColor & )
 void KoFontDia::slotSubSuperChanged()
 {
     m_changedFlags |= KoTextFormat::VAlign;
-    fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), tqlayoutTab->getOffsetFromBaseline(), tqlayoutTab->getRelativeTextSize() );
+    fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), layoutTab->getOffsetFromBaseline(), layoutTab->getRelativeTextSize() );
 }
 
 void KoFontDia::slotOffsetChanged( int offset )
 {
     m_changedFlags |= KoTextFormat::OffsetFromBaseLine;
-    fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), offset, tqlayoutTab->getRelativeTextSize() );
+    fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), offset, layoutTab->getRelativeTextSize() );
 }
 
 void KoFontDia::slotRelativeSizeChanged( double relativeSize )
 {
     m_changedFlags |= KoTextFormat::VAlign;
-    fontDiaPreview->setSubSuperscript( tqlayoutTab->getSubSuperScript(), tqlayoutTab->getOffsetFromBaseline(), relativeSize );
+    fontDiaPreview->setSubSuperscript( layoutTab->getSubSuperScript(), layoutTab->getOffsetFromBaseline(), relativeSize );
 }
 
 void KoFontDia::slotHyphenationChanged( bool )
diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h
index cd170764..ebd4a93f 100644
--- a/lib/kotext/KoFontDia.h
+++ b/lib/kotext/KoFontDia.h
@@ -91,7 +91,7 @@ private:
     KoFontTab *fontTab;
     KoHighlightingTab *highlightingTab;
     KoDecorationTab *decorationTab;
-    KoLayoutTab *tqlayoutTab;
+    KoLayoutTab *layoutTab;
     KoLanguageTab *languageTab;
     KoFontDiaPreview *fontDiaPreview;
 
diff --git a/lib/kotext/KoLayoutTab.h b/lib/kotext/KoLayoutTab.h
index 6620721d..611e3afa 100644
--- a/lib/kotext/KoLayoutTab.h
+++ b/lib/kotext/KoLayoutTab.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef __kotqlayouttab_h__
-#define __kotqlayouttab_h__
+#ifndef __kolayouttab_h__
+#define __kolayouttab_h__
 
 #include <kolayouttabbase.h>
 #include <KoTextFormat.h>
diff --git a/lib/kotext/KoParagCounter.cpp b/lib/kotext/KoParagCounter.cpp
index 71887c2c..b5058f1b 100644
--- a/lib/kotext/KoParagCounter.cpp
+++ b/lib/kotext/KoParagCounter.cpp
@@ -729,7 +729,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
 
                 str.append('.'); // hardcoded on purpose (like OO) until anyone complains
 
-                // Find the number of missing tqparents, and add dummy text for them.
+                // Find the number of missing parents, and add dummy text for them.
                 int missingParents = m_depth - level - p->counter()->m_depth;
                 //kdDebug() << "levelText = " << str << " missingParents=" << missingParents << endl;
                 level += missingParents;
@@ -742,7 +742,7 @@ TQString KoParagCounter::text( const KoTextParag *paragraph )
                 if ( level < displayLevels ) // no need to calc it if we won't use it
                     p = counter->tqparent( p );
             }
-            else // toplevel tqparents are missing
+            else // toplevel parents are missing
             {
                 // Special case for one-paragraph-documents like preview widgets
                 KoTextDocument* textdoc = paragraph->textDocument();
diff --git a/lib/kotext/KoParagDecorationTab.ui b/lib/kotext/KoParagDecorationTab.ui
index c3892601..4c93c261 100644
--- a/lib/kotext/KoParagDecorationTab.ui
+++ b/lib/kotext/KoParagDecorationTab.ui
@@ -388,7 +388,7 @@ regardless of the style of the preceeding and subsequent paragraphs.&lt;/p&gt;</
         <data format="PNG" length="101">89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000002c49444154388d63601805b400ffc9a4e90748b571d48594db38ea42ca6d4451cf422543e180895c8da3000e00765a11f509a137610000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 02949bb0..65cc1f2e 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -173,7 +173,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp
     connect( spnStart, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( startChanged(int) ) );
     connect( spnDepth, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( depthChanged(int) ) );
     connect( spnDisplayLevels, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) );
-    connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( tqalignmentChanged(const TQString&) ) );
+    connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( alignmentChanged(const TQString&) ) );
     noSignals = false;
     if ( disableAll )
     {
@@ -192,7 +192,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp
     }
 }
 
-void KoCounterStyleWidget::tqalignmentChanged(const TQString& s)
+void KoCounterStyleWidget::alignmentChanged(const TQString& s)
 {
     int a;
     if(s==i18n("Align Left"))
@@ -206,7 +206,7 @@ void KoCounterStyleWidget::tqalignmentChanged(const TQString& s)
         return;
     }
     m_counter.tqsetAlignment(a);
-    emit sig_tqalignmentChanged(a);
+    emit sig_alignmentChanged(a);
 }
 
 void KoCounterStyleWidget::setCounter( const KoParagCounter& counter )
@@ -866,7 +866,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit,  double _frameW
     TQString unitName = KoUnit::unitName( m_unit );
     TQGridLayout *mainGrid = new TQGridLayout( this, 3, 2, KDialog::marginHint(), KDialog::spacingHint() );
 
-    // mainGrid gives equal space to each groupbox, aptqparently
+    // mainGrid gives equal space to each groupbox, apparently
     // I tried setRowStretch but the result is awful (much space between them and not equal!)
     // Any other way (in order to make the 2nd, the one with a single checkbox, a bit
     // smaller than the other 3) ? (DF)
@@ -1639,7 +1639,7 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * tqparent
     connect( m_styleWidget, TQT_SIGNAL( sig_restartChanged(bool) ), this, TQT_SLOT( restartChanged(bool) ) );
     connect( m_styleWidget, TQT_SIGNAL( sig_depthChanged (int) ), this, TQT_SLOT( depthChanged(int) ) );
     connect( m_styleWidget, TQT_SIGNAL( sig_displayLevelsChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) );
-    connect( m_styleWidget, TQT_SIGNAL( sig_tqalignmentChanged (int) ), this, TQT_SLOT( tqalignmentChanged(int) ) );
+    connect( m_styleWidget, TQT_SIGNAL( sig_alignmentChanged (int) ), this, TQT_SLOT( alignmentChanged(int) ) );
     connect( m_styleWidget, TQT_SIGNAL( changeCustomBullet( const TQString & , TQChar ) ), this, TQT_SLOT( slotChangeCustomBullet( const TQString & , TQChar ) ) );
 
     connect( m_styleWidget, TQT_SIGNAL( sig_numTypeChanged( int ) ), this, TQT_SLOT( numTypeChanged(int ) ) );
@@ -2210,19 +2210,19 @@ void KoParagDia::setCurrentPage( int page )
     switch( page )
     {
     case PD_SPACING:
-        showPage( pageIndex( m_indentSpacingWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_indentSpacingWidget->parentWidget() ) );
         break;
     case PD_ALIGN:
-        showPage( pageIndex( m_alignWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_alignWidget->parentWidget() ) );
         break;
     case PD_DECORATION:
-        showPage( pageIndex( m_decorationsWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_decorationsWidget->parentWidget() ) );
         break;
     case PD_NUMBERING:
-        showPage( pageIndex( m_counterWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_counterWidget->parentWidget() ) );
         break;
     case PD_TABS:
-        showPage( pageIndex( m_tabulatorsWidget->tqparentWidget() ) );
+        showPage( pageIndex( m_tabulatorsWidget->parentWidget() ) );
         break;
     default:
         break;
diff --git a/lib/kotext/KoParagDia.h b/lib/kotext/KoParagDia.h
index 1c776af6..6de8115e 100644
--- a/lib/kotext/KoParagDia.h
+++ b/lib/kotext/KoParagDia.h
@@ -302,7 +302,7 @@ signals:
     void sig_suffixChanged(const TQString &);
     void sig_prefixChanged(const TQString &);
     void sig_numTypeChanged( int );
-    void sig_tqalignmentChanged( int );
+    void sig_alignmentChanged( int );
     void changeCustomBullet( const TQString & , TQChar );
     void changeStyle( KoParagCounter::Style );
 protected slots:
@@ -310,7 +310,7 @@ protected slots:
     void restartChanged(bool b) {m_counter.setRestartCounter(b);emit sig_restartChanged(b);}
     void depthChanged(int i) {m_counter.setDepth(i);emit sig_depthChanged(i);}
     void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i);emit sig_displayLevelsChanged(i);}
-    void tqalignmentChanged(const TQString& s);
+    void alignmentChanged(const TQString& s);
     void suffixChanged(const TQString & txt) {m_counter.setSuffix(txt);emit sig_suffixChanged(txt); }
     void prefixChanged(const TQString & txt) {m_counter.setPrefix(txt);emit sig_prefixChanged(txt); }
 
@@ -369,7 +369,7 @@ protected slots:
     void restartChanged(bool b) {m_counter.setRestartCounter(b); }
     void depthChanged(int i) {m_counter.setDepth(i); updatePreview();}
     void displayLevelsChanged(int i) {m_counter.setDisplayLevels(i); updatePreview();}
-    void tqalignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();}
+    void alignmentChanged(int i) {m_counter.tqsetAlignment(i); updatePreview();}
     void slotChangeCustomBullet( const TQString & f, TQChar c);
     void styleChanged (KoParagCounter::Style st );
 
diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp
index 8cb9682f..129c4d4a 100644
--- a/lib/kotext/KoParagLayout.cpp
+++ b/lib/kotext/KoParagLayout.cpp
@@ -141,7 +141,7 @@ KoParagLayout::~KoParagLayout()
     delete counter;
 }
 
-void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& tqparentElem, int docVersion )
+void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion )
 {
     // tqlayout is an input and output parameter
     // It can have been initialized already, e.g. by copying from a style
@@ -152,7 +152,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     // there is no way to differentiate between "I want no tabs in the parag"
     // and "use default from style".
     KoTabulatorList tabList;
-    TQDomElement element = tqparentElem.firstChild().toElement();
+    TQDomElement element = parentElem.firstChild().toElement();
     for ( ; !element.isNull() ; element = element.nextSibling().toElement() )
     {
         if ( element.tagName() == "TABULATOR" )
@@ -173,7 +173,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     qHeapSort( tabList );
     tqlayout.setTabList( tabList );
     tqlayout.tqalignment = TQt::AlignAuto;
-    element = tqparentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally
+    element = parentElem.namedItem( "FLOW" ).toElement(); // Flow is what is now called tqalignment internally
     if ( !element.isNull() )
     {
         TQString flow = element.attribute( "align" ); // KWord-1.0 DTD
@@ -203,32 +203,32 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
 
     if ( docVersion < 2 )
     {
-        element = tqparentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "OHEAD" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "pt", 0.0 );
 
-        element = tqparentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "OFOOT" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginBottom] = getAttribute( element, "pt", 0.0 );
 
-        element = tqparentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "IFIRST" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "pt", 0.0 );
 
-        element = tqparentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "ILEFT" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
             tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "pt", 0.0 );
     }
 
     // KWord-1.0 DTD
-    element = tqparentElem.namedItem( "INDENTS" ).toElement();
+    element = parentElem.namedItem( "INDENTS" ).toElement();
     if ( !element.isNull() )
     {
         tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = getAttribute( element, "first", 0.0 );
         tqlayout.margins[TQStyleSheetItem::MarginLeft] = getAttribute( element, "left", 0.0 );
         tqlayout.margins[TQStyleSheetItem::MarginRight] = getAttribute( element, "right", 0.0 );
     }
-    element = tqparentElem.namedItem( "OFFSETS" ).toElement();
+    element = parentElem.namedItem( "OFFSETS" ).toElement();
     if ( !element.isNull() )
     {
         tqlayout.margins[TQStyleSheetItem::MarginTop] = getAttribute( element, "before", 0.0 );
@@ -237,7 +237,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
 
     if ( docVersion < 2 )
     {
-        element = tqparentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8
+        element = parentElem.namedItem( "LINESPACE" ).toElement(); // used by KWord-0.8
         if ( !element.isNull() )
         {
             tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
@@ -245,7 +245,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
         }
     }
 
-    element = tqparentElem.namedItem( "LINESPACING" ).toElement(); // KWord-1.0 DTD
+    element = parentElem.namedItem( "LINESPACING" ).toElement(); // KWord-1.0 DTD
     if ( !element.isNull() )
     {
         //compatibility with koffice 1.1
@@ -307,7 +307,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     }
 
     int pageBreaking = 0;
-    element = tqparentElem.namedItem( "PAGEBREAKING" ).toElement();
+    element = parentElem.namedItem( "PAGEBREAKING" ).toElement();
     if ( !element.isNull() )
     {
         if ( element.attribute( "linesTogether" ) == "true" )
@@ -319,37 +319,37 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     }
     if ( docVersion < 2 )
     {
-        element = tqparentElem.namedItem( "HARDBRK" ).toElement(); // KWord-0.8
+        element = parentElem.namedItem( "HARDBRK" ).toElement(); // KWord-0.8
         if ( !element.isNull() )
             pageBreaking |= KoParagLayout::HardFrameBreakBefore;
     }
     tqlayout.pageBreaking = pageBreaking;
 
-    element = tqparentElem.namedItem( "LEFTBORDER" ).toElement();
+    element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.leftBorder = KoBorder::loadBorder( element );
     else
         tqlayout.leftBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "RIGHTBORDER" ).toElement();
+    element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.rightBorder = KoBorder::loadBorder( element );
     else
         tqlayout.rightBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "TOPBORDER" ).toElement();
+    element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.topBorder = KoBorder::loadBorder( element );
     else
         tqlayout.topBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "BOTTOMBORDER" ).toElement();
+    element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
         tqlayout.bottomBorder = KoBorder::loadBorder( element );
     else
         tqlayout.bottomBorder.setPenWidth(0);
 
-    element = tqparentElem.namedItem( "COUNTER" ).toElement();
+    element = parentElem.namedItem( "COUNTER" ).toElement();
     if ( !element.isNull() )
     {
         tqlayout.counter = new KoParagCounter;
@@ -357,7 +357,7 @@ void KoParagLayout::loadParagLayout( KoParagLayout& tqlayout, const TQDomElement
     }
 
     // Compatibility with KOffice-1.2
-    element = tqparentElem.namedItem( "SHADOW" ).toElement();
+    element = parentElem.namedItem( "SHADOW" ).toElement();
     if ( !element.isNull() && element.hasAttribute("direction") )
     {
         int shadowDistance = element.attribute("distance").toInt();
@@ -658,19 +658,19 @@ void KoParagLayout::loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContex
     }
 }
 
-void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignment ) const
+void KoParagLayout::saveParagLayout( TQDomElement & parentElem, int tqalignment ) const
 {
     const KoParagLayout& tqlayout = *this; // code moved from somewhere else;)
-    TQDomDocument doc = tqparentElem.ownerDocument();
+    TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
     if ( tqlayout.style )
         element.setAttribute( "value", tqlayout.style->displayName() );
     //else
     //    kdWarning() << "KoParagLayout::saveParagLayout: style==0!" << endl;
 
     element = doc.createElement( "FLOW" );
-    tqparentElem.appendChild( element );
+    parentElem.appendChild( element );
 
     element.setAttribute( "align", tqalignment==TQt::AlignRight ? "right" :
                           tqalignment==TQt::AlignHCenter ? "center" :
@@ -688,7 +688,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
          tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
     {
         element = doc.createElement( "INDENTS" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
             element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] );
         if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 )
@@ -701,7 +701,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
          tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
     {
         element = doc.createElement( "OFFSETS" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 )
             element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] );
         if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
@@ -710,7 +710,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     if ( tqlayout.lineSpacingType != LS_SINGLE )
     {
         element = doc.createElement( "LINESPACING" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )  {
             element.setAttribute( "type", "oneandhalf" );
             element.setAttribute( "value", "oneandhalf" ); //compatibility with koffice 1.2
@@ -747,7 +747,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     if ( tqlayout.pageBreaking != 0 )
     {
         element = doc.createElement( "PAGEBREAKING" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.pageBreaking & KoParagLayout::KeepLinesTogether )
             element.setAttribute( "linesTogether",  "true" );
         if ( tqlayout.pageBreaking & KoParagLayout::HardFrameBreakBefore )
@@ -759,31 +759,31 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     if ( tqlayout.leftBorder.penWidth() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.leftBorder.save( element );
     }
     if ( tqlayout.rightBorder.penWidth() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.rightBorder.save( element );
     }
     if ( tqlayout.topBorder.penWidth() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.topBorder.save( element );
     }
     if ( tqlayout.bottomBorder.penWidth() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         tqlayout.bottomBorder.save( element );
     }
     if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE )
     {
         element = doc.createElement( "COUNTER" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         if ( tqlayout.counter )
             tqlayout.counter->save( element );
     }
@@ -793,7 +793,7 @@ void KoParagLayout::saveParagLayout( TQDomElement & tqparentElem, int tqalignmen
     for ( ; it != tabList.end() ; it++ )
     {
         element = doc.createElement( "TABULATOR" );
-        tqparentElem.appendChild( element );
+        parentElem.appendChild( element );
         element.setAttribute( "type", (*it).type );
         element.setAttribute( "ptpos", (*it).ptPos );
         element.setAttribute( "filling", (*it).filling );
diff --git a/lib/kotext/KoParagLayout.h b/lib/kotext/KoParagLayout.h
index a60d3934..2c9b9dea 100644
--- a/lib/kotext/KoParagLayout.h
+++ b/lib/kotext/KoParagLayout.h
@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#ifndef koparagtqlayout_h
-#define koparagtqlayout_h
+#ifndef koparaglayout_h
+#define koparaglayout_h
 
 #include <KoRuler.h> // for KoTabulatorList
 #include <tqdom.h>
@@ -135,12 +135,12 @@ public:
     /** Save this parag tqlayout to XML.
      * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles.
      */
-    void saveParagLayout( TQDomElement & tqparentElem, int tqalignment ) const;
+    void saveParagLayout( TQDomElement & parentElem, int tqalignment ) const;
 
     /** Load this parag tqlayout from XML.
      * This format is used by KWord for paragraphs, and by KPresenter+KWord for styles.
      */
-    static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& tqparentElem, int docVersion = 2 );
+    static void loadParagLayout( KoParagLayout& tqlayout, const TQDomElement& parentElem, int docVersion = 2 );
 
     /// Load this parag tqlayout from Oasis XML
     static void loadOasisParagLayout( KoParagLayout& tqlayout, KoOasisContext& context );
diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp
index e3bf15e9..f44bcd59 100644
--- a/lib/kotext/KoParagStyle.cpp
+++ b/lib/kotext/KoParagStyle.cpp
@@ -86,32 +86,32 @@ void KoParagStyle::setFollowingStyle( KoParagStyle *fst )
   m_followingStyle = fst;
 }
 
-void KoParagStyle::saveStyle( TQDomElement & tqparentElem )
+void KoParagStyle::saveStyle( TQDomElement & parentElem )
 {
-    m_paragLayout.saveParagLayout( tqparentElem, m_paragLayout.tqalignment );
+    m_paragLayout.saveParagLayout( parentElem, m_paragLayout.tqalignment );
 
     if ( followingStyle() )
     {
-        TQDomElement element = tqparentElem.ownerDocument().createElement( "FOLLOWING" );
-        tqparentElem.appendChild( element );
+        TQDomElement element = parentElem.ownerDocument().createElement( "FOLLOWING" );
+        parentElem.appendChild( element );
         element.setAttribute( "name", followingStyle()->displayName() );
     }
     // TODO save tqparent style, and inherited flags.
 
-    tqparentElem.setAttribute( "outline", m_bOutline ? "true" : "false" );
+    parentElem.setAttribute( "outline", m_bOutline ? "true" : "false" );
 }
 
-void KoParagStyle::loadStyle( TQDomElement & tqparentElem, int docVersion )
+void KoParagStyle::loadStyle( TQDomElement & parentElem, int docVersion )
 {
     KoParagLayout tqlayout;
-    KoParagLayout::loadParagLayout( tqlayout, tqparentElem, docVersion );
+    KoParagLayout::loadParagLayout( tqlayout, parentElem, docVersion );
 
     // This way, KoTextParag::setParagLayout also sets the style pointer, to this style
     tqlayout.style = this;
     m_paragLayout = tqlayout;
 
     // Load name
-    TQDomElement nameElem = tqparentElem.namedItem("NAME").toElement();
+    TQDomElement nameElem = parentElem.namedItem("NAME").toElement();
     if ( !nameElem.isNull() ) {
         m_name = nameElem.attribute("value");
         m_displayName = i18n( "Style name", m_name.utf8() );
@@ -120,7 +120,7 @@ void KoParagStyle::loadStyle( TQDomElement & tqparentElem, int docVersion )
 
     // The followingStyle stuff has to be done after loading all styles.
 
-    m_bOutline = tqparentElem.attribute( "outline" ) == "true";
+    m_bOutline = parentElem.attribute( "outline" ) == "true";
 }
 
 void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context )
@@ -137,7 +137,7 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context
     m_bOutline = styleElem.hasAttributeNS( KoXmlNS::style, "default-outline-level" );
 
     context.styleStack().save();
-    context.addStyles( &styleElem, "paragraph" ); // Load all tqparents - only because we don't support inheritance.
+    context.addStyles( &styleElem, "paragraph" ); // Load all parents - only because we don't support inheritance.
     KoParagLayout tqlayout;
     KoParagLayout::loadOasisParagLayout( tqlayout, context );
 
@@ -187,9 +187,9 @@ void KoParagStyle::loadStyle( TQDomElement & styleElem, KoOasisContext& context
     context.styleStack().restore();
 }
 
-TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const TQString& tqparentStyleName, KoSavingContext& context ) const
+TQString KoParagStyle::saveStyle( KoGenStyles& genStyles, int styleType, const TQString& parentStyleName, KoSavingContext& context ) const
 {
-    KoGenStyle gs( styleType, "paragraph", tqparentStyleName );
+    KoGenStyle gs( styleType, "paragraph", parentStyleName );
 
     gs.addAttribute( "style:display-name", m_displayName );
     if ( m_paragLayout.counter ) {
diff --git a/lib/kotext/KoParagStyle.h b/lib/kotext/KoParagStyle.h
index 46e4f242..190ad345 100644
--- a/lib/kotext/KoParagStyle.h
+++ b/lib/kotext/KoParagStyle.h
@@ -73,18 +73,18 @@ public:
 
     /// Saves the name, tqlayout, the following style and the outline bool. Not the format.
     /// @deprecated  (1.3 format)
-    void saveStyle( TQDomElement & tqparentElem );
+    void saveStyle( TQDomElement & parentElem );
     /// Loads the name, tqlayout and the outline bool. Not the "following style" nor the format.
     /// (1.3 format)
-    void loadStyle( TQDomElement & tqparentElem, int docVersion = 2 );
+    void loadStyle( TQDomElement & parentElem, int docVersion = 2 );
 
     /// Load the style from OASIS
     void loadStyle( TQDomElement & styleElem, KoOasisContext& context );
     /// Save the style to OASIS
     /// Don't use, use the method in KoStyleCollection instead
-    TQString saveStyle( KoGenStyles& genStyles, int styleType, const TQString& tqparentStyleName, KoSavingContext& context ) const;
+    TQString saveStyle( KoGenStyles& genStyles, int styleType, const TQString& parentStyleName, KoSavingContext& context ) const;
 
-    KoParagStyle * tqparentStyle() const {return m_parentStyle;}
+    KoParagStyle * parentStyle() const {return m_parentStyle;}
     void setParentStyle( KoParagStyle *_style){ m_parentStyle = _style;}
 
     int inheritedParagLayoutFlag() const { return m_inheritedParagLayoutFlag; }
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index dc6c6922..157f79a8 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -939,7 +939,7 @@ bool KoTextCursor::removePreviousChar()
     } else if ( string->prev() ) {
 	string = string->prev();
 	string->join( string->next() );
-	string->tqinvalidateCounters();
+	string->invalidateCounters();
 	return TRUE;
     }
     return FALSE;
@@ -965,7 +965,7 @@ bool KoTextCursor::remove()
 	    string = p;
 	    string->tqinvalidate( 0 );
             //// kotext
-            string->tqinvalidateCounters();
+            string->invalidateCounters();
             ////
 	    KoTextParag *s = string;
 	    while ( s ) {
@@ -1242,7 +1242,7 @@ void KoTextString::checkBidi() const
     const KoTextStringChar *start = data.data();
     const KoTextStringChar *end = start + length;
 
-    // determines the properties we need for tqlayouting
+    // determines the properties we need for layouting
 #ifdef USE_QT4
     #warning "KoTextString::checkBidi() for Qt4 partially implemented"
     printf("[WARNING] KoTextString::checkBidi() partially implemented\n\r");
diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp
index 9017d8a1..ef925289 100644
--- a/lib/kotext/KoStyleManager.cpp
+++ b/lib/kotext/KoStyleManager.cpp
@@ -318,7 +318,7 @@ void KoStyleManager::updateGUI() {
         }
     }
 
-    TQString inheritName = m_currentStyle->tqparentStyle() ? m_currentStyle->tqparentStyle()->displayName() : TQString();
+    TQString inheritName = m_currentStyle->parentStyle() ? m_currentStyle->parentStyle()->displayName() : TQString();
     kdDebug(32500) << "KoStyleManager::updateGUI updating combo to " << inheritName << endl;
     for ( int i = 0; i < m_inheritCombo->count(); i++ ) {
         if ( m_inheritCombo->text( i ) == inheritName ) {
@@ -449,7 +449,7 @@ void KoStyleManager::updateInheritStyle( KoParagStyle *s )
         //when we remove style, we must replace inherite style to 0L
         //when tqparent style was removed.
         //##########Laurent change inherited style attribute
-        if ( p->tqparentStyle() == s)
+        if ( p->parentStyle() == s)
             p->setParentStyle(0L);
     }
 
diff --git a/lib/kotext/KoStyleManager.h b/lib/kotext/KoStyleManager.h
index 10dbf8e6..328668fd 100644
--- a/lib/kotext/KoStyleManager.h
+++ b/lib/kotext/KoStyleManager.h
@@ -181,7 +181,7 @@ private:
 Font            simple font dia
 Color           simple color dia
 Spacing and Indents     paragraph spacing dia (KWParagDia)
-tqalignments      KoParagDia tqalignment tab
+alignments      KoParagDia tqalignment tab
 borders         KoParagDia  borders tab
 numbering       KoParagDia  tab numbering
 tabulators      KoParagDia  tab tabs */
diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp
index 68f83ad3..fb496836 100644
--- a/lib/kotext/KoTextCommand.cpp
+++ b/lib/kotext/KoTextCommand.cpp
@@ -88,9 +88,9 @@ KoTextCursor * KoTextDeleteCommand::unexecute( KoTextCursor *c )
     // Set any custom item that we had
     m_customItemsMap.insertItems( cursor, text.size() );
 
-    // Now restore the parag tqlayouts (i.e. libkotext specific stuff)
+    // Now restore the parag layouts (i.e. libkotext specific stuff)
     TQValueList<KoParagLayout>::Iterator lit = m_oldParagLayouts.begin();
-    kdDebug(32500) << "KoTextDeleteCommand::unexecute " << m_oldParagLayouts.count() << " parag tqlayouts. First parag=" << s->paragId() << endl;
+    kdDebug(32500) << "KoTextDeleteCommand::unexecute " << m_oldParagLayouts.count() << " parag layouts. First parag=" << s->paragId() << endl;
     Q_ASSERT( id == s->paragId() );
     KoTextParag *p = s;
     while ( p ) {
diff --git a/lib/kotext/KoTextCustomItem.cpp b/lib/kotext/KoTextCustomItem.cpp
index e90eae47..f6eaf7de 100644
--- a/lib/kotext/KoTextCustomItem.cpp
+++ b/lib/kotext/KoTextCustomItem.cpp
@@ -81,16 +81,16 @@ void KoTextCustomItem::draw(TQPainter* p, int _x, int _y, int cx, int cy, int cw
     KoTextStringChar* stringChar = paragraph()->at( charIndex );
 
     // Convert x, y, cx, cy, cw and ch from Layout Units to pixels.
-    int x = zh->tqlayoutUnitToPixelX(_x) /*+ stringChar->pixelxadj*/;
-    int y = zh->tqlayoutUnitToPixelY(_y);
-    cx = zh->tqlayoutUnitToPixelX(cx);
-    cy = zh->tqlayoutUnitToPixelY(cy);
-    cw = zh->tqlayoutUnitToPixelX(_x,cw);
-    ch = zh->tqlayoutUnitToPixelY(_y,ch);
-    int wpix = zh->tqlayoutUnitToPixelX(_x,width);
-    int hpix = zh->tqlayoutUnitToPixelX(_y,height);
+    int x = zh->layoutUnitToPixelX(_x) /*+ stringChar->pixelxadj*/;
+    int y = zh->layoutUnitToPixelY(_y);
+    cx = zh->layoutUnitToPixelX(cx);
+    cy = zh->layoutUnitToPixelY(cy);
+    cw = zh->layoutUnitToPixelX(_x,cw);
+    ch = zh->layoutUnitToPixelY(_y,ch);
+    int wpix = zh->layoutUnitToPixelX(_x,width);
+    int hpix = zh->layoutUnitToPixelX(_y,height);
     //kdDebug(32500)<<"After  x :"<<x<<" y :"<<y<<" cx :"<<cx<<" cy :"<<cy<<" ch :"<<ch<<" cw :"<<cw<<endl;
-    int ascentpix = zh->tqlayoutUnitToPixelY( _y, ascent() );
+    int ascentpix = zh->layoutUnitToPixelY( _y, ascent() );
 
     KoTextFormat * fmt = stringChar->format();
 
diff --git a/lib/kotext/KoTextDocument.cpp b/lib/kotext/KoTextDocument.cpp
index b637f0a6..b5de2a73 100644
--- a/lib/kotext/KoTextDocument.cpp
+++ b/lib/kotext/KoTextDocument.cpp
@@ -1104,7 +1104,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
     TQRect pixelRect = parag->pixelRect( zoomHandler );
     if ( isPageBreakEnabled() && parag && cy <= pixelRect.y() && pixelRect.y() > 0 ) {
         TQRect r( 0, 0,
-                 zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
+                 zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
                  pixelRect.y() );
         r &= crect;
         if ( !r.isEmpty() ) {
@@ -1131,7 +1131,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
             // (as opposed ir.bottom() which is the last pixel of the parag)
 	    if ( ir.y() + ir.height() < nexty ) {
 		TQRect r( 0, ir.y() + ir.height(),
-			 zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
+			 zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() ),
 			 nexty - ( ir.y() + ir.height() ) );
 		r &= crect;
 		if ( !r.isEmpty() )
@@ -1146,7 +1146,7 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
 
         if ( !ir.intersects( crect ) ) {
             // Paragraph is not in the crect - but let's check if the area on its right is.
-	    ir.setWidth( zoomHandler->tqlayoutUnitToPixelX( parag->document()->width() ) );
+	    ir.setWidth( zoomHandler->layoutUnitToPixelX( parag->document()->width() ) );
 	    if ( ir.intersects( crect ) && ( drawingFlags & TransparentBackground ) == 0 )
 		p->fillRect( ir.intersect( crect ), cg.brush( TQColorGroup::Base ) );
 	    if ( ir.y() > cy + ch ) {
@@ -1169,9 +1169,9 @@ KoTextParag *KoTextDocument::drawWYSIWYG( TQPainter *p, int cx, int cy, int cw,
 
 floating:
     pixelRect = parag->pixelRect(zoomHandler);
-    int docheight = zoomHandler->tqlayoutUnitToPixelY( parag->document()->height() );
+    int docheight = zoomHandler->layoutUnitToPixelY( parag->document()->height() );
     if ( pixelRect.y() + pixelRect.height() < docheight ) {
-        int docwidth = zoomHandler->tqlayoutUnitToPixelX( parag->document()->width() );
+        int docwidth = zoomHandler->layoutUnitToPixelX( parag->document()->width() );
         if ( ( drawingFlags & TransparentBackground ) == 0 ) {
             p->fillRect( 0, pixelRect.y() + pixelRect.height(),
                          docwidth, docheight - ( pixelRect.y() + pixelRect.height() ),
@@ -1267,7 +1267,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
     // Start painting from a given line number.
     if ( parag->lineChanged() > -1 )
     {
-        offsetY = zoomHandler->tqlayoutUnitToPixelY( parag->lineY( parag->lineChanged() ) - parag->topMargin() );
+        offsetY = zoomHandler->layoutUnitToPixelY( parag->lineY( parag->lineChanged() ) - parag->topMargin() );
 #ifdef DEBUG_PAINTING
         kdDebug(32500) << " Repainting from lineChanged=" << parag->lineChanged() << " -> adding " << offsetY << " to rect" << endl;
 #endif
@@ -1384,7 +1384,7 @@ void KoTextDocument::drawParagWYSIWYG( TQPainter *p, KoTextParag *parag, int cx,
     }
 
     if ( needBrush ) {
-        int docright = zoomHandler->tqlayoutUnitToPixelX( parag->document()->x() + parag->document()->width() );
+        int docright = zoomHandler->layoutUnitToPixelX( parag->document()->x() + parag->document()->width() );
 #ifdef DEBUG_PAINTING
 //        kdDebug(32500) << "KoTextDocument::drawParagWYSIWYG my rect is: " << rect << endl;
 #endif
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 7395a050..5a1570ac 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -1094,7 +1094,7 @@ float KoTextFormat::screenPointSize( const KoTextZoomHandler* zh ) const
     int pointSizeLU = KoTextZoomHandler::ptToLayoutUnitPt( pointSize() );
     if ( vAlign() != KoTextFormat::AlignNormal )
         pointSizeLU = (int)( pointSizeLU *relativeTextSize() );
-    return zh->tqlayoutUnitToFontSize( pointSizeLU, false /* forPrint */ );
+    return zh->layoutUnitToFontSize( pointSizeLU, false /* forPrint */ );
 }
 
 float KoTextFormat::refPointSize() const
@@ -1145,7 +1145,7 @@ const TQFontMetrics& KoTextFormat::screenFontMetrics( const KoTextZoomHandler* z
 {
     TQFont f = screenFont(zh); // don't move inside the if!
 
-    if ( !d->m_screenFontMetrics ) // not calculated, or tqinvalidated by screenFont above
+    if ( !d->m_screenFontMetrics ) // not calculated, or invalidated by screenFont above
     {
         //kdDebug(32500) << this << " KoTextFormat::screenFontMetrics pointSize=" << pointSize << " d->m_screenFont->pointSizeFloat()=" << d->m_screenFont->pointSizeFloat() << endl;
         d->m_screenFontMetrics = new TQFontMetrics( f );
@@ -1186,7 +1186,7 @@ int KoTextFormat::charWidth( const KoTextZoomHandler* zh, bool applyZoom, const
     if( c->isCustom() ) {
 	 if( c->customItem()->placement() == KoTextCustomItem::PlaceInline ) {
              // customitem width is in LU pixels. Convert to 100%-zoom-pixels (pt2pt==pix2pix)
-             double w = KoTextZoomHandler::tqlayoutUnitPtToPt( c->customItem()->width );
+             double w = KoTextZoomHandler::layoutUnitPtToPt( c->customItem()->width );
              return tqRound( applyZoom ? ( w * zh->zoomFactorX() ) : w );
          }
          else
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 6696f041..7bdfbc0c 100644
--- a/lib/kotext/KoTextFormatter.cpp
+++ b/lib/kotext/KoTextFormatter.cpp
@@ -94,7 +94,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth()
             Q_ASSERT( ww >= 0 );
             ww = TQMAX(0, ww);
 #ifndef REF_IS_LU
-            pixelww = zh->tqlayoutUnitToPixelX( ww );
+            pixelww = zh->layoutUnitToPixelX( ww );
 #endif
         } else {
             ww = charFormat->charWidthLU( c, parag, i );
@@ -113,7 +113,7 @@ TQPair<int, int> KoTextFormatterCore::determineCharWidth()
         kdDebug(32500) << "nextTab for x=" << x << " returned nx=" << nx << "  (=> ww=" << ww << ")" << endl;
 #endif
 #ifndef REF_IS_LU
-        pixelww = zh->tqlayoutUnitToPixelX( ww );
+        pixelww = zh->layoutUnitToPixelX( ww );
 #endif
     }
     Q_ASSERT( ww >= 0 );
@@ -260,7 +260,7 @@ bool KoTextFormatterCore::format()
     maxAvailableWidth = tqMakePair( 0, 0 );
 
     KoTextZoomHandler *zh = doc->formattingZoomHandler();
-    int pixelx = zh->tqlayoutUnitToPixelX( x );
+    int pixelx = zh->layoutUnitToPixelX( x );
     int lastPixelx = 0;
 
     KoTextStringChar* lastChr = 0;
@@ -445,7 +445,7 @@ bool KoTextFormatterCore::format()
                                                     ww, // ## correct?
                                                     x, initialRMargin, dw, parag );
 
-                    pixelx = zh->tqlayoutUnitToPixelX( x );
+                    pixelx = zh->layoutUnitToPixelX( x );
                     initialHeight = tmph;
                     initialLMargin = x;
                     availableWidth = dw - initialRMargin;
@@ -545,7 +545,7 @@ bool KoTextFormatterCore::format()
                                                     c->width,
                                                     x, initialRMargin, dw, parag );
 
-                    pixelx = zh->tqlayoutUnitToPixelX( x );
+                    pixelx = zh->layoutUnitToPixelX( x );
                     initialHeight = tmph;
                     initialLMargin = x;
                     availableWidth = dw - initialRMargin;
@@ -624,7 +624,7 @@ bool KoTextFormatterCore::format()
 #endif
                     i = (firstChar - &string->at(0));
                     x = newLMargin;
-                    pixelx = zh->tqlayoutUnitToPixelX( x );
+                    pixelx = zh->layoutUnitToPixelX( x );
                     availableWidth = dw - newRMargin;
                     initialLMargin = newLMargin;
                     initialRMargin = newRMargin;
@@ -679,10 +679,10 @@ bool KoTextFormatterCore::format()
         c->x = x;
         // pixelxadj is the adjustement to add to lu2pixel(x), to find pixelx
         // (pixelx would be too expensive to store directly since it would require an int)
-        c->pixelxadj = pixelx - zh->tqlayoutUnitToPixelX( x );
+        c->pixelxadj = pixelx - zh->layoutUnitToPixelX( x );
         //c->pixelwidth = pixelww; // done as pixelx - lastPixelx below
 #ifdef DEBUG_FORMATTER
-        kdDebug(32500) << "LU: x=" << x << " [equiv. to pix=" << zh->tqlayoutUnitToPixelX( x ) << "] ; PIX: x=" << pixelx << "  --> adj=" << c->pixelxadj << endl;
+        kdDebug(32500) << "LU: x=" << x << " [equiv. to pix=" << zh->layoutUnitToPixelX( x ) << "] ; PIX: x=" << pixelx << "  --> adj=" << c->pixelxadj << endl;
 #endif
 
         x += ww;
@@ -692,11 +692,11 @@ bool KoTextFormatterCore::format()
         if ( i < len - 1 )
             tmpWused = TQMAX( tmpWused, x );
         else // trailing space
-            c->pixelwidth = zh->tqlayoutUnitToPixelX( ww ); // was: pixelww;
+            c->pixelwidth = zh->layoutUnitToPixelX( ww ); // was: pixelww;
 
         lastPixelx = pixelx;
 #ifdef REF_IS_LU
-        pixelx = zh->tqlayoutUnitToPixelX( x ); // no accumulating rounding errors anymore
+        pixelx = zh->layoutUnitToPixelX( x ); // no accumulating rounding errors anymore
 #else
         pixelx += pixelww;
 #endif
@@ -706,7 +706,7 @@ bool KoTextFormatterCore::format()
     }
 
     // ### hack. The last char in the paragraph is always invisible, and somehow sometimes has a wrong format. It changes between
-    // tqlayouting and printing. This corrects some tqlayouting errors in BiDi mode due to this.
+    // layouting and printing. This corrects some layouting errors in BiDi mode due to this.
     if ( len > 1 /*&& !c->isAnchor()*/ ) {
         c->format()->removeRef();
         c->setFormat( string->at( len - 2 ).format() );
@@ -787,11 +787,11 @@ void KoTextFormatterCore::moveChar( KoTextStringChar& chr, KoTextZoomHandler *zh
                                     int deltaX, int deltaPixelX )
 {
 #ifndef REF_IS_LU
-    int pixelx = chr.pixelxadj + zh->tqlayoutUnitToPixelX( chr.x );
+    int pixelx = chr.pixelxadj + zh->layoutUnitToPixelX( chr.x );
 #endif
     chr.x += deltaX;
 #ifndef REF_IS_LU
-    chr.pixelxadj = pixelx + deltaPixelX - zh->tqlayoutUnitToPixelX( chr.x );
+    chr.pixelxadj = pixelx + deltaPixelX - zh->layoutUnitToPixelX( chr.x );
 #endif
 }
 
@@ -814,7 +814,7 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine(
         if ( align & TQt::AlignHCenter || align & TQt::AlignRight ) {
             if ( align & TQt::AlignHCenter )
                 space /= 2;
-            int toAddPix = zh->tqlayoutUnitToPixelX( space );
+            int toAddPix = zh->layoutUnitToPixelX( space );
             for ( int j = last; j >= start; --j ) {
                 KoTextStringChar &chr = string->at( j );
                 moveChar( chr, zh, space, toAddPix );
@@ -841,12 +841,12 @@ KoTextParagLineStart *KoTextFormatterCore::koFormatLine(
                 if( settings->isStretchable( string, k ) && numSpaces ) {
                     int s = space / numSpaces;
                     toAdd += s;
-                    toAddPix = zh->tqlayoutUnitToPixelX( toAdd );
+                    toAddPix = zh->layoutUnitToPixelX( toAdd );
                     space -= s;
                     numSpaces--;
                     chr.width += s;
 #ifndef REF_IS_LU
-                    chr.pixelwidth += zh->tqlayoutUnitToPixelX( s ); // ### rounding problem, recalculate
+                    chr.pixelwidth += zh->layoutUnitToPixelX( s ); // ### rounding problem, recalculate
 #endif
                 }
             }
@@ -973,7 +973,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
         }
     }
 // TODO #ifndef REF_IS_LU or remove
-    int pixelx = zh->tqlayoutUnitToPixelX( x );
+    int pixelx = zh->layoutUnitToPixelX( x );
     int toAdd = 0;
     int toAddPix = 0;
     bool first = TRUE;
@@ -991,11 +991,11 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                 if( numSpaces && !first && settings->isBreakable( text, pos ) ) {
                     int s = space / numSpaces;
                     toAdd += s;
-                    toAddPix = zh->tqlayoutUnitToPixelX( toAdd );
+                    toAddPix = zh->layoutUnitToPixelX( toAdd );
                     space -= s;
                     numSpaces--;
                     chr.width += s;
-                    chr.pixelwidth += zh->tqlayoutUnitToPixelX( s ); // ### rounding problem, recalculate
+                    chr.pixelwidth += zh->layoutUnitToPixelX( s ); // ### rounding problem, recalculate
                 } else if ( first ) {
                     first = FALSE;
                     if ( chr.c == ' ' ) // trailing space
@@ -1006,9 +1006,9 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                     }
                 }
                 chr.x = x + toAdd;
-                chr.pixelxadj = pixelx + toAddPix - zh->tqlayoutUnitToPixelX( chr.x );
+                chr.pixelxadj = pixelx + toAddPix - zh->layoutUnitToPixelX( chr.x );
 #ifdef DEBUG_FORMATTER
-                kdDebug(32500) << "koBidiReorderLine: pos=" << pos << " x(LU)=" << x << " toAdd(LU)=" << toAdd << " -> chr.x=" << chr.x << " pixelx=" << pixelx << "+" << zh->tqlayoutUnitToPixelX( toAdd ) << ", pixelxadj=" << pixelx+zh->tqlayoutUnitToPixelX( toAdd )-zh->tqlayoutUnitToPixelX( chr.x ) << endl;
+                kdDebug(32500) << "koBidiReorderLine: pos=" << pos << " x(LU)=" << x << " toAdd(LU)=" << toAdd << " -> chr.x=" << chr.x << " pixelx=" << pixelx << "+" << zh->layoutUnitToPixelX( toAdd ) << ", pixelxadj=" << pixelx+zh->layoutUnitToPixelX( toAdd )-zh->layoutUnitToPixelX( chr.x ) << endl;
 #endif
                 chr.rightToLeft = TRUE;
                 chr.startOfRun = FALSE;
@@ -1028,7 +1028,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                 if( numSpaces && !first && settings->isBreakable( text, pos ) ) {
                     int s = space / numSpaces;
                     toAdd += s;
-                    toAddPix = zh->tqlayoutUnitToPixelX( toAdd );
+                    toAddPix = zh->layoutUnitToPixelX( toAdd );
                     space -= s;
                     numSpaces--;
                 } else if ( first ) {
@@ -1041,7 +1041,7 @@ KoTextParagLineStart *KoTextFormatterCore::koBidiReorderLine(
                     }
                 }
                 chr.x = x + toAdd;
-                chr.pixelxadj = pixelx + toAddPix - zh->tqlayoutUnitToPixelX( chr.x );
+                chr.pixelxadj = pixelx + toAddPix - zh->layoutUnitToPixelX( chr.x );
                 chr.rightToLeft = FALSE;
                 chr.startOfRun = FALSE;
                 int ww = chr.width;
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index f6716b2d..6289482b 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -887,7 +887,7 @@ KCommand *KoTextObject::applyStyleCommand( KoTextCursor * cursor, const KoParagS
             c2.setIndex( lastParag->string()->length() );
             undoRedoInfo.clear();
             undoRedoInfo.type = UndoRedoInfo::Invalid; // same trick
-            readFormats( c1, c2 ); // gather char-format info but not paragtqlayouts nor customitems
+            readFormats( c1, c2 ); // gather char-format info but not paraglayouts nor customitems
 
             KoTextDocCommand * cmd = new KoTextFormatCommand( textdoc, firstParag->paragId(), 0,
                                                          lastParag->paragId(), c2.index(),
@@ -2634,7 +2634,7 @@ TQFont KoTextFormatInterface::textFont() const
 {
     TQFont fn( currentFormat()->font() );
     // "unzoom" the font size
-    //fn.setPointSize( static_cast<int>( KoTextZoomHandler::tqlayoutUnitPtToPt( fn.pointSize() ) ) );
+    //fn.setPointSize( static_cast<int>( KoTextZoomHandler::layoutUnitPtToPt( fn.pointSize() ) ) );
     return fn;
 }
 
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index 8f948596..f516b7ca 100644
--- a/lib/kotext/KoTextParag.cpp
+++ b/lib/kotext/KoTextParag.cpp
@@ -254,7 +254,7 @@ void KoTextParag::join( KoTextParag *s )
     delete s;
     tqinvalidate( 0 );
     //// kotext
-    tqinvalidateCounters();
+    invalidateCounters();
     ////
     r.setHeight( oh );
     //needPreProcess = TRUE;
@@ -693,7 +693,7 @@ void KoTextParag::setDirection( TQChar::Direction d )
 	tqinvalidate( 0 );
         //// kotext
         m_layout.direction = d;
-	tqinvalidateCounters(); // #47178
+	invalidateCounters(); // #47178
         ////
     }
 }
@@ -1012,7 +1012,7 @@ void KoTextParag::setNoCounter()
 {
     delete m_layout.counter;
     m_layout.counter = 0L;
-    tqinvalidateCounters();
+    invalidateCounters();
 }
 
 void KoTextParag::setCounter( const KoParagCounter * pCounter )
@@ -1028,7 +1028,7 @@ void KoTextParag::setCounter( const KoParagCounter * pCounter )
         m_layout.counter->setStyle( KoParagCounter::STYLE_NONE ); // no number after the 'prefix'
         m_layout.counter->setPrefix( footNotePrefix );
         m_layout.counter->setSuffix( TQString() );
-        tqinvalidateCounters();
+        invalidateCounters();
     } else {
         if ( pCounter )
             setCounter( *pCounter );
@@ -1052,11 +1052,11 @@ void KoTextParag::setCounter( const KoParagCounter & counter )
         m_layout.counter = new KoParagCounter( counter );
 
         // Invalidate the counters
-        tqinvalidateCounters();
+        invalidateCounters();
     }
 }
 
-void KoTextParag::tqinvalidateCounters()
+void KoTextParag::invalidateCounters()
 {
     // Invalidate this paragraph and all the following ones
     // (Numbering may have changed)
@@ -1065,7 +1065,7 @@ void KoTextParag::tqinvalidateCounters()
         m_layout.counter->tqinvalidate();
     KoTextParag *s = next();
     // #### Possible optimization: since any invalidation propagates down,
-    // it's enough to stop at the first paragraph with an already-tqinvalidated counter, isn't it?
+    // it's enough to stop at the first paragraph with an already-invalidated counter, isn't it?
     // This is only true if nobody else calls counter->tqinvalidate...
     while ( s ) {
         if ( s->m_layout.counter )
@@ -1117,12 +1117,12 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /*
     //bool forPrint = ( p->device()->devType() == TQInternal::Printer );
 
     bool rtl = str->isRightToLeft(); // when true, we put suffix+counter+prefix at the RIGHT of the paragraph.
-    int xLeft = zh->tqlayoutUnitToPixelX( xLU - (rtl ? 0 : counterWidthLU) );
-    int y = zh->tqlayoutUnitToPixelY( yLU );
-    //int h = zh->tqlayoutUnitToPixelY( yLU, hLU );
-    int base = zh->tqlayoutUnitToPixelY( yLU, baseLU );
-    int counterWidth = zh->tqlayoutUnitToPixelX( xLU, counterWidthLU );
-    int height = zh->tqlayoutUnitToPixelY( yLU, format->height() );
+    int xLeft = zh->layoutUnitToPixelX( xLU - (rtl ? 0 : counterWidthLU) );
+    int y = zh->layoutUnitToPixelY( yLU );
+    //int h = zh->layoutUnitToPixelY( yLU, hLU );
+    int base = zh->layoutUnitToPixelY( yLU, baseLU );
+    int counterWidth = zh->layoutUnitToPixelX( xLU, counterWidthLU );
+    int height = zh->layoutUnitToPixelY( yLU, format->height() );
 
     TQFont font( format->screenFont( zh ) );
     // Footnote numbers are in superscript (in WP and Word, not in OO)
@@ -1137,11 +1137,11 @@ void KoTextParag::drawLabel( TQPainter* p, int xLU, int yLU, int /*wLU*/, int /*
     // Now draw any bullet that is required over the space left for it.
     if ( m_layout.counter->isBullet() )
     {
-	int xBullet = xLeft + zh->tqlayoutUnitToPixelX( m_layout.counter->bulletX() );
+	int xBullet = xLeft + zh->layoutUnitToPixelX( m_layout.counter->bulletX() );
 
         //kdDebug(32500) << "KoTextParag::drawLabel xLU=" << xLU << " counterWidthLU=" << counterWidthLU << endl;
 	// The width and height of the bullet is the width of one space
-        int width = zh->tqlayoutUnitToPixelX( xLeft, format->width( ' ' ) );
+        int width = zh->layoutUnitToPixelX( xLeft, format->width( ' ' ) );
 
         //kdDebug(32500) << "Pix: xLeft=" << xLeft << " counterWidth=" << counterWidth
         //          << " xBullet=" << xBullet << " width=" << width << endl;
@@ -1387,14 +1387,14 @@ int KoTextParag::calculateLineSpacing( int line, int startChar, int lastChar ) c
 
 TQRect KoTextParag::pixelRect( KoTextZoomHandler *zh ) const
 {
-    TQRect rct( zh->tqlayoutUnitToPixel( rect() ) );
+    TQRect rct( zh->layoutUnitToPixel( rect() ) );
     //kdDebug(32500) << "   pixelRect for parag " << paragId()
     //               << ": rect=" << rect() << " pixelRect=" << rct << endl;
 
     // After division we almost always end up with the top overwriting the bottom of the parag above
     if ( prev() )
     {
-        TQRect prevRect( zh->tqlayoutUnitToPixel( prev()->rect() ) );
+        TQRect prevRect( zh->layoutUnitToPixel( prev()->rect() ) );
         if ( rct.top() < prevRect.bottom() + 1 )
         {
             //kdDebug(32500) << "   pixelRect: rct.top() adjusted to " << prevRect.bottom() + 1 << " (was " << rct.top() << ")" << endl;
@@ -1411,7 +1411,7 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
 {
 #ifdef DEBUG_PAINT
     kdDebug(32500) << "KoTextParag::paint =====  id=" << paragId() << " clipx=" << clipx << " clipy=" << clipy << " clipw=" << clipw << " cliph=" << cliph << endl;
-    kdDebug(32500) << " clipw in pix (approx) : " << textDocument()->paintingZoomHandler()->tqlayoutUnitToPixelX( clipw ) << " cliph in pix (approx) : " << textDocument()->paintingZoomHandler()->tqlayoutUnitToPixelX( cliph ) << endl;
+    kdDebug(32500) << " clipw in pix (approx) : " << textDocument()->paintingZoomHandler()->layoutUnitToPixelX( clipw ) << " cliph in pix (approx) : " << textDocument()->paintingZoomHandler()->layoutUnitToPixelX( cliph ) << endl;
 #endif
 
     KoTextZoomHandler * zh = textDocument()->paintingZoomHandler();
@@ -1420,13 +1420,13 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
     TQRect paraRect = pixelRect( zh );
 
     // Find left margin size, first line offset and right margin in pixels
-    int leftMarginPix = zh->tqlayoutUnitToPixelX( leftMargin() );
-    int firstLineOffset = zh->tqlayoutUnitToPixelX( firstLineMargin() );
+    int leftMarginPix = zh->layoutUnitToPixelX( leftMargin() );
+    int firstLineOffset = zh->layoutUnitToPixelX( firstLineMargin() );
 
     // The furthest left and right x-coords of the paragraph,
     // including the bullet/counter, but not the borders.
     int leftExtent = TQMIN ( leftMarginPix,  leftMarginPix + firstLineOffset );
-    int rightExtent = paraRect.width() - zh->tqlayoutUnitToPixelX( rightMargin() );
+    int rightExtent = paraRect.width() - zh->layoutUnitToPixelX( rightMargin() );
 
     // Draw the paragraph background color
     if ( backgroundColor().isValid() )
@@ -1470,7 +1470,7 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
         TQRect r;
         r.setLeft( leftExtent );
         r.setRight( rightExtent );
-        r.setTop( zh->tqlayoutUnitToPixelY(lineY( 0 )) );
+        r.setTop( zh->layoutUnitToPixelY(lineY( 0 )) );
 
         int lastLine = lines() - 1;
         // We need to start from the pixelRect, to make sure the bottom border is entirely painted.
@@ -1479,13 +1479,13 @@ void KoTextParag::paint( TQPainter &painter, const TQColorGroup &cg, KoTextCurso
         // If we don't have a bottom border, we need go as low as possible ( to touch the next parag's border ).
         // If we have a bottom border, then we rather exclude the linespacing. Looks nicer. OO does that too.
         if ( m_layout.bottomBorder.width() > 0 && drawBottomBorder)
-            paragBottom -= zh->tqlayoutUnitToPixelY( lineSpacing( lastLine ) );
+            paragBottom -= zh->layoutUnitToPixelY( lineSpacing( lastLine ) );
         paragBottom -= KoBorder::zoomWidthY( m_layout.bottomBorder.width(), zh, 0 );
         //kdDebug(32500) << "Parag border: paragBottom=" << paragBottom
         //               << " bottom border width = " << KoBorder::zoomWidthY( m_layout.bottomBorder.width(), zh, 0 ) << endl;
         r.setBottom( paragBottom );
 
-        //kdDebug(32500) << "KoTextParag::paint documentWidth=" << documentWidth() << " LU (" << zh->tqlayoutUnitToPixelX(documentWidth()) << " pixels) bordersRect=" << r << endl;
+        //kdDebug(32500) << "KoTextParag::paint documentWidth=" << documentWidth() << " LU (" << zh->layoutUnitToPixelX(documentWidth()) << " pixels) bordersRect=" << r << endl;
         KoBorder::drawBorders( painter, zh, r,
                                m_layout.leftBorder, m_layout.rightBorder, m_layout.topBorder, m_layout.bottomBorder,
                                0, TQPen(), drawTopBorder, drawBottomBorder );
@@ -1696,19 +1696,19 @@ void KoTextParag::drawParagString( TQPainter &painter, const TQString &str, int
     // Calculate offset (e.g. due to shadow on left or top)
     // Important: don't use the 2-args methods here, offsets are not heights
     // (0 should be 0, not 1) (#63256)
-    int shadowOffsetX_pix = zh->tqlayoutUnitToPixelX( format->offsetX() );
-    int shadowOffsetY_pix = zh->tqlayoutUnitToPixelY( format->offsetY() );
+    int shadowOffsetX_pix = zh->layoutUnitToPixelX( format->offsetX() );
+    int shadowOffsetY_pix = zh->layoutUnitToPixelY( format->offsetY() );
 
     // Calculate startX in pixels
-    int startX_pix = zh->tqlayoutUnitToPixelX( startX ) /* + at( rightToLeft ? start+len-1 : start )->pixelxadj */;
+    int startX_pix = zh->layoutUnitToPixelX( startX ) /* + at( rightToLeft ? start+len-1 : start )->pixelxadj */;
 #ifdef DEBUG_PAINT
     kdDebug(32500) << "KoTextParag::drawParagString startX in pixels : " << startX_pix /*<< " adjustment:" << at( rightToLeft ? start+len-1 : start )->pixelxadj*/ << " bw=" << bw << endl;
 #endif
 
-    int bw_pix = zh->tqlayoutUnitToPixelX( startX, bw );
-    int lastY_pix = zh->tqlayoutUnitToPixelY( lastY );
-    int baseLine_pix = zh->tqlayoutUnitToPixelY( lastY, baseLine ); // 2 args=>+1. Is that correct?
-    int h_pix = zh->tqlayoutUnitToPixelY( lastY, h );
+    int bw_pix = zh->layoutUnitToPixelX( startX, bw );
+    int lastY_pix = zh->layoutUnitToPixelY( lastY );
+    int baseLine_pix = zh->layoutUnitToPixelY( lastY, baseLine ); // 2 args=>+1. Is that correct?
+    int h_pix = zh->layoutUnitToPixelY( lastY, h );
 #ifdef DEBUG_PAINT
     kdDebug(32500) << "KoTextParag::drawParagString h(LU)=" << h << " lastY(LU)=" << lastY
                    << " h(PIX)=" << h_pix << " lastY(PIX)=" << lastY_pix
@@ -1772,7 +1772,7 @@ void KoTextParag::drawParagString( TQPainter &painter, const TQString &str, int
 
     if ( draw_len > 0 )
     {
-        int draw_startX_pix = zh->tqlayoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/;
+        int draw_startX_pix = zh->layoutUnitToPixelX( draw_startX ) /* + at( rightToLeft ? start+draw_len-1 : start )->pixelxadj*/;
         draw_startX_pix += shadowOffsetX_pix;
         lastY_pix += shadowOffsetY_pix;
 
@@ -2028,11 +2028,11 @@ bool KoTextParag::lineHyphenated( int l ) const
 void KoTextParag::drawCursor( TQPainter &painter, KoTextCursor *cursor, int curx, int cury, int curh, const TQColorGroup &cg )
 {
     KoTextZoomHandler * zh = textDocument()->paintingZoomHandler();
-    int x = zh->tqlayoutUnitToPixelX( curx ) /*+ cursor->parag()->at( cursor->index() )->pixelxadj*/;
-    //kdDebug(32500) << "  drawCursor: LU: [cur]x=" << curx << ", cury=" << cury << " -> PIX: x=" << x << ", y=" << zh->tqlayoutUnitToPixelY( cury ) << endl;
+    int x = zh->layoutUnitToPixelX( curx ) /*+ cursor->parag()->at( cursor->index() )->pixelxadj*/;
+    //kdDebug(32500) << "  drawCursor: LU: [cur]x=" << curx << ", cury=" << cury << " -> PIX: x=" << x << ", y=" << zh->layoutUnitToPixelY( cury ) << endl;
     KoTextParag::drawCursorDefault( painter, cursor, x,
-                            zh->tqlayoutUnitToPixelY( cury ),
-                            zh->tqlayoutUnitToPixelY( cury, curh ), cg );
+                            zh->layoutUnitToPixelY( cury ),
+                            zh->layoutUnitToPixelY( cury, curh ), cg );
 }
 
 // Reimplemented from KoTextParag
@@ -2407,7 +2407,7 @@ void KoTextParag::printRTDebug( int info )
         for ( int i = 0 ; i < s->length() ; ++i )
         {
             KoTextStringChar & ch = s->at(i);
-            int pixelx =  textDocument()->formattingZoomHandler()->tqlayoutUnitToPixelX( ch.x )
+            int pixelx =  textDocument()->formattingZoomHandler()->layoutUnitToPixelX( ch.x )
                           + ch.pixelxadj;
             if ( ch.lineStart )
                 kdDebug(32500) << "LINESTART" << endl;
@@ -2916,11 +2916,11 @@ void KoTextParag::saveOasis( KoXmlWriter& writer, KoSavingContext& context,
     KoGenStyles& mainStyles = context.mainStyles();
 
     // Write paragtqlayout to styles (with tqparent == the parag's style)
-    TQString tqparentStyleName;
+    TQString parentStyleName;
     if ( m_layout.style )
-        tqparentStyleName = m_layout.style->name();
+        parentStyleName = m_layout.style->name();
 
-    KoGenStyle autoStyle( KoGenStyle::STYLE_AUTO, "paragraph", tqparentStyleName );
+    KoGenStyle autoStyle( KoGenStyle::STYLE_AUTO, "paragraph", parentStyleName );
     paragFormat()->save( autoStyle, context );
     m_layout.saveOasis( autoStyle, context, false );
 
@@ -3116,7 +3116,7 @@ void KoTextParag::applyListStyle( KoOasisContext& context, int restartNumbering,
         double spaceBefore = KoUnit::parseValue( listStyleProperties.attributeNS( KoXmlNS::text, "space-before", TQString() ) );
         m_layout.margins[ TQStyleSheetItem::MarginLeft ] += spaceBefore; // added to left-margin, see 15.12 in spec.
     }
-    // need to call tqinvalidateCounters() ? Not during the initial loading at least.
+    // need to call invalidateCounters() ? Not during the initial loading at least.
 }
 
 int KoTextParag::documentWidth() const
@@ -3177,9 +3177,9 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
         //kdDebug() << "startX=" << startX << " bw=" << bw << " w=" << w << endl;
         int x;
         if ( rightToLeft )
-            x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
+            x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
         else
-            x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w;
+            x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w;
         int y = lastY_pix + baseLine_pix;
         //kdDebug() << "KWTextParag::drawFormattingChars drawing CR at " << x << "," << y << endl;
         painter.drawLine( (int)(x - size * 0.2), y - size, (int)(x - size * 0.2), y );
@@ -3189,7 +3189,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
         painter.drawArc( x - size, y - size, size, (int)(size / 2), -90*16, -180*16 );
 #ifdef DEBUG_FORMATTING
         painter.setPen( TQt::blue );
-        painter.drawRect( zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
+        painter.drawRect( zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
         TQPen pen( cg.color( TQColorGroup::Highlight ) );
         painter.setPen( pen );
 #endif
@@ -3206,7 +3206,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
             KoTextStringChar &ch = str->at(i);
 #ifdef DEBUG_FORMATTING
             painter.setPen( (i % 2)? TQt::red: TQt::green );
-            painter.drawRect( zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
+            painter.drawRect( zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ - 1, lastY_pix, ch.pixelwidth, baseLine_pix );
             TQPen pen( cg.color( TQColorGroup::Highlight ) );
             painter.setPen( pen );
 #endif
@@ -3217,10 +3217,10 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
             {
                 // Don't use ch.pixelwidth here. We want a square with
                 // the same size for all spaces, even the justified ones
-                int w = zh->tqlayoutUnitToPixelX( ch.format()->width( ' ' ) );
-                int height = zh->tqlayoutUnitToPixelY( ch.ascent() );
+                int w = zh->layoutUnitToPixelX( ch.format()->width( ' ' ) );
+                int height = zh->layoutUnitToPixelY( ch.ascent() );
                 int size = TQMAX( 2, TQMIN( w/2, height/3 ) ); // Enfore that it's a square, and that it's visible
-                int x = zh->tqlayoutUnitToPixelX( ch.x ); // + ch.pixelxadj;
+                int x = zh->layoutUnitToPixelX( ch.x ); // + ch.pixelxadj;
                 TQRect spcRect( x + (ch.pixelwidth - size) / 2, lastY_pix + baseLine_pix - (height - size) / 2, size, size );
                 if ( ch.c == ' ' )
                     painter.drawRect( spcRect );
@@ -3234,15 +3234,15 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
                   //kdDebug() << "tab x=" << ch.x << " nextch.x=" << nextch.x
                   //          << " nextx=" << nextx << " startX=" << startX << " bw=" << bw << endl;
                   int availWidth = nextx - ch.x - 1;
-                  availWidth=zh->tqlayoutUnitToPixelX(availWidth);*/
+                  availWidth=zh->layoutUnitToPixelX(availWidth);*/
 
                 int availWidth = ch.pixelwidth;
 
                 KoTextFormat* format = ch.format();
-                int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + availWidth / 2;
+                int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + availWidth / 2;
                 int charWidth = format->screenFontMetrics( zh ).width( 'W' );
                 int size = TQMIN( availWidth, charWidth ) / 2 ; // actually the half size
-                int y = lastY_pix + baseLine_pix - zh->tqlayoutUnitToPixelY( ch.ascent()/2 );
+                int y = lastY_pix + baseLine_pix - zh->layoutUnitToPixelY( ch.ascent()/2 );
                 int arrowsize = zh->zoomItY( 2 );
                 painter.drawLine( x - size, y, x + size, y );
                 if ( rightToLeft )
@@ -3269,7 +3269,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
                 //kdDebug() << "KWTextParag::drawFormattingChars drawing Line Break at " << x << "," << y << endl;
                 if ( rightToLeft )
                 {
-                    int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
+                    int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + ch.pixelwidth - 1;
                     painter.drawLine( x - size, y - size, x - size, y );
                     painter.drawLine( x - size, y, (int)(x - size * 0.3), y );
                     // Now the arrow
@@ -3278,7 +3278,7 @@ void KoTextParag::drawFormattingChars( TQPainter &painter, int start, int len,
                 }
                 else
                 {
-                    int x = zh->tqlayoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w - 1;
+                    int x = zh->layoutUnitToPixelX( ch.x ) /*+ ch.pixelxadj*/ + w - 1;
                     painter.drawLine( x, y - size, x, y );
                     painter.drawLine( x, y, (int)(x - size * 0.7), y );
                     // Now the arrow
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index 486a4ae3..4ccc2196 100644
--- a/lib/kotext/KoTextParag.h
+++ b/lib/kotext/KoTextParag.h
@@ -350,7 +350,7 @@ public:
 #endif
 
 protected:
-    void tqinvalidateCounters();
+    void invalidateCounters();
     bool lineHyphenated( int l ) const;
 
     void paintLines( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections,
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index 68df4992..cea0fae1 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -328,7 +328,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ
                 }
                 if ( !text.isEmpty() )
                 {
-                    // Bidi support: need to reverse mirrored chars (e.g. tqparenthesis)
+                    // Bidi support: need to reverse mirrored chars (e.g. parenthesis)
                     KoTextParag *p = m_cursor->parag();
                     if ( p && p->string() && p->string()->isRightToLeft() ) {
                         TQChar *c = (TQChar *)text.tqunicode();
diff --git a/lib/kotext/KoTextZoomHandler.cpp b/lib/kotext/KoTextZoomHandler.cpp
index acd2285d..e9fc430f 100644
--- a/lib/kotext/KoTextZoomHandler.cpp
+++ b/lib/kotext/KoTextZoomHandler.cpp
@@ -36,39 +36,39 @@ int KoTextZoomHandler::fontSizeToLayoutUnit( double ptSizeFloat, bool forPrint )
 }
 #endif
 
-double KoTextZoomHandler::tqlayoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const
+double KoTextZoomHandler::layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const
 {
     // TQt will use TQPaintDevice::x11AppDpiY() to go from pt to pixel for fonts
-    return tqlayoutUnitPtToPt( luSize ) * m_zoomedResolutionY
+    return layoutUnitPtToPt( luSize ) * m_zoomedResolutionY
 #ifdef Q_WS_X11
         / POINT_TO_INCH(TQPaintDevice::x11AppDpiY())
 #endif
         ;
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelX( int x, int w ) const
+int KoTextZoomHandler::layoutUnitToPixelX( int x, int w ) const
 {
-    // We call tqlayoutUnitToPixelX on the right value, i.e. x+w-1,
+    // We call layoutUnitToPixelX on the right value, i.e. x+w-1,
     // and then determine the height from the result (i.e. right-left+1).
-    // Calling tqlayoutUnitToPixelX(w) leads to rounding problems.
-    return tqlayoutUnitToPixelY( x + w - 1 ) - tqlayoutUnitToPixelY( x ) + 1;
+    // Calling layoutUnitToPixelX(w) leads to rounding problems.
+    return layoutUnitToPixelY( x + w - 1 ) - layoutUnitToPixelY( x ) + 1;
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelY( int y, int h ) const
+int KoTextZoomHandler::layoutUnitToPixelY( int y, int h ) const
 {
-    // We call tqlayoutUnitToPixelY on the bottom value, i.e. y+h-1,
+    // We call layoutUnitToPixelY on the bottom value, i.e. y+h-1,
     // and then determine the height from the result (i.e. bottom-top+1).
-    // Calling tqlayoutUnitToPixelY(h) leads to rounding problems.
-    return tqlayoutUnitToPixelY( y + h - 1 ) - tqlayoutUnitToPixelY( y ) + 1;
+    // Calling layoutUnitToPixelY(h) leads to rounding problems.
+    return layoutUnitToPixelY( y + h - 1 ) - layoutUnitToPixelY( y ) + 1;
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelX( int lupix ) const
+int KoTextZoomHandler::layoutUnitToPixelX( int lupix ) const
 {
     return int( static_cast<double>( lupix * m_zoomedResolutionX )
                 / ( static_cast<double>( m_layoutUnitFactor ) * m_resolutionX ) );
 }
 
-int KoTextZoomHandler::tqlayoutUnitToPixelY( int lupix ) const
+int KoTextZoomHandler::layoutUnitToPixelY( int lupix ) const
 {
     // tqRound replaced with a truncation, too many problems (e.g. bottom of parags)
     return int( static_cast<double>( lupix * m_zoomedResolutionY )
diff --git a/lib/kotext/KoTextZoomHandler.h b/lib/kotext/KoTextZoomHandler.h
index 81211086..f8c2ef12 100644
--- a/lib/kotext/KoTextZoomHandler.h
+++ b/lib/kotext/KoTextZoomHandler.h
@@ -23,7 +23,7 @@
 #include <KoZoomHandler.h>
 
 /**
- * This class extends KoZoomHandler to add support for WYSIWYG text tqlayouting.
+ * This class extends KoZoomHandler to add support for WYSIWYG text layouting.
  */
 class KOTEXT_EXPORT KoTextZoomHandler : public KoZoomHandler
 {
@@ -31,7 +31,7 @@ public:
     KoTextZoomHandler() {}
     virtual ~KoTextZoomHandler() {}
 
-    //// Support for WYSIWYG text tqlayouting /////
+    //// Support for WYSIWYG text layouting /////
 
     /** The "[zoomed] view pixel" -> "tqlayout unit pixel" conversions. */
     int pixelToLayoutUnitX( int x ) const;
@@ -44,22 +44,22 @@ public:
                     pixelToLayoutUnit( r.bottomRight() ) ); }
 
     /** The "tqlayout unit pixel" -> "[zoomed] view pixel" conversions. */
-    int tqlayoutUnitToPixelX( int lupix ) const;
-    int tqlayoutUnitToPixelY( int lupix ) const;
+    int layoutUnitToPixelX( int lupix ) const;
+    int layoutUnitToPixelY( int lupix ) const;
 
     /** This variant converts a width, using a reference X position.
      * This prevents rounding problems. */
-    int tqlayoutUnitToPixelX( int x, int w ) const;
+    int layoutUnitToPixelX( int x, int w ) const;
     /** This variant converts a height, using a reference Y position.
      * This prevents rounding problems. */
-    int tqlayoutUnitToPixelY( int y, int h ) const;
+    int layoutUnitToPixelY( int y, int h ) const;
 
-    TQPoint tqlayoutUnitToPixel( const TQPoint &p ) const
-    { return TQPoint( tqlayoutUnitToPixelX( p.x() ),
-                     tqlayoutUnitToPixelY( p.y() ) ); }
-    TQRect tqlayoutUnitToPixel( const TQRect &r ) const
-    { return TQRect( tqlayoutUnitToPixel( r.topLeft() ),
-                    tqlayoutUnitToPixel( r.bottomRight() ) ); }
+    TQPoint layoutUnitToPixel( const TQPoint &p ) const
+    { return TQPoint( layoutUnitToPixelX( p.x() ),
+                     layoutUnitToPixelY( p.y() ) ); }
+    TQRect layoutUnitToPixel( const TQRect &r ) const
+    { return TQRect( layoutUnitToPixel( r.topLeft() ),
+                    layoutUnitToPixel( r.bottomRight() ) ); }
 
     /** Basic pt to pixel and pixel to pt conversions, valid at any zoom level,
         as well as at the Layout Unit level (and mostly useful for Layout Units).
@@ -92,11 +92,11 @@ public:
      * Given the font size for the font in tqlayout units, in pt (use pointSize())
      * this returns the font size to use on screen the current zoom, in pt (use setPointSizeFloat()),
      */
-    double tqlayoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const;
+    double layoutUnitToFontSize( int luSize, bool /*forPrint*/ ) const;
 
     // Note: For converting fontsizes from/to tqlayout units and zoom-independent
     // pt sizes (like the one the user sees, e.g. 12pt),
-    // use ptToLayoutUnit and tqlayoutUnitToPt, not tqlayoutToFontSize.
+    // use ptToLayoutUnit and layoutUnitToPt, not layoutToFontSize.
 
 
     // The conversions below convert between an internal text tqlayout resolution of
@@ -122,11 +122,11 @@ public:
     { return KoRect( ptToLayoutUnitPt( r.topLeft() ),
                      ptToLayoutUnitPt( r.bottomRight() ) ); }
 
-    static double tqlayoutUnitPtToPt( double lupt )
+    static double layoutUnitPtToPt( double lupt )
     { return lupt / static_cast<double>( m_layoutUnitFactor ); }
-    static KoPoint tqlayoutUnitPtToPt( const KoPoint& p )
-    { return KoPoint( tqlayoutUnitPtToPt( p.x() ),
-                      tqlayoutUnitPtToPt( p.y() ) ); }
+    static KoPoint layoutUnitPtToPt( const KoPoint& p )
+    { return KoPoint( layoutUnitPtToPt( p.x() ),
+                      layoutUnitPtToPt( p.y() ) ); }
 
 protected:
     /** This being static ensures that the same value is used by all KoTextZoomHandler instances */
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index e333eb36..bd03ecf9 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -165,10 +165,10 @@ void KoVariableSettings::loadOasis(const KoOasisSettings&settingsDoc)
     }
 }
 
-void KoVariableSettings::save( TQDomElement &tqparentElem )
+void KoVariableSettings::save( TQDomElement &parentElem )
 {
-     TQDomElement elem = tqparentElem.ownerDocument().createElement( "VARIABLESETTINGS" );
-     tqparentElem.appendChild( elem );
+     TQDomElement elem = parentElem.ownerDocument().createElement( "VARIABLESETTINGS" );
+     parentElem.appendChild( elem );
     if(m_startingPageNumber!=1)
     {
         elem.setAttribute( "startingPageNumber", m_startingPageNumber );
@@ -991,18 +991,18 @@ void KoVariable::drawCustomItemHelper( TQPainter* p, int x, int y, int wpix, int
         // Do like KoTextFormatter: do the tqlayout in tqlayout units.
         xLU += KoTextZoomHandler::ptToLayoutUnitPt( fm.width( ch ) );
         // And then compute the X position in pixels from the tqlayout unit X.
-        x = zh->tqlayoutUnitToPixelX( xLU );
+        x = zh->layoutUnitToPixelX( xLU );
     }
 
     p->restore();
 }
 
-void KoVariable::save( TQDomElement &tqparentElem )
+void KoVariable::save( TQDomElement &parentElem )
 {
     //kdDebug(32500) << "KoVariable::save" << endl;
-    TQDomElement variableElem = tqparentElem.ownerDocument().createElement( "VARIABLE" );
-    tqparentElem.appendChild( variableElem );
-    TQDomElement typeElem = tqparentElem.ownerDocument().createElement( "TYPE" );
+    TQDomElement variableElem = parentElem.ownerDocument().createElement( "VARIABLE" );
+    parentElem.appendChild( variableElem );
+    TQDomElement typeElem = parentElem.ownerDocument().createElement( "TYPE" );
     variableElem.appendChild( typeElem );
     typeElem.setAttribute( "type", static_cast<int>( type() ) );
 
@@ -1490,10 +1490,10 @@ void KoTimeVariable::recalc()
 }
 
 
-void KoTimeVariable::saveVariable( TQDomElement& tqparentElem )
+void KoTimeVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "TIME" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "TIME" );
+    parentElem.appendChild( elem );
 
     TQTime time = m_varValue.toTime();
     time = time.addSecs(-60*m_correctTime);
@@ -1687,10 +1687,10 @@ TQString KoCustomVariable::text(bool realValue)
 
 
 
-void KoCustomVariable::saveVariable( TQDomElement& tqparentElem )
+void KoCustomVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "CUSTOM" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "CUSTOM" );
+    parentElem.appendChild( elem );
     elem.setAttribute( "name", m_varValue.toString() );
     elem.setAttribute( "value", value() );
 }
@@ -1777,10 +1777,10 @@ void KoMailMergeVariable::saveOasis( KoXmlWriter& /*writer*/, KoSavingContext& /
 
 
 
-void KoMailMergeVariable::saveVariable( TQDomElement& tqparentElem )
+void KoMailMergeVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "MAILMERGE" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "MAILMERGE" );
+    parentElem.appendChild( elem );
     elem.setAttribute( "name", m_varValue.toString() );
 }
 
@@ -1837,10 +1837,10 @@ TQString KoPageVariable::fieldCode()
 }
 
 
-void KoPageVariable::saveVariable( TQDomElement& tqparentElem )
+void KoPageVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement pgNumElem = tqparentElem.ownerDocument().createElement( "PGNUM" );
-    tqparentElem.appendChild( pgNumElem );
+    TQDomElement pgNumElem = parentElem.ownerDocument().createElement( "PGNUM" );
+    parentElem.appendChild( pgNumElem );
     pgNumElem.setAttribute( "subtype", m_subtype );
     if ( m_subtype != VST_CURRENT_SECTION )
         pgNumElem.setAttribute( "value", m_varValue.toInt() );
@@ -2046,11 +2046,11 @@ TQString KoFieldVariable::text(bool realValue)
 } // use a format when they are customizable
 
 
-void KoFieldVariable::saveVariable( TQDomElement& tqparentElem )
+void KoFieldVariable::saveVariable( TQDomElement& parentElem )
 {
     //kdDebug(32500) << "KoFieldVariable::saveVariable" << endl;
-    TQDomElement elem = tqparentElem.ownerDocument().createElement( "FIELD" );
-    tqparentElem.appendChild( elem );
+    TQDomElement elem = parentElem.ownerDocument().createElement( "FIELD" );
+    parentElem.appendChild( elem );
     elem.setAttribute( "subtype", m_subtype );
     elem.setAttribute( "value", m_varValue.toString() );
 }
@@ -2455,10 +2455,10 @@ TQString KoLinkVariable::text(bool realValue)
         return value();
 }
 
-void KoLinkVariable::saveVariable( TQDomElement& tqparentElem )
+void KoLinkVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement linkElem = tqparentElem.ownerDocument().createElement( "LINK" );
-    tqparentElem.appendChild( linkElem );
+    TQDomElement linkElem = parentElem.ownerDocument().createElement( "LINK" );
+    parentElem.appendChild( linkElem );
     linkElem.setAttribute( "linkName", m_varValue.toString() );
     linkElem.setAttribute( "hrefName", m_url );
 }
@@ -2557,10 +2557,10 @@ void KoNoteVariable::saveOasis( KoXmlWriter& writer, KoSavingContext& /*context*
     writer.endElement();
 }
 
-void KoNoteVariable::saveVariable( TQDomElement& tqparentElem )
+void KoNoteVariable::saveVariable( TQDomElement& parentElem )
 {
-    TQDomElement linkElem = tqparentElem.ownerDocument().createElement( "NOTE" );
-    tqparentElem.appendChild( linkElem );
+    TQDomElement linkElem = parentElem.ownerDocument().createElement( "NOTE" );
+    parentElem.appendChild( linkElem );
     linkElem.setAttribute( "note", m_varValue.toString() );
 }
 
diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h
index e0a5a530..88f17975 100644
--- a/lib/kotext/KoVariable.h
+++ b/lib/kotext/KoVariable.h
@@ -85,7 +85,7 @@ class KOTEXT_EXPORT KoVariableSettings
     bool displayFieldCode() const { return m_displayFieldCode; }
     void setDisplayFieldCode( bool b) { m_displayFieldCode=b; }
 
-    virtual void save( TQDomElement &tqparentElem );
+    virtual void save( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
 
     TQDateTime lastPrintingDate() const;
@@ -413,7 +413,7 @@ public:
     void recalcAndRepaint();
 
     /** Save the variable. Public API, does the common job and then calls saveVariable. */
-    virtual void save( TQDomElement &tqparentElem );
+    virtual void save( TQDomElement &parentElem );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
@@ -438,7 +438,7 @@ public:
 
 protected:
     /** Variable should reimplement this to implement saving. */
-    virtual void saveVariable( TQDomElement &tqparentElem ) = 0;
+    virtual void saveVariable( TQDomElement &parentElem ) = 0;
     virtual int correctValue() const { return 0;}
 
     KoVariableFormat *m_varFormat;
@@ -472,7 +472,7 @@ public:
     virtual void resize();
     void setDate( const TQDate & _date ) { m_varValue = TQVariant(_date); }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual int correctValue() const { return m_correctDate;}
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
@@ -518,7 +518,7 @@ public:
 
     void setTime( const TQTime & _time ) { m_varValue = TQVariant(_time); }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual int correctValue() const { return m_correctTime;}
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
@@ -557,7 +557,7 @@ public:
     { return VT_CUSTOM; }
     static TQStringList actionTexts();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -598,7 +598,7 @@ public:
     virtual VariableType type() const
     { return VT_FIELD; }
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -640,7 +640,7 @@ public:
     static TQStringList actionTexts();
     virtual TQString fieldCode();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -684,7 +684,7 @@ public:
 
     virtual void recalc() = 0;
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -705,7 +705,7 @@ public:
     static TQStringList actionTexts();
     virtual TQString fieldCode();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -740,7 +740,7 @@ public:
     static TQStringList actionTexts();
     virtual TQString fieldCode();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
@@ -782,7 +782,7 @@ public:
 
     virtual TQStringList subTypeList();
 
-    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void saveVariable( TQDomElement &parentElem );
     virtual void load( TQDomElement &elem );
     virtual void loadOasis( const TQDomElement &elem, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
diff --git a/lib/kotext/kodecorationtabbase.ui b/lib/kotext/kodecorationtabbase.ui
index 31e7b464..cd8f17f2 100644
--- a/lib/kotext/kodecorationtabbase.ui
+++ b/lib/kotext/kodecorationtabbase.ui
@@ -341,7 +341,7 @@
         <data format="PNG" length="96">89504e470d0a1a0a0000000d49484452000000140000001408060000008d891d0d0000002749444154388d63601805c31f3022b1ffc309d20c40368381895217a1835103478281a360240000f61e021097bbc8b20000000049454e44ae426082</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/lib/kotext/kofonttabbase.ui b/lib/kotext/kofonttabbase.ui
index 32800dd8..fa8b9ba4 100644
--- a/lib/kotext/kofonttabbase.ui
+++ b/lib/kotext/kofonttabbase.ui
@@ -18,7 +18,7 @@
                     </widget>
                 </vbox>
             </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includes>
 	<include location="local" impldecl="in declaration">KFontDialog_local.h</include>
 </includes>
diff --git a/lib/kotext/kohighlightingtabbase.ui b/lib/kotext/kohighlightingtabbase.ui
index 3f0b8512..27be0702 100644
--- a/lib/kotext/kohighlightingtabbase.ui
+++ b/lib/kotext/kohighlightingtabbase.ui
@@ -129,7 +129,7 @@
         </spacer>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/lib/kotext/kolanguagetabbase.ui b/lib/kotext/kolanguagetabbase.ui
index f280097e..a9073584 100644
--- a/lib/kotext/kolanguagetabbase.ui
+++ b/lib/kotext/kolanguagetabbase.ui
@@ -69,7 +69,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui
index 9a8e4a93..471607d4 100644
--- a/lib/kotext/kolayouttabbase.ui
+++ b/lib/kotext/kolayouttabbase.ui
@@ -288,7 +288,7 @@
     <include location="global" impldecl="in declaration">knuminput.h</include>
     <include location="global" impldecl="in declaration">klocale.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/lib/kotext/timedateformatwidget.ui b/lib/kotext/timedateformatwidget.ui
index fbd342cb..830b3bdb 100644
--- a/lib/kotext/timedateformatwidget.ui
+++ b/lib/kotext/timedateformatwidget.ui
@@ -210,7 +210,7 @@
     <slot>comboActivated()</slot>
     <slot>updateLabel()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index 7b9a927d..781f344b 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -57,8 +57,8 @@ namespace Kross { namespace Api {
 class ScriptNewStuff : public KNewStuffSecure
 {
     public:
-        ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *tqparentWidget = 0)
-            : KNewStuffSecure(type, tqparentWidget)
+        ScriptNewStuff(ScriptGUIClient* scripguiclient, const TQString& type, TQWidget *parentWidget = 0)
+            : KNewStuffSecure(type, parentWidget)
             , m_scripguiclient(scripguiclient) {}
         virtual ~ScriptNewStuff() {}
     private:
@@ -73,11 +73,11 @@ class ListItem : public TQListViewItem
         ScriptActionCollection* m_collection;
         ScriptAction::Ptr m_action;
     public:
-        ListItem(TQListView* tqparentview, ScriptActionCollection* collection)
-            : TQListViewItem(tqparentview), m_collection(collection), m_action(0) {}
+        ListItem(TQListView* parentview, ScriptActionCollection* collection)
+            : TQListViewItem(parentview), m_collection(collection), m_action(0) {}
 
-        ListItem(ListItem* tqparentitem, TQListViewItem* afteritem, ScriptAction::Ptr action)
-            : TQListViewItem(tqparentitem, afteritem), m_collection( tqparentitem->collection() ), m_action(action) {}
+        ListItem(ListItem* parentitem, TQListViewItem* afteritem, ScriptAction::Ptr action)
+            : TQListViewItem(parentitem, afteritem), m_collection( parentitem->collection() ), m_action(action) {}
 
         ScriptAction::Ptr action() const { return m_action; }
         ScriptActionCollection* collection() const { return m_collection; }
@@ -206,12 +206,12 @@ void WdgScriptsManager::addItem(ScriptActionCollection* collection)
         lastitem = addItem(*it, i, lastitem);
 }
 
-TQListViewItem* WdgScriptsManager::addItem(ScriptAction::Ptr action, TQListViewItem* tqparentitem, TQListViewItem* afteritem)
+TQListViewItem* WdgScriptsManager::addItem(ScriptAction::Ptr action, TQListViewItem* parentitem, TQListViewItem* afteritem)
 {
     if(! action)
         return 0;
 
-    ListItem* i = new ListItem(dynamic_cast<ListItem*>(tqparentitem), afteritem, action);
+    ListItem* i = new ListItem(dynamic_cast<ListItem*>(parentitem), afteritem, action);
     i->setText(0, action->text()); // FIXME: i18nise it for ko2.0
     //i->setText(1, action->getDescription()); // FIXME: i18nise it for ko2.0
     //i->setText(2, action->name());
diff --git a/lib/kross/main/wdgscriptsmanager.h b/lib/kross/main/wdgscriptsmanager.h
index b953f862..34976373 100644
--- a/lib/kross/main/wdgscriptsmanager.h
+++ b/lib/kross/main/wdgscriptsmanager.h
@@ -53,7 +53,7 @@ class WdgScriptsManager : public WdgScriptsManagerBase
     private:
         WdgScriptsManagerPrivate* d;
         void addItem(ScriptActionCollection* collection);
-        TQListViewItem* addItem(ScriptAction::Ptr, TQListViewItem* tqparentitem, TQListViewItem* afteritem);
+        TQListViewItem* addItem(ScriptAction::Ptr, TQListViewItem* parentitem, TQListViewItem* afteritem);
 };
 
 }}
diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui
index 22ad3867..379fb2db 100644
--- a/lib/kross/main/wdgscriptsmanagerbase.ui
+++ b/lib/kross/main/wdgscriptsmanagerbase.ui
@@ -233,7 +233,7 @@
         <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
     </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>ktoolbar.h</includehint>
diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py
index b8edbe9c..89a07066 100755
--- a/lib/kross/python/scripts/gui.py
+++ b/lib/kross/python/scripts/gui.py
@@ -371,26 +371,26 @@ class Dialog:
 	def close(self):
 		self.dialog.close()
 
-	def addFrame(self, tqparentwidget):
-		return self.dialog.Frame(self.dialog, tqparentwidget.widget)
+	def addFrame(self, parentwidget):
+		return self.dialog.Frame(self.dialog, parentwidget.widget)
 
-	def addLabel(self, tqparentwidget, caption):
-		return self.dialog.Label(self.dialog, tqparentwidget.widget, caption)
+	def addLabel(self, parentwidget, caption):
+		return self.dialog.Label(self.dialog, parentwidget.widget, caption)
 
-	def addCheckBox(self, tqparentwidget, caption, checked = True):
-		return self.dialog.CheckBox(self.dialog, tqparentwidget.widget, caption, checked)
+	def addCheckBox(self, parentwidget, caption, checked = True):
+		return self.dialog.CheckBox(self.dialog, parentwidget.widget, caption, checked)
 
-	def addButton(self, tqparentwidget, caption, commandmethod):
-		return self.dialog.Button(self.dialog, tqparentwidget.widget, caption, commandmethod)
+	def addButton(self, parentwidget, caption, commandmethod):
+		return self.dialog.Button(self.dialog, parentwidget.widget, caption, commandmethod)
 
-	def addEdit(self, tqparentwidget, caption, text):
-		return self.dialog.Edit(self.dialog, tqparentwidget.widget, caption, text)
+	def addEdit(self, parentwidget, caption, text):
+		return self.dialog.Edit(self.dialog, parentwidget.widget, caption, text)
 
-	def addFileChooser(self, tqparentwidget, caption, initialfile = None, filetypes = None):
-		return self.dialog.FileChooser(self.dialog, tqparentwidget.widget, caption, initialfile, filetypes)
+	def addFileChooser(self, parentwidget, caption, initialfile = None, filetypes = None):
+		return self.dialog.FileChooser(self.dialog, parentwidget.widget, caption, initialfile, filetypes)
 
-	def addList(self, tqparentwidget, caption, items):
-		return self.dialog.List(self.dialog, tqparentwidget.widget, caption, items)
+	def addList(self, parentwidget, caption, items):
+		return self.dialog.List(self.dialog, parentwidget.widget, caption, items)
 		
 	def showMessageBox(self, typename, caption, message):
 		return self.dialog.MessageBox(self.dialog, typename, caption, message)
diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp
index 6b2bf039..4260f76f 100644
--- a/lib/store/KoXmlWriter.cpp
+++ b/lib/store/KoXmlWriter.cpp
@@ -105,9 +105,9 @@ void KoXmlWriter::startElement( const char* tagName, bool indentInside )
     Q_ASSERT( tagName != 0 );
 
     // Tell tqparent that it has tqchildren
-    bool tqparentIndent = prepareForChild();
+    bool parentIndent = prepareForChild();
 
-    m_tags.push( Tag( tagName, tqparentIndent && indentInside ) );
+    m_tags.push( Tag( tagName, parentIndent && indentInside ) );
     writeChar( '<' );
     writeCString( tagName );
     //kdDebug() << k_funcinfo << tagName << endl;
diff --git a/lib/store/fix_storage.pl b/lib/store/fix_storage.pl
index ba605616..8b13a397 100644
--- a/lib/store/fix_storage.pl
+++ b/lib/store/fix_storage.pl
@@ -62,9 +62,9 @@ sub dumpTree {
 
 # Finds the files where we have to fix part references (->maindoc.xml)
 sub findCandidates {
-  my($dref, $currentdir, $tqparentdir) = @_;
+  my($dref, $currentdir, $parentdir) = @_;
   my @dir = @{$dref};
-  #print "current: $currentdir, tqparentdir: $tqparentdir\n";
+  #print "current: $currentdir, parentdir: $parentdir\n";
   foreach(@dir) {
     if(ref($_) eq 'ARRAY') {
       #print $_->[0], "   (", $_->[1], ")\n";
@@ -72,8 +72,8 @@ sub findCandidates {
     }
     else {
       if($_ =~ m/maindoc\.xml/) {
-	my $source = $tqparentdir . '/' . $currentdir . "/maindoc.xml";
-	my $dest = $tqparentdir . '/' . $currentdir . ".xml";
+	my $source = $parentdir . '/' . $currentdir . "/maindoc.xml";
+	my $dest = $parentdir . '/' . $currentdir . ".xml";
 	push(@needFixing, [ $source, $dest ]);
       }
     }
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.cpp b/tools/kfile-plugins/ooo/kfile_ooo.cpp
index ee3a5bcc..8d72d076 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.cpp
+++ b/tools/kfile-plugins/ooo/kfile_ooo.cpp
@@ -361,22 +361,22 @@ void KOfficePlugin::addAttributeInfo(const TQDomElement & elem, KFileMetaInfoGro
 }
 
 bool KOfficePlugin::writeTextNode(TQDomDocument & doc,
-				  TQDomNode & tqparentNode,
+				  TQDomNode & parentNode,
 				  const TQString  &nodeName,
 				  const TQString  &value) const
 {
-  if (tqparentNode.toElement().isNull()){
+  if (parentNode.toElement().isNull()){
     kdDebug(7034) << "Parent node is Null or not an Element, cannot write node "
 		  << nodeName << endl;
     return false;
   }
 
   // If the node does not exist, we create it...
-  if (tqparentNode.namedItem(nodeName).isNull())
-    TQDomNode ex = tqparentNode.appendChild(doc.createElement(nodeName));
+  if (parentNode.namedItem(nodeName).isNull())
+    TQDomNode ex = parentNode.appendChild(doc.createElement(nodeName));
 
   // Now, we are sure we have a node
-  TQDomElement nodeA = tqparentNode.namedItem(nodeName).toElement();
+  TQDomElement nodeA = parentNode.namedItem(nodeName).toElement();
 
   // Ooops... existing node were not of the good type...
   if (nodeA.isNull()){
diff --git a/tools/kfile-plugins/ooo/kfile_ooo.h b/tools/kfile-plugins/ooo/kfile_ooo.h
index 9c2c3213..b8604260 100644
--- a/tools/kfile-plugins/ooo/kfile_ooo.h
+++ b/tools/kfile-plugins/ooo/kfile_ooo.h
@@ -59,7 +59,7 @@ public:
 					 const char* name) const;
 private:
     bool writeTextNode(TQDomDocument & doc,
-		       TQDomNode & tqparentNode,
+		       TQDomNode & parentNode,
 		       const TQString  &nodeName,
 		       const TQString  &value) const;
     KFileMimeTypeInfo::GroupInfo* userdefined;
diff --git a/tools/thesaurus/thesaurus.txt b/tools/thesaurus/thesaurus.txt
index b5fe7799..8b182981 100644
--- a/tools/thesaurus/thesaurus.txt
+++ b/tools/thesaurus/thesaurus.txt
@@ -2250,7 +2250,7 @@
 ;normal;#;perpendicular;
 ;right;#;perpendicular;
 ;minor;venial;#;pardonable;
-;tqparental;maternal;paternal;#
+;parental;maternal;paternal;#
 ;partial;unfair;#;biased;colored;coloured;one-sided;slanted;
 ;biased;colored;coloured;one-sided;slanted;#;partial;unfair;
 ;impartial;fair;#;disinterested;dispassionate;indifferent;unbiased;unbiassed;indifferent;
@@ -2452,7 +2452,7 @@
 ;elementary;primary;#;basic;
 ;fundamental;rudimentary;underlying;#;basic;
 ;radical;root;#;basic;
-;incidental;incident;#;tqparenthetic;tqparenthetical;secondary;side;by;bye;peripheral;
+;incidental;incident;#;parenthetic;parenthetical;secondary;side;by;bye;peripheral;
 ;secondary;#;incidental;incident;
 ;private;#;backstage;clannish;cliquish;clubby;snobbish;snobby;cloistered;reclusive;secluded;sequestered;close;closet;confidential;secret;confidential;insular;nonpublic;offstage;one-on-one;privy;secluded;secret;tete-a-tete;toffee-nosed;closed-door;
 ;close;#;private;
@@ -3524,8 +3524,8 @@
 ;indeed;so;#
 ;in truth;really;truly;forsooth;#
 ;naturally;of course;course;#
-;obviously;evidently;manifestly;patently;aptqparently;plainly;plain;#
-;aptqparently;seemingly;ostensibly;on the face of it;#
+;obviously;evidently;manifestly;patently;apparently;plainly;plain;#
+;apparently;seemingly;ostensibly;on the face of it;#
 ;again;once again;once more;over again;#
 ;generally;in general;in the main;#
 ;fortunately;fortuitously;luckily;as luck would have it;#
@@ -5014,7 +5014,7 @@
 ;presentation;#;activity;
 ;exposure;#;presentation;
 ;tqmask;#;concealment;concealing;hiding;
-;cover;covering;screening;tqmasking;#;concealment;concealing;hiding;
+;cover;covering;screening;masking;#;concealment;concealing;hiding;
 ;burying;burial;#;concealment;concealing;hiding;
 ;placement;location;locating;position;positioning;emplacement;#;activity;
 ;orientation;#;placement;location;locating;position;positioning;emplacement;
@@ -8969,7 +8969,7 @@
 ;message;content;subject matter;substance;#;communication;
 ;subject;topic;theme;#;message;content;subject matter;substance;
 ;precedent;#;subject;topic;theme;
-;digression;aside;excursus;divagation;tqparenthesis;#;message;content;subject matter;substance;
+;digression;aside;excursus;divagation;parenthesis;#;message;content;subject matter;substance;
 ;meaning;significance;signification;import;#;message;content;subject matter;substance;
 ;sense;signified;#;meaning;significance;signification;import;
 ;effect;essence;burden;core;gist;#;meaning;significance;signification;import;
@@ -9704,7 +9704,7 @@
 ;discovery;#;disclosure;revelation;revealing;
 ;discovery;#;disclosure;revelation;revealing;
 ;exposure;#;disclosure;revelation;revealing;
-;expose;untqmasking;#;exposure;
+;expose;unmasking;#;exposure;
 ;admission;#;acknowledgment;acknowledgement;
 ;concession;#;agreement;
 ;presentation;introduction;intro;#;informing;making known;
@@ -10453,7 +10453,7 @@
 ;interest;interest group;#;social group;
 ;kin;kin group;kinship group;kindred;clan;tribe;#;social group;
 ;family;family unit;#;kin;kin group;kinship group;kindred;clan;tribe;
-;family;family line;folk;kinfolk;kinsfolk;sept;phratry;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;
+;family;family line;folk;kinfolk;kinsfolk;sept;phratry;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;
 ;people;#;family;family line;folk;kinfolk;kinsfolk;sept;phratry;
 ;house;#;family;family line;folk;kinfolk;kinsfolk;sept;phratry;
 ;name;gens;#;family;family line;folk;kinfolk;kinsfolk;sept;phratry;
@@ -10554,9 +10554,9 @@
 ;Rome;#;leadership;leaders;
 ;Protestant Church;Protestant;#;church;Christian church;Christianity;
 ;breed;strain;stock;variety;#;animal group;
-;breed;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;
-;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;#;genealogy;family tree;
-;side;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;tqparentage;stock;
+;breed;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;
+;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;#;genealogy;family tree;
+;side;#;lineage;line;line of descent;descent;bloodline;blood line;blood;pedigree;ancestry;origin;parentage;stock;
 ;class;#;taxonomic group;taxon;
 ;order;#;taxonomic group;taxon;
 ;family;#;taxonomic group;taxon;
@@ -13854,7 +13854,7 @@
 ;sympathy;#;affinity;kinship;
 ;kinship;family relationship;relationship;#;relation;
 ;descent;line of descent;lineage;filiation;#;kinship;family relationship;relationship;
-;tqparentage;birth;#;kinship;family relationship;relationship;
+;parentage;birth;#;kinship;family relationship;relationship;
 ;scale;#;magnitude relation;quantitative relation;
 ;proportion;proportionality;#;quotient;
 ;content;#;proportion;proportionality;