rename the following methods:

tqparent parent
tqmask mask

1 files changed, 11 insertions, 11 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqiconset.cpp b/tqtinterface/qt4/src/kernel/tqiconset.cpp
index 09a1126..95656c0 100644
--- a/tqtinterface/qt4/src/kernel/tqiconset.cpp
+++ b/tqtinterface/qt4/src/kernel/tqiconset.cpp
@@ -794,11 +794,11 @@ TQPixmap *TQIconSet::createScaled( Size size, const TQPixmap *suppliedPix ) cons
     img = img.smoothScale( imgSize );
 
     TQPixmap *pixmap = new TQPixmap( img );
-    if ( !pixmap->tqmask() ) {
-	TQBitmap tqmask;
-	tqmask.convertFromImage( img.createHeuristicMask(),
+    if ( !pixmap->mask() ) {
+	TQBitmap mask;
+	mask.convertFromImage( img.createHeuristicMask(),
 			       TQt::MonoOnly | TQt::ThresholdDither );
-	pixmap->setMask( tqmask );
+	pixmap->setMask( mask );
     }
     return pixmap;
 }
@@ -816,8 +816,8 @@ TQPixmap *TQIconSet::createDisabled( Size size, State state ) const
     TQImage img;
     TQPixmap *pixmap = 0;
     TQBitmap normalMask;
-    if ( normalPix.tqmask() ) {
-	normalMask = *normalPix.tqmask();
+    if ( normalPix.mask() ) {
+	normalMask = *normalPix.mask();
     } else {
 	img = normalPix.convertToImage();
 	normalMask.convertFromImage( img.createHeuristicMask(),
@@ -837,16 +837,16 @@ TQPixmap *TQIconSet::createDisabled( Size size, State state ) const
     painter.drawPixmap( 0, 0, normalMask );
     painter.end();
 
-    if ( !normalMask.tqmask() )
+    if ( !normalMask.mask() )
 	normalMask.setMask( normalMask );
 
-    TQBitmap tqmask( pixmap->size() );
-    tqmask.fill( TQt::color0 );
-    painter.begin( &tqmask );
+    TQBitmap mask( pixmap->size() );
+    mask.fill( TQt::color0 );
+    painter.begin( &mask );
     painter.drawPixmap( 0, 0, normalMask );
     painter.drawPixmap( 1, 1, normalMask );
     painter.end();
-    pixmap->setMask( tqmask );
+    pixmap->setMask( mask );
     return pixmap;
 }