diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
| commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
| tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /libkonq/konq_pixmapprovider.cc | |
| parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
| download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip | |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkonq/konq_pixmapprovider.cc')
| -rw-r--r-- | libkonq/konq_pixmapprovider.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 3cff83453..932b1b7d0 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -32,7 +32,7 @@ KonqPixmapProvider * KonqPixmapProvider::s_self = 0L; KonqPixmapProvider * KonqPixmapProvider::self() { if ( !s_self ) - s_self = new KonqPixmapProvider( kapp, "KonqPixmapProvider" ); + s_self = new KonqPixmapProvider( TQT_TQOBJECT(kapp), "KonqPixmapProvider" ); return s_self; } @@ -54,7 +54,7 @@ KonqPixmapProvider::~KonqPixmapProvider() // finally, inserts the url/icon pair into the cache TQString KonqPixmapProvider::iconNameFor( const TQString& url ) { - TQMapIterator<TQString,TQString> it = iconMap.find( url ); + TQMapIterator<TQString,TQString> it = iconMap.tqfind( url ); TQString icon; if ( it != iconMap.end() ) { icon = it.data(); @@ -120,7 +120,7 @@ void KonqPixmapProvider::save( KConfig *kc, const TQString& key, TQStringList::ConstIterator it = items.begin(); TQMapConstIterator<TQString,TQString> mit; while ( it != items.end() ) { - mit = iconMap.find( *it ); + mit = iconMap.tqfind( *it ); if ( mit != iconMap.end() ) { list.append( mit.key() ); list.append( mit.data() ); @@ -182,12 +182,12 @@ 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(); + if ( big.tqmask() ) { + TQBitmap mask = *big.tqmask(); bitBlt( &mask, x, y, - small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0, + small.tqmask() ? TQT_TQPIXMAP(const_cast<TQBitmap *>(small.tqmask())) : &small, 0, 0, small.width(), small.height(), - small.mask() ? OrROP : SetROP ); + small.tqmask() ? OrROP : SetROP ); big.setMask( mask ); } |