rename the following methods:

tqparent parent
tqmask mask


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

4 files changed, 99 insertions, 99 deletions

diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cc b/chalk/colorspaces/gray_u8/gray_plugin.cc
index 0028c597..c0a207b3 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.cc
+++ b/chalk/colorspaces/gray_u8/gray_plugin.cc
@@ -37,16 +37,16 @@ typedef KGenericFactory<GrayPlugin> GrayPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkgrayplugin, GrayPluginFactory( "chalkcore" ) )
 
 
-GrayPlugin::GrayPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+GrayPlugin::GrayPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
            setInstance(GrayPluginFactory::instance());
 
     // This is not a gui plugin; only load it when the doc is created.
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
 
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         // .22 gamma grayscale or something like that. Taken from the lcms tutorial...
         LPGAMMATABLE Gamma = cmsBuildGamma(256, 2.2);
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.h b/chalk/colorspaces/gray_u8/gray_plugin.h
index f18bf77c..b3260971 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.h
+++ b/chalk/colorspaces/gray_u8/gray_plugin.h
@@ -29,7 +29,7 @@ class GrayPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    GrayPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    GrayPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~GrayPlugin();
 
 };
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
index 59b70f77..a913dc49 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
@@ -43,8 +43,8 @@ namespace {
     const TQ_INT32 MAX_CHANNEL_GRAYSCALEA = 2;
 }
 
-KisGrayColorSpace::KisGrayColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU8BaseColorSpace(KisID("GRAYA", i18n("Grayscale")), TYPE_GRAYA_8, icSigGrayData, tqparent, p)
+KisGrayColorSpace::KisGrayColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU8BaseColorSpace(KisID("GRAYA", i18n("Grayscale")), TYPE_GRAYA_8, icSigGrayData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Gray"), i18n("G"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8));
     m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), 1, KisChannelInfo::ALPHA, KisChannelInfo::UINT8));
@@ -199,7 +199,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
                       TQ_INT32 dstRowStride,
                       const TQ_UINT8 *src,
                       TQ_INT32 srcRowStride,
-                      const TQ_UINT8 *tqmask,
+                      const TQ_UINT8 *mask,
                       TQ_INT32 maskRowStride,
                       TQ_UINT8 opacity,
                       TQ_INT32 rows,
@@ -208,37 +208,37 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
 {
     switch (op.op()) {
     case COMPOSITE_OVER:
-        compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_MULT:
-        compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DIVIDE:
-        compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DARKEN:
-        compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_LIGHTEN:
-        compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_SCREEN:
-        compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_OVERLAY:
-        compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_DODGE:
-        compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_BURN:
-        compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_ERASE:
-        compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_COPY:
-        compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
     case COMPOSITE_CLEAR: {
         TQ_UINT8 *d;
@@ -253,7 +253,7 @@ void KisGrayColorSpace::bitBlt(TQ_UINT8 *dst,
     }
         break;
     case COMPOSITE_ALPHA_DARKEN:
-        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        compositeAlphaDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
         break;
 
     default:
@@ -285,18 +285,18 @@ void KisGrayColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
             TQ_UINT8 srcAlpha = src[PIXEL_GRAY_ALPHA];
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -353,7 +353,7 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -362,12 +362,12 @@ void KisGrayColorSpace::compositeMultiply(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -419,7 +419,7 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -428,12 +428,12 @@ void KisGrayColorSpace::compositeDivide(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -490,7 +490,7 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -499,12 +499,12 @@ void KisGrayColorSpace::compositeScreen(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -561,7 +561,7 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -570,12 +570,12 @@ void KisGrayColorSpace::compositeOverlay(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -632,7 +632,7 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -641,12 +641,12 @@ void KisGrayColorSpace::compositeDodge(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStr
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -703,7 +703,7 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -712,12 +712,12 @@ void KisGrayColorSpace::compositeBurn(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -775,7 +775,7 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -784,12 +784,12 @@ void KisGrayColorSpace::compositeDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowSt
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -846,7 +846,7 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
         TQ_INT32 columns = numColumns;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
 
         while (columns > 0) {
 
@@ -855,12 +855,12 @@ void KisGrayColorSpace::compositeLighten(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
 
             srcAlpha = TQMIN(srcAlpha, dstAlpha);
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -927,17 +927,17 @@ void KisGrayColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const TQ_UINT8 *s = src;
         TQ_UINT8 *d = dst;
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (i = cols; i > 0; i--, s+=MAX_CHANNEL_GRAYSCALEA, d+=MAX_CHANNEL_GRAYSCALEA)
         {
             srcAlpha = s[PIXEL_GRAY_ALPHA];
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, *mask);
+                mask++;
             }
             d[PIXEL_GRAY_ALPHA] = UINT8_MULT(srcAlpha, d[PIXEL_GRAY_ALPHA]);
         }
@@ -958,7 +958,7 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
@@ -966,12 +966,12 @@ void KisGrayColorSpace::compositeAlphaDarken(TQ_UINT8 *dstRowStart, TQ_INT32 dst
             TQ_UINT8 srcAlpha = src[PIXEL_GRAY_ALPHA];
             TQ_UINT8 dstAlpha = dst[PIXEL_GRAY_ALPHA];
 
-            // apply the alphatqmask
-            if(tqmask != 0)
+            // apply the alphamask
+            if(mask != 0)
             {
-                if(*tqmask != OPACITY_OPAQUE)
-                    srcAlpha = UINT8_MULT(srcAlpha, *tqmask);
-                tqmask++;
+                if(*mask != OPACITY_OPAQUE)
+                    srcAlpha = UINT8_MULT(srcAlpha, *mask);
+                mask++;
             }
 
             if (opacity != OPACITY_OPAQUE) {
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
index a46adcc0..3f572479 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
@@ -29,7 +29,7 @@
 
 class KRITACORE_EXPORT KisGrayColorSpace : public KisU8BaseColorSpace {
 public:
-    KisGrayColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisGrayColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisGrayColorSpace();
 
     virtual bool willDegrade(ColorSpaceIndependence /*independence*/)
@@ -70,17 +70,17 @@ public:
     KisCompositeOpList userVisiblecompositeOps() const;
 
 protected:
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeAlphaDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
 
 private:
@@ -106,7 +106,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigGrayData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisGrayColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisGrayColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "gray built-in - (lcms internal)"; };
 };