summaryrefslogtreecommitdiffstats
path: root/libkonq/konq_pixmapprovider.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /libkonq/konq_pixmapprovider.cc
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkonq/konq_pixmapprovider.cc')
-rw-r--r--libkonq/konq_pixmapprovider.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc
index 9ce147b07..3cff83453 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cc
@@ -182,13 +182,13 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon
int x = big.width() - small.width();
int y = 0;
- if ( big.tqmask() ) {
- TQBitmap tqmask = *big.tqmask();
- bitBlt( &tqmask, x, y,
- small.tqmask() ? const_cast<TQBitmap *>(small.tqmask()) : &small, 0, 0,
+ if ( big.mask() ) {
+ TQBitmap mask = *big.mask();
+ bitBlt( &mask, x, y,
+ small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0,
small.width(), small.height(),
- small.tqmask() ? OrROP : SetROP );
- big.setMask( tqmask );
+ small.mask() ? OrROP : SetROP );
+ big.setMask( mask );
}
bitBlt( &big, x, y, &small );