1 files changed, 13 insertions, 13 deletions

diff --git a/chalk/core/kis_merge_visitor.h b/chalk/core/kis_merge_visitor.h
index 721ce827..afd8fb37 100644
--- a/chalk/core/kis_merge_visitor.h
+++ b/chalk/core/kis_merge_visitor.h
@@ -114,11 +114,11 @@ public:
             gc.bitBlt(dx, dy, layer->compositeOp(), source, layer->opacity(), sx, sy, w, h);
         } else {
             if (layer->renderMask()) {
-                // To display the tqmask, we don't do things with composite op and opacity
+                // To display the mask, we don't do things with composite op and opacity
                 // This is like the gimp does it, I guess that's ok?
 
                 // Note that here we'll use m_rc, because even if the extent of the device is
-                // empty, we want a full tqmask to be drawn! (we don't change rc, since
+                // empty, we want a full mask to be drawn! (we don't change rc, since
                 // it'd mess with setClean). This is because KisPainter::bitBlt &'s with
                 // the source device's extent. This is ok in normal circumstances, but
                 // we changed the default tile. Fixing this properly would mean fixing it there.
@@ -129,36 +129,36 @@ public:
                 dx = sx;
                 dy = sy;
 
-                // The problem is that the extent of the layer tqmask might not be extended
+                // The problem is that the extent of the layer mask might not be extended
                 // enough. Check if that is the case
-                KisPaintDeviceSP tqmask = layer->getMask();
-                TQRect mextent = tqmask->extent();
+                KisPaintDeviceSP mask = layer->getMask();
+                TQRect mextent = mask->extent();
                 if ((mextent & m_rc) != m_rc) {
                     // Iterate over all pixels in the m_rc area. With just accessing the
                     // tiles in read-write mode, we ensure that the tiles get created if they
                     // do not exist. If they do, they'll remain untouched since we don't
                     // actually write data to it.
                     // XXX Admission: this is actually kind of a hack :-(
-                    KisRectIteratorPixel it = tqmask->createRectIterator(sx, sy, w, h, true);
+                    KisRectIteratorPixel it = mask->createRectIterator(sx, sy, w, h, true);
                     while (!it.isDone())
                         ++it;
                 }
                 if (tempTarget) {
                     KisPaintDeviceSP temp = new KisPaintDevice(source->colorSpace());
-                    tqmask = paintIndirect(tqmask, temp, layer, sx, sy, dx, dy, w, h);
+                    mask = paintIndirect(mask, temp, layer, sx, sy, dx, dy, w, h);
                 }
 
-                gc.bitBlt(dx, dy, COMPOSITE_OVER, tqmask, OPACITY_OPAQUE, sx, sy, w, h);
+                gc.bitBlt(dx, dy, COMPOSITE_OVER, mask, OPACITY_OPAQUE, sx, sy, w, h);
             } else {
-                KisSelectionSP tqmask = layer->getMaskAsSelection();
-                // The indirect painting happens on the tqmask
+                KisSelectionSP mask = layer->getMaskAsSelection();
+                // The indirect painting happens on the mask
                 if (tempTarget && layer->editMask()) {
                     KisPaintDeviceSP maskSrc = layer->getMask();
                     KisPaintDeviceSP temp = new KisPaintDevice(maskSrc->colorSpace());
                     temp = paintIndirect(maskSrc, temp, layer, sx, sy, dx, dy, w, h);
                     // Blegh
                     KisRectIteratorPixel srcIt = temp->createRectIterator(sx, sy, w, h, false);
-                    KisRectIteratorPixel dstIt = tqmask->createRectIterator(sx, sy, w, h, true);
+                    KisRectIteratorPixel dstIt = mask->createRectIterator(sx, sy, w, h, true);
 
                     while(!dstIt.isDone()) {
                         // Same as in convertMaskToSelection
@@ -167,7 +167,7 @@ public:
                         ++dstIt;
                     }
                 } else if (tempTarget) {
-                    // We have a tqmask, and paint indirect, but not on the tqmask
+                    // We have a mask, and paint indirect, but not on the mask
                     KisPaintDeviceSP temp = new KisPaintDevice(source->colorSpace());
                     source = paintIndirect(source, temp, layer, sx, sy, dx, dy, w, h);
                 }
@@ -175,7 +175,7 @@ public:
                 gc.bltSelection(dx, dy,
                                 layer->compositeOp(),
                                 source,
-                                tqmask,
+                                mask,
                                 layer->opacity(), sx, sy, w, h);
             }
         }