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, 56 insertions, 56 deletions

diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
index 686a22bf..6e349ad5 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
@@ -39,13 +39,13 @@ typedef KGenericFactory<CMYKPlugin> CMYKPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalkcmykplugin, CMYKPluginFactory( "chalk" ) )
 
 
-CMYKPlugin::CMYKPlugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+CMYKPlugin::CMYKPlugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(CMYKPluginFactory::instance());
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceCMYK = new KisCmykColorSpace(f, 0);
         KisColorSpaceFactory * csf = new KisCmykColorSpaceFactory();
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
index 073a5e61..a43b04bb 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.h
@@ -29,7 +29,7 @@ class CMYKPlugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    CMYKPlugin(TQObject *tqparent, const char *name, const TQStringList &);
+    CMYKPlugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~CMYKPlugin();
 
 
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
index bfe85f0d..359c22c5 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
@@ -37,8 +37,8 @@ namespace cmyk {
     const TQ_INT32 MAX_CHANNEL_CMYKA = 5;
 }
 
-KisCmykColorSpace::KisCmykColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
-    KisU8BaseColorSpace(KisID("CMYK", i18n("CMYK")), TYPE_CMYK5_8, icSigCmykData, tqparent, p)
+KisCmykColorSpace::KisCmykColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
+    KisU8BaseColorSpace(KisID("CMYK", i18n("CMYK")), TYPE_CMYK5_8, icSigCmykData, parent, p)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Cyan"), i18n("C"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQt::cyan));
     m_channels.push_back(new KisChannelInfo(i18n("Magenta"), i18n("M"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8, 1, TQt::magenta));
@@ -214,21 +214,21 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
 
         const TQ_UINT8 *src = srcRowStart;
         TQ_UINT8 *dst = dstRowStart;
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT8 srcAlpha = src[PIXEL_CMYK_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT8_MULT(srcAlpha, U8_tqmask);
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT8_MULT(srcAlpha, U8_mask);
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != OPACITY_TRANSPARENT) {
@@ -288,7 +288,7 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
         const TQ_UINT8 *src = srcRowStart; \
         TQ_UINT8 *dst = dstRowStart; \
         TQ_INT32 columns = numColumns; \
-        const TQ_UINT8 *tqmask = maskRowStart; \
+        const TQ_UINT8 *mask = maskRowStart; \
     \
         while (columns > 0) { \
     \
@@ -297,13 +297,13 @@ void KisCmykColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStri
     \
             srcAlpha = TQMIN(srcAlpha, dstAlpha); \
     \
-            if (tqmask != 0) { \
-                TQ_UINT8 U8_tqmask = *tqmask; \
+            if (mask != 0) { \
+                TQ_UINT8 U8_mask = *mask; \
     \
-                if (U8_tqmask != OPACITY_OPAQUE) { \
-                    srcAlpha = UINT8_MULT(srcAlpha, U8_tqmask); \
+                if (U8_mask != OPACITY_OPAQUE) { \
+                    srcAlpha = UINT8_MULT(srcAlpha, U8_mask); \
 } \
-                tqmask++; \
+                mask++; \
 } \
     \
             if (srcAlpha != OPACITY_TRANSPARENT) { \
@@ -526,20 +526,20 @@ void KisCmykColorSpace::compositeErase(TQ_UINT8 *dst,
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
 
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT8 srcAlpha = s->alpha;
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, U8_tqmask);
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT8_BLEND(srcAlpha, OPACITY_OPAQUE, U8_mask);
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT8_MULT(srcAlpha, d->alpha);
         }
@@ -556,7 +556,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
                                   TQ_INT32 dstRowStride,
                                   const TQ_UINT8 *src,
                                   TQ_INT32 srcRowStride,
-                                  const TQ_UINT8 *tqmask,
+                                  const TQ_UINT8 *mask,
                                   TQ_INT32 maskRowStride,
                                   TQ_UINT8 opacity,
                                   TQ_INT32 rows,
@@ -569,7 +569,7 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         // Undefined == no composition
             break;
         case COMPOSITE_OVER:
-            compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_IN:
         //compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -598,16 +598,16 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_MULT:
-            compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_DIVIDE:
-            compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_BUMPMAP:
         //compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COPY:
-            compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COPY_CYAN:
         //compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -642,22 +642,22 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         // No composition.
             break;
         case COMPOSITE_DARKEN:
-            compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_LIGHTEN:
-            compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_HUE:
-        //compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_SATURATION:
-        //compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_VALUE:
-        //compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COLOR:
-        //compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+        //compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_COLORIZE:
         //compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@@ -666,24 +666,24 @@ void KisCmykColorSpace::bitBlt(TQ_UINT8 *dst,
         //compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_SCREEN:
-            compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_OVERLAY:
-            compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_ERASE:
-            compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_DODGE:
-            compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_BURN:
-            compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
+            compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
             break;
         case COMPOSITE_ALPHA_DARKEN:
             abstractCompositeAlphaDarken<TQ_UINT8, U8Mult, Uint8ToU8, U8OpacityTest,
                     PIXEL_CMYK_ALPHA, cmyk::MAX_CHANNEL_CMYK, cmyk::MAX_CHANNEL_CMYKA>(
-                    dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
+                    dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
                     rows, cols, opacity, U8Mult(), Uint8ToU8(), U8OpacityTest());
                     break;
         default:
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
index a7723915..b3806bc4 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
@@ -37,7 +37,7 @@ public:
             TQ_UINT16 alpha;
         };
 public:
-    KisCmykColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
+    KisCmykColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
     virtual ~KisCmykColorSpace();
 
 
@@ -80,16 +80,16 @@ protected:
                         TQ_INT32 cols,
                         const KisCompositeOp& op);
 
-    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+    void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
 private:
 
@@ -118,7 +118,7 @@ public:
 
     virtual icColorSpaceSignature colorSpaceSignature() { return icSigCmykData; };
 
-    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisCmykColorSpace(tqparent, p); };
+    virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisCmykColorSpace(parent, p); };
 
     virtual TQString defaultProfile() { return "Offset printing, according to ISO/DIS 12647-2:2004, OFCOM, paper type 1 or 2 = coated art, 115 g/m2, screen ruling 60 cm-1, positive-acting plates"; }; //  Do not i18n -- this is from a data file
 };