1 files changed, 18 insertions, 18 deletions

diff --git a/chalk/core/kis_paint_layer.h b/chalk/core/kis_paint_layer.h
index 6319f981..2cbd5e48 100644
--- a/chalk/core/kis_paint_layer.h
+++ b/chalk/core/kis_paint_layer.h
@@ -73,55 +73,55 @@ public:
 
     inline KisPaintDeviceSP paintDevice() const { return m_paintdev; }
 
-    /// Returns the paintDevice that accompanies this layer (or tqmask, see editMask)
+    /// Returns the paintDevice that accompanies this layer (or mask, see editMask)
     inline KisPaintDeviceSP paintDeviceOrMask() const {
         if (hasMask() && editMask())
-            return m_tqmask;
+            return m_mask;
         return m_paintdev;
     }
 
     // Mask Layer
 
-    /// Does this layer have a layer tqmask?
-    bool hasMask() const { return m_tqmask != 0; }
+    /// Does this layer have a layer mask?
+    bool hasMask() const { return m_mask != 0; }
     // XXX TODO: Make these undo-able!
-    /// Create a tqmask if it does not yet exist, and return it
+    /// Create a mask if it does not yet exist, and return it
     KisPaintDeviceSP createMask();
-    /// Convert the from argument to the tqmask
+    /// Convert the from argument to the mask
     void createMaskFromPaintDevice(KisPaintDeviceSP from);
     /**
      * Convert the from selection to a paint device (should convert the getMaskAsSelection
-     * result back to the tqmask). Overwrites the current tqmask, if any. Also removes the selection
+     * result back to the mask). Overwrites the current mask, if any. Also removes the selection
      */
     void createMaskFromSelection(KisSelectionSP from);
-    /// Remove the layer tqmask
+    /// Remove the layer mask
     void removeMask();
-    /// Apply the layer tqmask to the paint device, this removes the tqmask afterwards
+    /// Apply the layer mask to the paint device, this removes the mask afterwards
     void applyMask();
-    /// Returns the layer tqmask's device. Creates one if there is currently none
+    /// Returns the layer mask's device. Creates one if there is currently none
     KisPaintDeviceSP getMask();
-    /// Returns the layer tqmask's device, converted to a selection. Creates one if there is currently none
+    /// Returns the layer mask's device, converted to a selection. Creates one if there is currently none
     KisSelectionSP getMaskAsSelection();
 
     /// Undoable version of createMask
     KNamedCommand* createMaskCommand();
     /// Undoable version of createMaskFromSelection
     KNamedCommand* maskFromSelectionCommand();
-    /// Undoable, removes the current tqmask, but converts it to the current selection
+    /// Undoable, removes the current mask, but converts it to the current selection
     KNamedCommand* maskToSelectionCommand();
     /// Undoable version of removeMask
     KNamedCommand* removeMaskCommand();
     /// Undoable version of applyMask
     KNamedCommand* applyMaskCommand();
 
-    /// Returns true if the masked part of the tqmask will be rendered instead of being transparent
+    /// Returns true if the masked part of the mask will be rendered instead of being transparent
     bool renderMask() const { return m_renderMask; }
     /// Set the renderMask property
     void setRenderMask(bool b);
 
     /**
      * When this returns true, the KisPaintDevice returned in paintDevice will actually
-     * be the layer tqmask (if there is one). This is so that tools can draw on the tqmask
+     * be the layer mask (if there is one). This is so that tools can draw on the mask
      * without needing to know its existance.
      */
     bool editMask() const { return m_editMask; }
@@ -136,17 +136,17 @@ public:
     // KisLayerSupportsIndirectPainting
     virtual KisLayer* layer() { return this; }
 signals:
-    /// When the tqmask is created/destroyed or the edittqmask or rendertqmask is changed
+    /// When the mask is created/destroyed or the editmask or rendermask is changed
     void sigMaskInfoChanged();
 
 private:
     void convertMaskToSelection(const TQRect& r);
     void genericMaskCreationHelper();
     KisPaintDeviceSP m_paintdev;
-    // Layer tqmask related:
+    // Layer mask related:
     // XXX It would be nice to merge the next 2 devices...
-    KisPaintDeviceSP m_tqmask; // The tqmask that we can edit and display easily
-    KisSelectionSP m_maskAsSelection; // The tqmask as selection, to apply and render easily
+    KisPaintDeviceSP m_mask; // The mask that we can edit and display easily
+    KisSelectionSP m_maskAsSelection; // The mask as selection, to apply and render easily
     bool m_renderMask;
     bool m_editMask;
 };