diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp')
| -rw-r--r-- | experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp b/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp index 9aa3a59b9..b2861b076 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp +++ b/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp @@ -217,27 +217,27 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, x += w - pm.width(); if ( !enabled ) { - if ( pm.tqmask() ) { // pixmap with a tqmask - if ( !pm.selfMask() ) { // tqmask is not pixmap itself - TQPixmap pmm( *pm.tqmask() ); + if ( pm.mask() ) { // pixmap with a mask + if ( !pm.selfMask() ) { // mask is not pixmap itself + TQPixmap pmm( *pm.mask() ); pmm.setMask( *((TQBitmap *)&pmm) ); pm = pmm; } - } else if ( pm.depth() == 1 ) { // monochrome pixmap, no tqmask + } else if ( pm.depth() == 1 ) { // monochrome pixmap, no mask pm.setMask( *((TQBitmap *)&pm) ); #ifndef TQT_NO_IMAGE_HEURISTIC_MASK - } else { // color pixmap, no tqmask + } else { // color pixmap, no mask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::find(k); + TQPixmap *mask = TQPixmapCache::find(k); bool del=FALSE; - if ( !tqmask ) { - tqmask = new TQPixmap( pm.createHeuristicMask() ); - tqmask->setMask( *((TQBitmap*)tqmask) ); - del = !TQPixmapCache::insert( k, tqmask ); + if ( !mask ) { + mask = new TQPixmap( pm.createHeuristicMask() ); + mask->setMask( *((TQBitmap*)mask) ); + del = !TQPixmapCache::insert( k, mask ); } - pm = *tqmask; - if (del) delete tqmask; + pm = *mask; + if (del) delete mask; #endif } if ( gs == TQt::WindowsStyle ) { @@ -898,27 +898,27 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, x += w - pm.width(); if ( !enabled ) { - if ( pm.tqmask() ) { // pixmap with a tqmask - if ( !pm.selfMask() ) { // tqmask is not pixmap itself - TQPixmap pmm( *pm.tqmask() ); + if ( pm.mask() ) { // pixmap with a mask + if ( !pm.selfMask() ) { // mask is not pixmap itself + TQPixmap pmm( *pm.mask() ); pmm.setMask( *((TQBitmap *)&pmm) ); pm = pmm; } - } else if ( pm.depth() == 1 ) { // monochrome pixmap, no tqmask + } else if ( pm.depth() == 1 ) { // monochrome pixmap, no mask pm.setMask( *((TQBitmap *)&pm) ); #ifndef TQT_NO_IMAGE_HEURISTIC_MASK - } else { // color pixmap, no tqmask + } else { // color pixmap, no mask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::find(k); + TQPixmap *mask = TQPixmapCache::find(k); bool del=FALSE; - if ( !tqmask ) { - tqmask = new TQPixmap( pm.createHeuristicMask() ); - tqmask->setMask( *((TQBitmap*)tqmask) ); - del = !TQPixmapCache::insert( k, tqmask ); + if ( !mask ) { + mask = new TQPixmap( pm.createHeuristicMask() ); + mask->setMask( *((TQBitmap*)mask) ); + del = !TQPixmapCache::insert( k, mask ); } - pm = *tqmask; - if (del) delete tqmask; + pm = *mask; + if (del) delete mask; #endif } if ( gs == TQt::WindowsStyle ) { @@ -974,10 +974,10 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \value PE_Indicator on/off indicator, for example, a TQCheckBox. - \value PE_IndicatorMask bitmap tqmask for an indicator. + \value PE_IndicatorMask bitmap mask for an indicator. \value PE_ExclusiveIndicator exclusive on/off indicator, for example, a TQRadioButton. - \value PE_ExclusiveIndicatorMask bitmap tqmask for an exclusive indicator. + \value PE_ExclusiveIndicatorMask bitmap mask for an exclusive indicator. \value PE_DockWindowHandle tear off handle for dock windows and @@ -1376,7 +1376,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, /*! \fn void TQStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& opt) const - Draw a bittqmask for the ControlElement \a element using the painter + Draw a bitmask for the ControlElement \a element using the painter \a p in the area \a r. See tqdrawControl() for an explanation of the use of the \a widget and \a opt arguments. @@ -1665,7 +1665,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, /*! \fn void TQStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& opt) const - Draw a bittqmask for the ComplexControl \a control using the painter + Draw a bitmask for the ComplexControl \a control using the painter \a p in the area \a r. See tqdrawComplexControl() for an explanation of the use of the \a widget and \a opt arguments. |