diff options
Diffstat (limited to 'kmail/headeritem.cpp')
| -rw-r--r-- | kmail/headeritem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 188e0532..684dd590 100644 --- a/kmail/headeritem.cpp +++ b/kmail/headeritem.cpp @@ -138,7 +138,7 @@ TQString HeaderItem::from() const } // Return the serial number -Q_UINT32 HeaderItem::msgSerNum() const +TQ_UINT32 HeaderItem::msgSerNum() const { return mSerNum; } @@ -232,17 +232,17 @@ TQPixmap HeaderItem::pixmapMerge( PixmapList pixmaps ) const } TQPixmap res( width, height ); - TQBitmap mask( width, height, true ); + TQBitmap tqmask( width, height, true ); int x = 0; for ( PixmapList::ConstIterator it = pixmaps.begin(); it != pixmaps.end(); ++it ) { bitBlt( &res, x, (height - (*it).height()) / 2, &(*it) ); - bitBlt( &mask, x, (height - (*it).height()) / 2, (*it).mask() ); + bitBlt( &tqmask, x, (height - (*it).height()) / 2, (*it).tqmask() ); x += (*it).width(); } - res.setMask( mask ); + res.setMask( tqmask ); return res; } |