diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdefx/kpixmap.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 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 698f986af..eeccb6213 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), - tqRgb( rc*255/MAX_R, gc*255/MAX_G, bc*255/MAX_B ) ); + qRgb( 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 tqmask; + TQBitmap mask; 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 = tqmask.convertFromImage( img.createAlphaMask() ); + isMask = mask.convertFromImage( img.createAlphaMask() ); } kdither_32_to_8( &image, &tImage ); if( TQPixmap::convertFromImage( tImage ) ) { - if ( isMask ) TQPixmap::setMask( tqmask ); + if ( isMask ) TQPixmap::setMask( mask ); 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() == tqRed( ctable[i] ) && - kpixmap_iconPalette[j].green() == tqGreen( ctable[i] ) && - kpixmap_iconPalette[j].blue() == tqBlue( ctable[i] ) ) { + if ( kpixmap_iconPalette[j].red() == qRed( ctable[i] ) && + kpixmap_iconPalette[j].green() == qGreen( ctable[i] ) && + kpixmap_iconPalette[j].blue() == qBlue( ctable[i] ) ) { break; } } |