rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 11 insertions, 11 deletions

diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp
index 7c66462..8afb9b9 100644
--- a/src/kcolorcombo2.cpp
+++ b/src/kcolorcombo2.cpp
@@ -52,9 +52,9 @@ const int KColorPopup::MARGIN      = 1;
 const int KColorPopup::FRAME_WIDTH = 1;
 
 
-KColorPopup::KColorPopup(KColorCombo2 *tqparent)
- : TQWidget(/*tqparent=*/0, /*name=*/0, WType_Popup | WNoAutoErase),
-   m_selector(tqparent)
+KColorPopup::KColorPopup(KColorCombo2 *parent)
+ : TQWidget(/*parent=*/0, /*name=*/0, WType_Popup | WNoAutoErase),
+   m_selector(parent)
 {
 	hide();
 	setMouseTracking(true);
@@ -318,15 +318,15 @@ class KColorCombo2::KColorCombo2Private
  * Some other piece of code comes from KColorButton (in libkdeui) to enable color drag, drop, copy and paste.
  */
 
-KColorCombo2::KColorCombo2(const TQColor &color, const TQColor &defaultColor, TQWidget *tqparent, const char *name)
- : TQComboBox(/*editable=*/false, tqparent, name),
+KColorCombo2::KColorCombo2(const TQColor &color, const TQColor &defaultColor, TQWidget *parent, const char *name)
+ : TQComboBox(/*editable=*/false, parent, name),
    m_color(color), m_defaultColor(defaultColor)
 {
 	init();
 }
 
-KColorCombo2::KColorCombo2(const TQColor &color, TQWidget *tqparent, const char *name)
- : TQComboBox(/*editable=*/false, tqparent, name),
+KColorCombo2::KColorCombo2(const TQColor &color, TQWidget *parent, const char *name)
+ : TQComboBox(/*editable=*/false, parent, name),
    m_color(color), m_defaultColor()
 {
 	init();
@@ -518,14 +518,14 @@ TQPixmap KColorCombo2::colorRectPixmap(const TQColor &color, bool isDefault, int
 {
 	// Prepare to draw:
 	TQPixmap  pixmap(width, height);
-	TQBitmap  tqmask(width, height);
+	TQBitmap  mask(width, height);
 	TQPainter painter(&pixmap);
-	TQPainter maskPainter(&tqmask);
+	TQPainter maskPainter(&mask);
 
 	// Draw pixmap:
 	drawColorRect(painter, 0, 0, color, isDefault, width, height);
 
-	// Draw tqmask (make the four corners transparent):
+	// Draw mask (make the four corners transparent):
 	maskPainter.fillRect(0, 0, width, height, TQt::color1); // opaque
 	maskPainter.setPen(TQt::color0); // transparent
 	maskPainter.drawPoint(0,         0);
@@ -536,7 +536,7 @@ TQPixmap KColorCombo2::colorRectPixmap(const TQColor &color, bool isDefault, int
 	// Finish:
 	painter.end();
 	maskPainter.end();
-	pixmap.setMask(tqmask);
+	pixmap.setMask(mask);
 	return pixmap;
 }