From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 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 3cff83453..9ce147b07 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.mask() ) { - TQBitmap mask = *big.mask(); - bitBlt( &mask, x, y, - small.mask() ? const_cast(small.mask()) : &small, 0, 0, + if ( big.tqmask() ) { + TQBitmap tqmask = *big.tqmask(); + bitBlt( &tqmask, x, y, + small.tqmask() ? const_cast(small.tqmask()) : &small, 0, 0, small.width(), small.height(), - small.mask() ? OrROP : SetROP ); - big.setMask( mask ); + small.tqmask() ? OrROP : SetROP ); + big.setMask( tqmask ); } bitBlt( &big, x, y, &small ); -- cgit v1.2.1