1 files changed, 27 insertions, 27 deletions

diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cc
index ca899da8..c4281eac 100644
--- a/chalk/ui/kis_cursor.cc
+++ b/chalk/ui/kis_cursor.cc
@@ -122,9 +122,9 @@ TQCursor KisCursor::pickerCursor()
         0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap picker_bitmap(24, 24, picker_bits, true); 
-    TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false );
+    TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false );
 
-    return TQCursor( picker_bitmap, picker_tqmask, 1, 22 );
+    return TQCursor( picker_bitmap, picker_mask, 1, 22 );
 }
 
 
@@ -139,9 +139,9 @@ TQCursor KisCursor::pickerPlusCursor()
         0x74, 0x00, 0x0c, 0x32, 0x00, 0x0c, 0x0a, 0x00, 0x0c, 0x00, 0x00, 0x00};
 
     TQBitmap picker_bitmap(24, 24, pickerplus_bits, true); 
-    TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false );
+    TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false );
 
-    return TQCursor( picker_bitmap, picker_tqmask, 1, 22 );
+    return TQCursor( picker_bitmap, picker_mask, 1, 22 );
 }
 
 
@@ -156,9 +156,9 @@ TQCursor KisCursor::pickerMinusCursor()
         0x74, 0x00, 0x00, 0x32, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap picker_bitmap(24, 24, pickerminus_bits, true); 
-    TQBitmap picker_tqmask = picker_bitmap.createHeuristicMask( false );
+    TQBitmap picker_mask = picker_bitmap.createHeuristicMask( false );
 
-    return TQCursor( picker_bitmap, picker_tqmask, 1, 22 );
+    return TQCursor( picker_bitmap, picker_mask, 1, 22 );
 }
 
 
@@ -174,9 +174,9 @@ TQCursor KisCursor::penCursor()
         0x7c, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap pen_bitmap( 24, 24, pen_bits, true );
-    TQBitmap pen_tqmask = pen_bitmap.createHeuristicMask( false );
+    TQBitmap pen_mask = pen_bitmap.createHeuristicMask( false );
 
-    return TQCursor( pen_bitmap, pen_tqmask, 1, 22 );
+    return TQCursor( pen_bitmap, pen_mask, 1, 22 );
 }
 
 TQCursor KisCursor::brushCursor()
@@ -192,9 +192,9 @@ TQCursor KisCursor::brushCursor()
         0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap brush_bitmap( 25, 23, brush_bits, true );
-    TQBitmap brush_tqmask = brush_bitmap.createHeuristicMask( false );
+    TQBitmap brush_mask = brush_bitmap.createHeuristicMask( false );
 
-    return TQCursor( brush_bitmap, brush_tqmask, 1, 21 );
+    return TQCursor( brush_bitmap, brush_mask, 1, 21 );
 }
 
 TQCursor KisCursor::airbrushCursor()
@@ -208,9 +208,9 @@ TQCursor KisCursor::airbrushCursor()
         0xf8, 0x00, 0x06, 0x76, 0x00, 0x03, 0x36, 0x00, 0x03, 0x00, 0x00, 0x00};
 
     TQBitmap airbrush_bitmap( 24, 24, airbrush_bits, true );
-    TQBitmap airbrush_tqmask = airbrush_bitmap.createHeuristicMask( false );
+    TQBitmap airbrush_mask = airbrush_bitmap.createHeuristicMask( false );
 
-    return TQCursor( airbrush_bitmap, airbrush_tqmask, 1, 22 );
+    return TQCursor( airbrush_bitmap, airbrush_mask, 1, 22 );
 }
 
 TQCursor KisCursor::eraserCursor()
@@ -226,9 +226,9 @@ TQCursor KisCursor::eraserCursor()
         0x10, 0x01, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap eraser_bitmap( 25, 24, eraser_bits, true );
-    TQBitmap eraser_tqmask = eraser_bitmap.createHeuristicMask( false );
+    TQBitmap eraser_mask = eraser_bitmap.createHeuristicMask( false );
 
-    return TQCursor( eraser_bitmap, eraser_tqmask, 7, 22 );
+    return TQCursor( eraser_bitmap, eraser_mask, 7, 22 );
 }
 
 TQCursor KisCursor::fillerCursor()
@@ -242,9 +242,9 @@ TQCursor KisCursor::fillerCursor()
         0x08, 0x60, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap filler_bitmap( 22, 22, filler_bits, true );
-    TQBitmap filler_tqmask = filler_bitmap.createHeuristicMask( false );
+    TQBitmap filler_mask = filler_bitmap.createHeuristicMask( false );
 
-    return TQCursor( filler_bitmap, filler_tqmask, 3, 20 );
+    return TQCursor( filler_bitmap, filler_mask, 3, 20 );
 }
 
 TQCursor KisCursor::colorChangerCursor()
@@ -258,9 +258,9 @@ TQCursor KisCursor::colorChangerCursor()
         0x80, 0x81, 0x01, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap colorChanger_bitmap( 24, 23, colorChanger_bits, true );
-    TQBitmap colorChanger_tqmask = colorChanger_bitmap.createHeuristicMask( false );
+    TQBitmap colorChanger_mask = colorChanger_bitmap.createHeuristicMask( false );
 
-    return TQCursor( colorChanger_bitmap, colorChanger_tqmask, 12, 10 );
+    return TQCursor( colorChanger_bitmap, colorChanger_mask, 12, 10 );
 }
 
 TQCursor KisCursor::zoomCursor()
@@ -274,9 +274,9 @@ TQCursor KisCursor::zoomCursor()
         0x00, 0x00, 0x7c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00};
 
     TQBitmap zoom_bitmap( 24, 23, zoom_bits, true );
-    TQBitmap zoom_tqmask = zoom_bitmap.createHeuristicMask( false );
+    TQBitmap zoom_mask = zoom_bitmap.createHeuristicMask( false );
 
-    return TQCursor( zoom_bitmap, zoom_tqmask, 9, 8 );
+    return TQCursor( zoom_bitmap, zoom_mask, 9, 8 );
 }
 
 TQCursor KisCursor::moveCursor()
@@ -290,9 +290,9 @@ TQCursor KisCursor::moveCursor()
         0x00, 0x7e, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00};
 
     TQBitmap move_bitmap( 24, 24, move_bits, true );
-    TQBitmap move_tqmask = move_bitmap.createHeuristicMask( false );
+    TQBitmap move_mask = move_bitmap.createHeuristicMask( false );
 
-    return TQCursor( move_bitmap, move_tqmask, 12, 11 );
+    return TQCursor( move_bitmap, move_mask, 12, 11 );
 }
 
 TQCursor KisCursor::handCursor()
@@ -311,9 +311,9 @@ TQCursor KisCursor::selectCursor()
         0x00, 0x08, 0x00, 0x00, 0x08, 0x00, 0x00, 0x08, 0x00};
 
     TQBitmap select_bitmap(23, 23, select_bits, true); 
-    TQBitmap select_tqmask = select_bitmap.createHeuristicMask( false );
+    TQBitmap select_mask = select_bitmap.createHeuristicMask( false );
 
-    return TQCursor( select_bitmap, select_tqmask, 11, 11 );
+    return TQCursor( select_bitmap, select_mask, 11, 11 );
 }
 
 TQCursor KisCursor::openHandCursor()
@@ -341,10 +341,10 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
     Q_ASSERT(cursorImage.hasAlphaBuffer());
 
     TQBitmap bitmap(cursorImage.width(), cursorImage.height());
-    TQBitmap tqmask(cursorImage.width(), cursorImage.height());
+    TQBitmap mask(cursorImage.width(), cursorImage.height());
 
     TQPainter bitmapPainter(&bitmap);
-    TQPainter maskPainter(&tqmask);
+    TQPainter maskPainter(&mask);
 
     for (TQ_INT32 x = 0; x < cursorImage.width(); ++x) {
         for (TQ_INT32 y = 0; y < cursorImage.height(); ++y) {
@@ -369,6 +369,6 @@ TQCursor KisCursor::load(const TQString & iconName, int hotspotX, int hotspotY)
         }
     }
 
-    return TQCursor(bitmap, tqmask, hotspotX, hotspotY);
+    return TQCursor(bitmap, mask, hotspotX, hotspotY);
 }