diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
| commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
| tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /kdefx/kpixmap.cpp | |
| parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
| download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip | |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdefx/kpixmap.cpp')
| -rw-r--r-- | kdefx/kpixmap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kdefx/kpixmap.cpp b/kdefx/kpixmap.cpp index eeccb6213..698f986af 100644 --- a/kdefx/kpixmap.cpp +++ b/kdefx/kpixmap.cpp @@ -56,7 +56,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst ) for ( gc=0; gc<=MAX_G; gc++ ) for ( bc=0; bc<=MAX_B; bc++ ) { dst->setColor( INDEXOF(rc,gc,bc), - qRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) ); + tqRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) ); } int sw = src->width(); @@ -259,7 +259,7 @@ bool KPixmap::convertFromImage( const TQImage &img, int conversion_flags ) return TQPixmap::convertFromImage( img, TQPixmap::Auto ); } - TQBitmap mask; + TQBitmap tqmask; bool isMask = false; TQImage image = img.convertDepth(32); @@ -268,13 +268,13 @@ bool KPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if( img.hasAlphaBuffer() ) { image.setAlphaBuffer( true ); tImage.setAlphaBuffer( true ); - isMask = mask.convertFromImage( img.createAlphaMask() ); + isMask = tqmask.convertFromImage( img.createAlphaMask() ); } kdither_32_to_8( &image, &tImage ); if( TQPixmap::convertFromImage( tImage ) ) { - if ( isMask ) TQPixmap::setMask( mask ); + if ( isMask ) TQPixmap::setMask( tqmask ); return true; } else return false; @@ -367,9 +367,9 @@ bool KPixmap::checkColorTable( const TQImage &image ) for ( i=0; i<ncols; i++ ) { for ( j=0; j<40; j++ ) { - if ( kpixmap_iconPalette[j].red() == qRed( ctable[i] ) && - kpixmap_iconPalette[j].green() == qGreen( ctable[i] ) && - kpixmap_iconPalette[j].blue() == qBlue( ctable[i] ) ) { + if ( kpixmap_iconPalette[j].red() == tqRed( ctable[i] ) && + kpixmap_iconPalette[j].green() == tqGreen( ctable[i] ) && + kpixmap_iconPalette[j].blue() == tqBlue( ctable[i] ) ) { break; } } |