diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-27 02:13:42 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-27 02:13:42 -0600 |
commit | 520c05ef06ce203ad32470730f68402bc7719157 (patch) | |
tree | 8d0bb18bbbecb4c837e232848905e5819db84b81 /src/opengl/qglcolormap.cpp | |
parent | b82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff) | |
download | tqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip |
Automated update from qt3
Diffstat (limited to 'src/opengl/qglcolormap.cpp')
-rw-r--r-- | src/opengl/qglcolormap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp index 048b7dc29..d095a754c 100644 --- a/src/opengl/qglcolormap.cpp +++ b/src/opengl/qglcolormap.cpp @@ -86,7 +86,7 @@ // This will fill the colormap with colors ranging from // black to white. for ( int i = 0; i < colormap.size(); i++ ) - colormap.setEntry( i, qRgb( i, i, i ) ); + colormap.setEntry( i, tqRgb( i, i, i ) ); widget.setColormap( colormap ); widget.show(); @@ -273,15 +273,15 @@ int TQGLColormap::findNearest( TQRgb color ) const return idx; int mapSize = size(); int mindist = 200000; - int r = qRed( color ); - int g = qGreen( color ); - int b = qBlue( color ); + int r = tqRed( color ); + int g = tqGreen( color ); + int b = tqBlue( color ); int rx, gx, bx, dist; for ( int i=0; i < mapSize; i++ ) { TQRgb ci = d->cells[i]; - rx = r - qRed( ci ); - gx = g - qGreen( ci ); - bx = b - qBlue( ci ); + rx = r - tqRed( ci ); + gx = g - tqGreen( ci ); + bx = b - tqBlue( ci ); dist = rx*rx + gx*gx + bx*bx; // calculate distance if ( dist < mindist ) { // minimal? mindist = dist; |