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

diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
index b19845b2..4d7493b2 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
@@ -26,8 +26,8 @@
 const TQ_INT32 MAX_CHANNEL_YCbCr = 3;
 const TQ_INT32 MAX_CHANNEL_YCbCrA = 4;
 
-KisYCbCrU16ColorSpace::KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* /*p*/)
-    : KisU16BaseColorSpace(KisID("YCbCrAU16", i18n("YCbCr (16-bit integer/channel)")), TYPE_YCbCr_16, icSigYCbCrData, tqparent, 0)
+KisYCbCrU16ColorSpace::KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* /*p*/)
+    : KisU16BaseColorSpace(KisID("YCbCrAU16", i18n("YCbCr (16-bit integer/channel)")), TYPE_YCbCr_16, icSigYCbCrData, parent, 0)
 {
     m_channels.push_back(new KisChannelInfo(i18n("Y"), "Y", PIXEL_Y * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16)));
     m_channels.push_back(new KisChannelInfo(i18n("Cb"), "Cb", PIXEL_Cb * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16)));
@@ -230,21 +230,21 @@ void KisYCbCrU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRow
 
         const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
         TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
-        const TQ_UINT8 *tqmask = maskRowStart;
+        const TQ_UINT8 *mask = maskRowStart;
         TQ_INT32 columns = numColumns;
 
         while (columns > 0) {
 
             TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
 
-            // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+            // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
 
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
 
             if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@@ -303,20 +303,20 @@ void KisYCbCrU16ColorSpace::compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowSize, c
     {
         const Pixel *s = reinterpret_cast<const Pixel *>(src);
         Pixel *d = reinterpret_cast<Pixel *>(dst);
-        const TQ_UINT8 *tqmask = srcAlphaMask;
+        const TQ_UINT8 *mask = srcAlphaMask;
     
         for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
         {
             TQ_UINT16 srcAlpha = s->alpha;
     
-                // apply the alphatqmask
-            if (tqmask != 0) {
-                TQ_UINT8 U8_tqmask = *tqmask;
+                // apply the alphamask
+            if (mask != 0) {
+                TQ_UINT8 U8_mask = *mask;
     
-                if (U8_tqmask != OPACITY_OPAQUE) {
-                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
+                if (U8_mask != OPACITY_OPAQUE) {
+                    srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
                 }
-                tqmask++;
+                mask++;
             }
             d->alpha = UINT16_MULT(srcAlpha, d->alpha);
         }
diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
index d6ca157d..d641f09e 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
@@ -31,7 +31,7 @@
 class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace
 {
     public:
-        KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* tqparent, KisProfile* p);
+        KisYCbCrU16ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p);
         ~KisYCbCrU16ColorSpace();
         virtual bool willDegrade(ColorSpaceIndependence )
         {
@@ -75,8 +75,8 @@ class KisYCbCrU16ColorSpace : public KisU16BaseColorSpace
                             TQ_INT32 cols,
                             const KisCompositeOp& op);
 
-        void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
-        void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+        void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
+        void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT8 opacity);
 
     private:
 #define CLAMP_TO_16BITCHANNEL(a) CLAMP(a, 0, TQ_UINT16_MAX)
@@ -135,7 +135,7 @@ class KisYCbCrU16ColorSpaceFactory : public KisColorSpaceFactory
 
         virtual icColorSpaceSignature colorSpaceSignature() { return icSigYCbCrData; };
 
-        virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisYCbCrU16ColorSpace(tqparent, p); };
+        virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisYCbCrU16ColorSpace(parent, p); };
 
         virtual TQString defaultProfile() { return ""; };
 };
diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
index d948097b..7d926c48 100644
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
@@ -33,14 +33,14 @@ typedef KGenericFactory<YCbCrU16Plugin> YCbCrU16PluginFactory;
 K_EXPORT_COMPONENT_FACTORY( chalk_ycbcr_u16_plugin, YCbCrU16PluginFactory( "chalk" ) )
 
 
-YCbCrU16Plugin::YCbCrU16Plugin(TQObject *tqparent, const char *name, const TQStringList &)
-    : KParts::Plugin(tqparent, name)
+YCbCrU16Plugin::YCbCrU16Plugin(TQObject *parent, const char *name, const TQStringList &)
+    : KParts::Plugin(parent, name)
 {
     setInstance(YCbCrU16PluginFactory::instance());
 
-    if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
+    if ( parent->inherits("KisColorSpaceFactoryRegistry") )
     {
-        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
+        KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
 
         KisColorSpace * colorSpaceYCbCrU16 = new KisYCbCrU16ColorSpace(f, 0);
         KisColorSpaceFactory * csf = new KisYCbCrU16ColorSpaceFactory();
diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
index ceb8ec6f..1e3b5812 100644
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
@@ -29,7 +29,7 @@ class YCbCrU16Plugin : public KParts::Plugin
     Q_OBJECT
   TQ_OBJECT
 public:
-    YCbCrU16Plugin(TQObject *tqparent, const char *name, const TQStringList &);
+    YCbCrU16Plugin(TQObject *parent, const char *name, const TQStringList &);
     virtual ~YCbCrU16Plugin();
 
 };