From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: 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
---
 libkonq/konq_pixmapprovider.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libkonq/konq_pixmapprovider.cc')

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 );
-- 
cgit v1.2.3