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/qgl_x11.cpp | |
| parent | b82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff) | |
| download | tqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip | |
Automated update from qt3
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index caa763981..8989a05b4 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -765,7 +765,7 @@ TQColor TQGLContext::overlayTransparentColor() const uchar r = (uchar)((col.red / 65535.0) * 255.0 + 0.5); uchar g = (uchar)((col.green / 65535.0) * 255.0 + 0.5); uchar b = (uchar)((col.blue / 65535.0) * 255.0 + 0.5); - return TQColor(qRgb(r,g,b), trans_colors[i].color); + return TQColor(tqRgb(r,g,b), trans_colors[i].color); } } } @@ -823,9 +823,9 @@ uint TQGLContext::colorIndex( const TQColor& c ) const XColor col; col.flags = DoRed | DoGreen | DoBlue; col.pixel = color_map_entry; - col.red = (ushort)((qRed(c.rgb()) / 255.0) * 65535.0 + 0.5); - col.green = (ushort)((qGreen(c.rgb()) / 255.0) * 65535.0 + 0.5); - col.blue = (ushort)((qBlue(c.rgb()) / 255.0) * 65535.0 + 0.5); + col.red = (ushort)((tqRed(c.rgb()) / 255.0) * 65535.0 + 0.5); + col.green = (ushort)((tqGreen(c.rgb()) / 255.0) * 65535.0 + 0.5); + col.blue = (ushort)((tqBlue(c.rgb()) / 255.0) * 65535.0 + 0.5); XStoreColor(TQPaintDevice::x11AppDisplay(), x->cmap, &col); cmap->insert(color_map_entry, target); @@ -1275,9 +1275,9 @@ static void qStoreColors( TQWidget * tlw, Colormap cmap, for ( int i = 0; i < cols.size(); i++ ) { color = cols.entryRgb( i ); c.pixel = i; - c.red = (ushort)( (qRed( color ) / 255.0) * 65535.0 + 0.5 ); - c.green = (ushort)( (qGreen( color ) / 255.0) * 65535.0 + 0.5 ); - c.blue = (ushort)( (qBlue( color ) / 255.0) * 65535.0 + 0.5 ); + c.red = (ushort)( (tqRed( color ) / 255.0) * 65535.0 + 0.5 ); + c.green = (ushort)( (tqGreen( color ) / 255.0) * 65535.0 + 0.5 ); + c.blue = (ushort)( (tqBlue( color ) / 255.0) * 65535.0 + 0.5 ); c.flags = DoRed | DoGreen | DoBlue; XStoreColor( tlw->x11Display(), cmap, &c ); } |