diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | 03feb89582fc354acaeb1df65a687361a661486d (patch) | |
| tree | 03a4187dca202e597505821cf81e2ec419b6e2ff /kdesktop | |
| parent | 9a3f0aacd44fb866833ebcb852df3cd31475cb33 (diff) | |
| download | tdebase-03feb89582fc354acaeb1df65a687361a661486d.tar.gz tdebase-03feb89582fc354acaeb1df65a687361a661486d.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/minicli.cpp | 8 | ||||
| -rw-r--r-- | kdesktop/startupid.cpp | 8 |
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 ] ) ) ) |