summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/minicli.cpp8
-rw-r--r--kdesktop/startupid.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 69fef8e8f..910c721bc 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -806,13 +806,13 @@ void Minicli::setIcon ()
{
int x = icon.width() - overlay.width();
int y = icon.height() - overlay.height();
- if ( icon.tqmask() )
+ if ( icon.mask() )
{
- TQBitmap mask = *icon.tqmask();
+ TQBitmap mask = *icon.mask();
bitBlt( &mask, x, y,
- overlay.tqmask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(overlay.tqmask())) : &overlay,
+ overlay.mask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(overlay.mask())) : &overlay,
0, 0, overlay.width(), overlay.height(),
- overlay.tqmask() ? OrROP : SetROP );
+ overlay.mask() ? OrROP : SetROP );
icon.setMask(mask);
}
bitBlt( &icon, x, y, &overlay );
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index b534fe8ad..720dd4bba 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -218,8 +218,8 @@ void StartupId::start_startupid( const TQString& icon_P )
}
else
{
- if( icon_pixmap.tqmask() != NULL )
- startup_widget->setMask( *icon_pixmap.tqmask());
+ if( icon_pixmap.mask() != NULL )
+ startup_widget->setMask( *icon_pixmap.mask());
else
startup_widget->clearMask();
startup_widget->setBackgroundPixmap( icon_pixmap );
@@ -257,8 +257,8 @@ void StartupId::update_startupid()
yoffset = frame_to_yoffset[ frame ];
TQPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ];
startup_widget->setBackgroundPixmap( pm );
- if ( pm.tqmask() != NULL )
- startup_widget->setMask( *pm.tqmask() );
+ if ( pm.mask() != NULL )
+ startup_widget->setMask( *pm.mask() );
else
startup_widget->clearMask();
if ( ++frame >= ( sizeof( frame_to_yoffset ) / sizeof( frame_to_yoffset[ 0 ] ) ) )