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

1 files changed, 8 insertions, 8 deletions

diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 60f475f0..31ee9d18 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -375,7 +375,7 @@ TQImage KisBrush::img()
     return image;
 }
 
-KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixelX, double subPixelY) const
+KisAlphaMaskSP KisBrush::mask(const KisPaintInformation& info, double subPixelX, double subPixelY) const
 {
     if (m_scaledBrushes.isEmpty()) {
         createScaledBrushes();
@@ -405,9 +405,9 @@ KisAlphaMaskSP KisBrush::tqmask(const KisPaintInformation& info, double subPixel
             // Exact match.
             outputMask = scaleMask(aboveBrush, scale, subPixelX, subPixelY);
         } else {
-            // We are smaller than the smallest tqmask, which is always 1x1.
+            // We are smaller than the smallest mask, which is always 1x1.
             double s = scale / aboveBrush->scale();
-            outputMask = scaleSinglePixelMask(s, aboveBrush->tqmask()->alphaAt(0, 0), subPixelX, subPixelY);
+            outputMask = scaleSinglePixelMask(s, aboveBrush->mask()->alphaAt(0, 0), subPixelX, subPixelY);
         }
     }
 
@@ -629,7 +629,7 @@ KisAlphaMaskSP KisBrush::scaleMask(const ScaledBrush *srcBrush, double scale, do
     KisAlphaMaskSP dstMask = new KisAlphaMask(dstWidth, dstHeight);
     Q_CHECK_PTR(dstMask);
 
-    KisAlphaMaskSP srcMask = srcBrush->tqmask();
+    KisAlphaMaskSP srcMask = srcBrush->mask();
 
     // Compute scales to map the scaled brush onto the required scale.
     double xScale = srcBrush->xScale() / scale;
@@ -1167,7 +1167,7 @@ TQImage KisBrush::interpolate(const TQImage& image1, const TQImage& image2, doub
 
 KisBrush::ScaledBrush::ScaledBrush()
 {
-    m_tqmask = 0;
+    m_mask = 0;
     m_image = TQImage();
     m_scale = 1;
     m_xScale = 1;
@@ -1176,7 +1176,7 @@ KisBrush::ScaledBrush::ScaledBrush()
 
 KisBrush::ScaledBrush::ScaledBrush(KisAlphaMaskSP scaledMask, const TQImage& scaledImage, double scale, double xScale, double yScale)
 {
-    m_tqmask = scaledMask;
+    m_mask = scaledMask;
     m_image = scaledImage;
     m_scale = scale;
     m_xScale = xScale;
@@ -1262,7 +1262,7 @@ void KisBrush::generateBoundary() {
     if (brushType() == IMAGE || brushType() == PIPE_IMAGE) {
         dev = image(KisMetaRegistry::instance()->csRegistry() ->getColorSpace(KisID("RGBA",""),""), KisPaintInformation());
     } else {
-        KisAlphaMaskSP atqmask = tqmask(KisPaintInformation());
+        KisAlphaMaskSP amask = mask(KisPaintInformation());
         KisColorSpace* cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),"");
         dev = new KisPaintDevice(cs, "tmp for generateBoundary");
         for (int y = 0; y < h; y++) {
@@ -1270,7 +1270,7 @@ void KisBrush::generateBoundary() {
             int x = 0;
 
             while(!it.isDone()) {
-                cs->setAlpha(it.rawData(), atqmask->alphaAt(x++, y), 1);
+                cs->setAlpha(it.rawData(), amask->alphaAt(x++, y), 1);
                 ++it;
             }
         }