rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

25 files changed, 72 insertions, 72 deletions

diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
index 07693130..b2f3441a 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.cpp
@@ -49,9 +49,9 @@ const double kpColorSimilarityCube::colorCubeDiagonalDistance =
 
 kpColorSimilarityCube::kpColorSimilarityCube (int look,
                                               kpMainWindow *mainWindow,
-                                              TQWidget *tqparent,
+                                              TQWidget *parent,
                                               const char *name)
-    : TQFrame (tqparent, name, TQt::WNoAutoErase/*no flicker*/),
+    : TQFrame (parent, name, TQt::WNoAutoErase/*no flicker*/),
       m_mainWindow (mainWindow),
       m_colorSimilarity (-1)
 {
diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h
index d2fb85d2..0cf9f92a 100644
--- a/kolourpaint/widgets/kpcolorsimilaritycube.h
+++ b/kolourpaint/widgets/kpcolorsimilaritycube.h
@@ -46,7 +46,7 @@ public:
 
     kpColorSimilarityCube (int look,
                            kpMainWindow *mainWindow,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            const char *name = 0);
     virtual ~kpColorSimilarityCube ();
 
diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
index ee4ff1b0..d71ac501 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
@@ -44,9 +44,9 @@ const double kpColorSimilarityDialog::maximumColorSimilarity = .30;
 
 
 kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow,
-                                                  TQWidget *tqparent,
+                                                  TQWidget *parent,
                                                   const char *name)
-    : KDialogBase (tqparent, name, true/*modal*/,
+    : KDialogBase (parent, name, true/*modal*/,
                    i18n ("Color Similarity"),
                    KDialogBase::Ok | KDialogBase::Cancel),
       m_mainWindow (mainWindow)
diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.h b/kolourpaint/widgets/kpcolorsimilaritydialog.h
index df4e2445..b365819e 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.h
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.h
@@ -42,7 +42,7 @@ Q_OBJECT
 
 public:
     kpColorSimilarityDialog (kpMainWindow *mainWindow,
-                             TQWidget *tqparent,
+                             TQWidget *parent,
                              const char *name = 0);
     virtual ~kpColorSimilarityDialog ();
 
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index 7fd520f7..cfdb6820 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -61,8 +61,8 @@
  */
 
 kpDualColorButton::kpDualColorButton (kpMainWindow *mainWindow,
-                                      TQWidget *tqparent, const char *name)
-    : TQFrame (tqparent, name, TQt::WNoAutoErase/*no flicker*/),
+                                      TQWidget *parent, const char *name)
+    : TQFrame (parent, name, TQt::WNoAutoErase/*no flicker*/),
       m_mainWindow (mainWindow),
       m_backBuffer (0)
 {
@@ -257,7 +257,7 @@ void kpDualColorButton::mouseDoubleClickEvent (TQMouseEvent *e)
             //       to opaque colors.
         }
 
-        // TODO: tqparent
+        // TODO: parent
         if (KColorDialog::getColor (col/*ref*/))
             setColor (whichColor, kpColor (col.rgb ()));
     }
@@ -324,7 +324,7 @@ void kpDualColorButton::drawContents (TQPainter *p)
     TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
     if (!isEnabled ())
     {
-        // swapPixmap has a tqmask after all
+        // swapPixmap has a mask after all
         swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark));
     }
     backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap);
@@ -461,10 +461,10 @@ static bool ownColorsInitialised = false;
  */
 #define rows 2
 #define cols 11
-kpColorCells::kpColorCells (TQWidget *tqparent,
+kpColorCells::kpColorCells (TQWidget *parent,
                             Qt::Orientation o,
                             const char *name)
-    : KColorCells (tqparent, rows, cols),
+    : KColorCells (parent, rows, cols),
       m_mouseButton (-1)
 {
     setName (name);
@@ -729,7 +729,7 @@ void kpColorCells::slotColorDoubleClicked (int cell)
 
     TQColor color = KColorCells::color (cell);
 
-    // TODO: tqparent
+    // TODO: parent
     if (KColorDialog::getColor (color/*ref*/))
         KColorCells::setColor (cell, color);
 }
@@ -739,8 +739,8 @@ void kpColorCells::slotColorDoubleClicked (int cell)
  * kpTransparentColorCell
  */
 
-kpTransparentColorCell::kpTransparentColorCell (TQWidget *tqparent, const char *name)
-    : TQFrame (tqparent, name)
+kpTransparentColorCell::kpTransparentColorCell (TQWidget *parent, const char *name)
+    : TQFrame (parent, name)
 {
 #if DEBUG_KP_COLOR_TOOL_BAR
     kdDebug () << "kpTransparentColorCell::kpTransparentColorCell()" << endl;
@@ -818,10 +818,10 @@ void kpTransparentColorCell::drawContents (TQPainter *p)
  * kpColorPalette
  */
 
-kpColorPalette::kpColorPalette (TQWidget *tqparent,
+kpColorPalette::kpColorPalette (TQWidget *parent,
                                 Qt::Orientation o,
                                 const char *name)
-    : TQWidget (tqparent, name),
+    : TQWidget (parent, name),
       m_boxLayout (0)
 {
 #if DEBUG_KP_COLOR_TOOL_BAR
@@ -882,11 +882,11 @@ void kpColorPalette::setOrientation (Qt::Orientation o)
  */
 
 kpColorSimilarityToolBarItem::kpColorSimilarityToolBarItem (kpMainWindow *mainWindow,
-                                                            TQWidget *tqparent,
+                                                            TQWidget *parent,
                                                             const char *name)
     : kpColorSimilarityCube (kpColorSimilarityCube::Depressed |
                              kpColorSimilarityCube::DoubleClickInstructions,
-                             mainWindow, tqparent, name),
+                             mainWindow, parent, name),
       m_mainWindow (mainWindow),
       m_processedColorSimilarity (kpColor::Exact)
 {
diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h
index b1e8faa8..59f13fb7 100644
--- a/kolourpaint/widgets/kpcolortoolbar.h
+++ b/kolourpaint/widgets/kpcolortoolbar.h
@@ -63,7 +63,7 @@ Q_OBJECT
 
 public:
     kpDualColorButton (kpMainWindow *mainWindow,
-                       TQWidget *tqparent, const char *name = 0);
+                       TQWidget *parent, const char *name = 0);
     virtual ~kpDualColorButton ();
 
     kpColor color (int which) const;
@@ -122,7 +122,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpColorCells (TQWidget *tqparent,
+    kpColorCells (TQWidget *parent,
                   Qt::Orientation o = Qt::Horizontal,
                   const char *name = 0);
     virtual ~kpColorCells ();
@@ -160,7 +160,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpTransparentColorCell (TQWidget *tqparent, const char *name = 0);
+    kpTransparentColorCell (TQWidget *parent, const char *name = 0);
     virtual ~kpTransparentColorCell ();
 
     virtual TQSize tqsizeHint () const;
@@ -188,7 +188,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpColorPalette (TQWidget *tqparent,
+    kpColorPalette (TQWidget *parent,
                     Qt::Orientation o = Qt::Horizontal,
                     const char *name = 0);
     virtual ~kpColorPalette ();
@@ -216,7 +216,7 @@ Q_OBJECT
 
 public:
     kpColorSimilarityToolBarItem (kpMainWindow *mainWindow,
-                                  TQWidget *tqparent,
+                                  TQWidget *parent,
                                   const char *name = 0);
     virtual ~kpColorSimilarityToolBarItem ();
 
diff --git a/kolourpaint/widgets/kpresizesignallinglabel.cpp b/kolourpaint/widgets/kpresizesignallinglabel.cpp
index b62f3679..19b276a9 100644
--- a/kolourpaint/widgets/kpresizesignallinglabel.cpp
+++ b/kolourpaint/widgets/kpresizesignallinglabel.cpp
@@ -34,15 +34,15 @@
 
 
 kpResizeSignallingLabel::kpResizeSignallingLabel (const TQString &string,
-                                                  TQWidget *tqparent,
+                                                  TQWidget *parent,
                                                   const char *name)
-    : TQLabel (string, tqparent, name)
+    : TQLabel (string, parent, name)
 {
 }
 
-kpResizeSignallingLabel::kpResizeSignallingLabel (TQWidget *tqparent,
+kpResizeSignallingLabel::kpResizeSignallingLabel (TQWidget *parent,
                                                   const char *name)
-    : TQLabel (tqparent, name)
+    : TQLabel (parent, name)
 {
 }
 
diff --git a/kolourpaint/widgets/kpresizesignallinglabel.h b/kolourpaint/widgets/kpresizesignallinglabel.h
index 88f4477c..a97fc037 100644
--- a/kolourpaint/widgets/kpresizesignallinglabel.h
+++ b/kolourpaint/widgets/kpresizesignallinglabel.h
@@ -38,8 +38,8 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpResizeSignallingLabel (const TQString &string, TQWidget *tqparent, const char *name = 0);
-    kpResizeSignallingLabel (TQWidget *tqparent, const char *name = 0);
+    kpResizeSignallingLabel (const TQString &string, TQWidget *parent, const char *name = 0);
+    kpResizeSignallingLabel (TQWidget *parent, const char *name = 0);
     virtual ~kpResizeSignallingLabel ();
 
 signals:
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
index 8cd4dfbb..6e7386ec 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp
@@ -38,14 +38,14 @@
 #include <klocale.h>
 
 
-kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *tqparent, const char *name)
-    : TQLabel (tqparent, name),
+kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *parent, const char *name)
+    : TQLabel (parent, name),
       m_showEllipsis (true)
 {
 }
 
-kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name)
-    : TQLabel (tqparent, name),
+kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name)
+    : TQLabel (parent, name),
       m_showEllipsis (true)
 {
     setText (text);
diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h
index 1169be63..4697af8a 100644
--- a/kolourpaint/widgets/kpsqueezedtextlabel.h
+++ b/kolourpaint/widgets/kpsqueezedtextlabel.h
@@ -40,8 +40,8 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpSqueezedTextLabel (TQWidget *tqparent, const char *name = 0);
-    kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name = 0);
+    kpSqueezedTextLabel (TQWidget *parent, const char *name = 0);
+    kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0);
 
     virtual TQSize tqminimumSizeHint () const;
 
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index 163a7f49..ba048d5c 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -58,8 +58,8 @@
 class kpToolButton : public TQToolButton
 {
 public:
-    kpToolButton (kpTool *tool, TQWidget *tqparent)
-        : TQToolButton (tqparent),
+    kpToolButton (kpTool *tool, TQWidget *parent)
+        : TQToolButton (parent),
           m_tool (tool)
     {
     }
diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp
index ef5f35c3..3d1d3cff 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbase.cpp
@@ -45,8 +45,8 @@
 #include <kpeffectinvert.h>
 
 
-kpToolWidgetBase::kpToolWidgetBase (TQWidget *tqparent, const char *name)
-    : TQFrame (tqparent, name),
+kpToolWidgetBase::kpToolWidgetBase (TQWidget *parent, const char *name)
+    : TQFrame (parent, name),
       m_invertSelectedPixmap (true),
       m_selectedRow (-1), m_selectedCol (-1)
 {
diff --git a/kolourpaint/widgets/kptoolwidgetbase.h b/kolourpaint/widgets/kptoolwidgetbase.h
index 8bef2a67..4afb8d35 100644
--- a/kolourpaint/widgets/kptoolwidgetbase.h
+++ b/kolourpaint/widgets/kptoolwidgetbase.h
@@ -40,14 +40,14 @@
 class TQPainter;
 
 
-// TODO: frame becomes a combobox when its tqparent kpToolToolBar becomes too small
+// TODO: frame becomes a combobox when its parent kpToolToolBar becomes too small
 class kpToolWidgetBase : public TQFrame
 {
 Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetBase (TQWidget *tqparent, const char *name);  // must provide a name for config to work
+    kpToolWidgetBase (TQWidget *parent, const char *name);  // must provide a name for config to work
     virtual ~kpToolWidgetBase ();
 
 public:
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp
index 69445905..0c583126 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.cpp
+++ b/kolourpaint/widgets/kptoolwidgetbrush.cpp
@@ -52,8 +52,8 @@ static int brushSize [][3] =
 #define BRUSH_SIZE_NUM_COLS (int (sizeof (brushSize [0]) / sizeof (brushSize [0][0])))
 #define BRUSH_SIZE_NUM_ROWS (int (sizeof (brushSize) / sizeof (brushSize [0])))
 
-kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *tqparent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 
diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h
index 7fc2ffe0..0fd2f46a 100644
--- a/kolourpaint/widgets/kptoolwidgetbrush.h
+++ b/kolourpaint/widgets/kptoolwidgetbrush.h
@@ -39,7 +39,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetBrush (TQWidget *tqparent, const char *name);
+    kpToolWidgetBrush (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetBrush ();
 
 private:
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
index c4354dea..d27965a6 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.cpp
@@ -44,8 +44,8 @@ static int eraserSizes [] = {2, 3, 5, 9, 17, 29};
 static const int numEraserSizes = int (sizeof (eraserSizes) / sizeof (eraserSizes [0]));
 
 
-kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 
@@ -75,14 +75,14 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *
         painter.fillRect (rect, TQt::black);
         painter.end ();
 
-        TQBitmap tqmask (previewPixmap.width (), previewPixmap.height ());
-        tqmask.fill (TQt::color0/*transparent*/);
+        TQBitmap mask (previewPixmap.width (), previewPixmap.height ());
+        mask.fill (TQt::color0/*transparent*/);
 
-        TQPainter maskPainter (&tqmask);
+        TQPainter maskPainter (&mask);
         maskPainter.fillRect (rect, TQt::color1/*opaque*/);
         maskPainter.end ();
 
-        previewPixmap.setMask (tqmask);
+        previewPixmap.setMask (mask);
 
 
         addOption (previewPixmap, i18n ("%1x%2").arg (s).arg (s)/*tooltip*/);
diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.h b/kolourpaint/widgets/kptoolwidgeterasersize.h
index 1568088d..2f7c0be0 100644
--- a/kolourpaint/widgets/kptoolwidgeterasersize.h
+++ b/kolourpaint/widgets/kptoolwidgeterasersize.h
@@ -41,7 +41,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetEraserSize (TQWidget *tqparent, const char *name);
+    kpToolWidgetEraserSize (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetEraserSize ();
 
     int eraserSize () const;
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
index e2a1afce..a87714c5 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp
@@ -42,8 +42,8 @@
 #include <kptool.h>
 
 
-kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *tqparent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *parent, const char *name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 
@@ -85,10 +85,10 @@ TQPixmap kpToolWidgetFillStyle::fillStylePixmap (FillStyle fs, int w, int h)
     painter.end ();
 
 
-    TQBitmap tqmask (pixmap.width (), pixmap.height ());
-    tqmask.fill (TQt::color0);
+    TQBitmap mask (pixmap.width (), pixmap.height ());
+    mask.fill (TQt::color0);
 
-    painter.begin (&tqmask);
+    painter.begin (&mask);
     painter.setPen (TQPen (TQt::color1, 2));
 
     if (fs == FillWithBackground || fs == FillWithForeground)
@@ -98,7 +98,7 @@ TQPixmap kpToolWidgetFillStyle::fillStylePixmap (FillStyle fs, int w, int h)
 
     painter.end ();
 
-    pixmap.setMask (tqmask);
+    pixmap.setMask (mask);
 
     return pixmap;
 }
diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.h b/kolourpaint/widgets/kptoolwidgetfillstyle.h
index 82ee1357..c32b3b65 100644
--- a/kolourpaint/widgets/kptoolwidgetfillstyle.h
+++ b/kolourpaint/widgets/kptoolwidgetfillstyle.h
@@ -41,7 +41,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetFillStyle (TQWidget *tqparent, const char *name);
+    kpToolWidgetFillStyle (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetFillStyle ();
 
     enum FillStyle
diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
index 0d419333..2ac9e39c 100644
--- a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
+++ b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp
@@ -36,8 +36,8 @@
 
 static int lineWidths [] = {1, 2, 3, 5, 8};
 
-kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *tqparent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *parent, const char *name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 
diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.h b/kolourpaint/widgets/kptoolwidgetlinewidth.h
index 8ac76909..6cc82d26 100644
--- a/kolourpaint/widgets/kptoolwidgetlinewidth.h
+++ b/kolourpaint/widgets/kptoolwidgetlinewidth.h
@@ -37,7 +37,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetLineWidth (TQWidget *tqparent, const char *name);
+    kpToolWidgetLineWidth (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetLineWidth ();
 
     int lineWidth () const;
diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp
index 6479d891..4cd5b6f6 100644
--- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp
+++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp
@@ -35,8 +35,8 @@
 #include <klocale.h>
 
 
-kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *tqparent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap (false);
 
diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h
index 45e49a2f..613841f2 100644
--- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h
+++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h
@@ -38,7 +38,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetOpaqueOrTransparent (TQWidget *tqparent, const char *name);
+    kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetOpaqueOrTransparent ();
 
     bool isOpaque () const;
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
index cce8f1b5..503cecd2 100644
--- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
+++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp
@@ -44,8 +44,8 @@
 
 static int spraycanSizes [] = {9, 17, 29};
 
-kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char *name)
+    : kpToolWidgetBase (parent, name)
 {
 #if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE
     kdDebug () << "kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize() CALLED!" << endl;
@@ -69,10 +69,10 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const ch
 
         TQImage image = kpPixmapFX::convertToImage (pixmap);
 
-        TQBitmap tqmask (pixmap.width (), pixmap.height ());
-        tqmask.fill (TQt::color0);
+        TQBitmap mask (pixmap.width (), pixmap.height ());
+        mask.fill (TQt::color0);
 
-        painter.begin (&tqmask);
+        painter.begin (&mask);
         painter.setPen (TQt::color1);
         
         for (int y = 0; y < image.height (); y++)
@@ -86,7 +86,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const ch
 
         painter.end ();
 
-        pixmap.setMask (tqmask);
+        pixmap.setMask (mask);
         
         addOption (pixmap, i18n ("%1x%2").arg (s).arg (s)/*tooltip*/);
         if (i == 1)
diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.h b/kolourpaint/widgets/kptoolwidgetspraycansize.h
index ef86891f..dc10ac1b 100644
--- a/kolourpaint/widgets/kptoolwidgetspraycansize.h
+++ b/kolourpaint/widgets/kptoolwidgetspraycansize.h
@@ -37,7 +37,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetSpraycanSize (TQWidget *tqparent, const char *name);
+    kpToolWidgetSpraycanSize (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetSpraycanSize ();
 
     int spraycanSize () const;