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

diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
index ffa51114..1ec16561 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
@@ -55,10 +55,10 @@ KisPaintOp * KisBrushOpFactory::createOp(const KisPaintOpSettings *settings, Kis
     return op;
 }
 
-KisBrushOpSettings::KisBrushOpSettings(TQWidget *tqparent)
-    : super(tqparent)
+KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent)
+    : super(parent)
 {
-    m_optionsWidget = new TQWidget(tqparent, "brush option widget");
+    m_optionsWidget = new TQWidget(parent, "brush option widget");
     TQHBoxLayout * l = new TQHBoxLayout(m_optionsWidget);
     l->setAutoAdd(true);
     m_pressureVariation = new TQLabel(i18n("Pressure variation: "), m_optionsWidget);
@@ -125,13 +125,13 @@ bool KisBrushOpSettings::varyDarken() const
     return m_darken->isChecked();
 }
 
-KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * tqparent, const KisInputDevice& inputDevice)
+KisPaintOpSettings* KisBrushOpFactory::settings(TQWidget * parent, const KisInputDevice& inputDevice)
 {
     if (inputDevice == KisInputDevice::mouse()) {
         // No options for mouse, only tablet devices
         return 0;
     } else {
-        return new KisBrushOpSettings(tqparent);
+        return new KisBrushOpSettings(parent);
     }
 }
 
@@ -180,13 +180,13 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
 
     // Painting should be implemented according to the following algorithm:
     // retrieve brush
-    // if brush == tqmask
-    //          retrieve tqmask
+    // if brush == mask
+    //          retrieve mask
     // else if brush == image
     //          retrieve image
-    // subsample (tqmask | image) for position -- pos should be double!
-    // apply filters to tqmask (colour | gradient | pattern | etc.
-    // composite filtered tqmask into temporary layer
+    // subsample (mask | image) for position -- pos should be double!
+    // apply filters to mask (colour | gradient | pattern | etc.
+    // composite filtered mask into temporary layer
     // composite temporary layer into target layer
     // @see: doc/brush.txt
 
@@ -245,8 +245,8 @@ void KisBrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info)
         dab = brush->image(device->colorSpace(), adjustedInfo, xFraction, yFraction);
     }
     else {
-        KisAlphaMaskSP tqmask = brush->tqmask(adjustedInfo, xFraction, yFraction);
-        dab = computeDab(tqmask);
+        KisAlphaMaskSP mask = brush->mask(adjustedInfo, xFraction, yFraction);
+        dab = computeDab(mask);
     }
 
     m_painter->setPressure(adjustedInfo.pressure);