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

2 files changed, 15 insertions, 15 deletions

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