rename the following methods:

tqparent parent
tqmask mask


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

5 files changed, 17 insertions, 17 deletions

diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 9d09055b1..578d8f9e2 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -116,7 +116,7 @@ void AsteroidStyle::polish(TQWidget *w)
 		if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem")) {
 			isProtectedObject = true;
 		}
-		curparent = curparent->tqparent();
+		curparent = curparent->parent();
 	}
 	if (!isProtectedObject)
 		w->setPalette(wp);
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp
index cb3078063..49e024442 100644
--- a/kstyles/keramik/keramik.cpp
+++ b/kstyles/keramik/keramik.cpp
@@ -1976,7 +1976,7 @@ void KeramikStyle::tqdrawComplexControl( TQ_ComplexControl control,
 			{
 				//Double-buffer only when we are in the slower full-blend mode
 				if (widget->parent() &&
-						( widget->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)|| !qstrcmp(widget->tqparent()->name(), kdeToolbarWidget) ) )
+						( widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)|| !qstrcmp(widget->parent()->name(), kdeToolbarWidget) ) )
 				{
 					buf = new TQPixmap( r.width(), r.height() );
 					br.setX(0);
diff --git a/kstyles/keramik/pixmaploader.cpp b/kstyles/keramik/pixmaploader.cpp
index 414965c01..00b4626fd 100644
--- a/kstyles/keramik/pixmaploader.cpp
+++ b/kstyles/keramik/pixmaploader.cpp
@@ -422,7 +422,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 					}
 					else
 					{
-						const TQBitmap* mask  = scale( col, row, w, h, color,  bg, disabled, false ).tqmask();
+						const TQBitmap* mask  = scale( col, row, w, h, color,  bg, disabled, false ).mask();
 						if (mask)
 						{
 							p->setBackgroundColor(Qt::color0);
@@ -442,7 +442,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const
 					}
 					else
 					{
-						const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).tqmask();
+						const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask();
 						if (mask)
 						{
 							p->setBackgroundColor(Qt::color0);
diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp
index 70d820212..a4da66736 100644
--- a/kstyles/kthemestyle/kthemebase.cpp
+++ b/kstyles/kthemestyle/kthemebase.cpp
@@ -239,7 +239,7 @@ void KThemeBase::generateBorderPix( int i )
     if ( pbPixmaps[ i ] )
     {
         // evidently I have to do masks manually...
-        const TQBitmap * srcMask = pbPixmaps[ i ] ->tqmask();
+        const TQBitmap * srcMask = pbPixmaps[ i ] ->mask();
         TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] );
         TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] );
 
@@ -810,7 +810,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         mPainter.begin( &mask );
 
         TQPixmap *tmp = borderPixmap( widget ) ->border( KThemePixmap::TopLeft );
-        const TQBitmap *srcMask = tmp->tqmask();
+        const TQBitmap *srcMask = tmp->mask();
         int bdWidth = tmp->width();
 
         bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bdWidth,
@@ -823,7 +823,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
 
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth,
                 bdWidth, TQt::CopyROP, false );
         if ( srcMask )
@@ -833,7 +833,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth,
                 bdWidth, TQt::CopyROP, false );
         if ( srcMask )
@@ -843,7 +843,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
             mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 );
 
         tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight );
-        srcMask = tmp->tqmask();
+        srcMask = tmp->mask();
         bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0,
                 bdWidth, bdWidth, TQt::CopyROP, false );
         if ( srcMask )
@@ -857,7 +857,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         if ( w - bdWidth * 2 > 0 )
         {
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Top );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp );
             if ( srcMask )
                 bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
@@ -866,7 +866,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
                 mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 );
 
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Bottom );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth,
                                *tmp );
             if ( srcMask )
@@ -879,7 +879,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
         if ( h - bdWidth * 2 > 0 )
         {
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Left );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp );
             if ( srcMask )
                 bitBlt( TQT_TQPAINTDEVICE(&mask), 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0,
@@ -888,7 +888,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const
                 mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 );
 
             tmp = borderPixmap( widget ) ->border( KThemePixmap::Right );
-            srcMask = tmp->tqmask();
+            srcMask = tmp->mask();
             p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2,
                                *tmp );
             if ( srcMask )
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 59ff2c30f..96cbc9b88 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -895,7 +895,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
             {
                 if ( isPixmap( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) )
                 {
-                    const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->tqmask();
+                    const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask();
                     if ( mask )
                     {
                         p->setPen( Qt::color1 );
@@ -913,7 +913,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQRe
                 if ( isPixmap( ( flags & Style_On ) ? IndicatorOn : IndicatorOff ) )
                 {
                     const TQBitmap * mask = uncached( ( flags & Style_On ) ? IndicatorOn :
-                                                     IndicatorOff ) ->tqmask();
+                                                     IndicatorOff ) ->mask();
                     if ( mask )
                     {
                         p->setPen( Qt::color1 );
@@ -1853,8 +1853,8 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe,
                             TQWMatrix r270;
                             r270.rotate( 270 );
                             vsliderCache = new TQPixmap( uncached( Slider ) ->xForm( r270 ) );
-                            if ( uncached( Slider ) ->tqmask() )
-                                vsliderCache->setMask( uncached( Slider ) ->tqmask() ->xForm( r270 ) );
+                            if ( uncached( Slider ) ->mask() )
+                                vsliderCache->setMask( uncached( Slider ) ->mask() ->xForm( r270 ) );
                         }
                         bitBlt( p->device(), x + ( w - vsliderCache->width() ) / 2, y,
                                 vsliderCache );