diff options
| author | Timothy Pearson <[email protected]> | 2012-02-27 02:13:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-27 02:13:42 -0600 |
| commit | 520c05ef06ce203ad32470730f68402bc7719157 (patch) | |
| tree | 8d0bb18bbbecb4c837e232848905e5819db84b81 /src/kernel/ntqcolor.h | |
| parent | b82553bf90cb5311cfe8e673b07cf6cffc95fd3c (diff) | |
| download | tqt3-520c05ef06ce203ad32470730f68402bc7719157.tar.gz tqt3-520c05ef06ce203ad32470730f68402bc7719157.zip | |
Automated update from qt3
Diffstat (limited to 'src/kernel/ntqcolor.h')
| -rw-r--r-- | src/kernel/ntqcolor.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h index fd9e7630b..a35e81098 100644 --- a/src/kernel/ntqcolor.h +++ b/src/kernel/ntqcolor.h @@ -46,31 +46,31 @@ #include "ntqstringlist.h" #endif // QT_H -const TQRgb RGB_MASK = 0x00ffffff; // masks RGB values +const TQRgb TQT_RGB_MASK = 0x00ffffff; // masks RGB values -Q_EXPORT inline int qRed( TQRgb rgb ) // get red part of RGB +Q_EXPORT inline int tqRed( TQRgb rgb ) // get red part of RGB { return (int)((rgb >> 16) & 0xff); } -Q_EXPORT inline int qGreen( TQRgb rgb ) // get green part of RGB +Q_EXPORT inline int tqGreen( TQRgb rgb ) // get green part of RGB { return (int)((rgb >> 8) & 0xff); } -Q_EXPORT inline int qBlue( TQRgb rgb ) // get blue part of RGB +Q_EXPORT inline int tqBlue( TQRgb rgb ) // get blue part of RGB { return (int)(rgb & 0xff); } -Q_EXPORT inline int qAlpha( TQRgb rgb ) // get alpha part of RGBA +Q_EXPORT inline int tqAlpha( TQRgb rgb ) // get alpha part of RGBA { return (int)((rgb >> 24) & 0xff); } -Q_EXPORT inline TQRgb qRgb( int r, int g, int b )// set RGB value +Q_EXPORT inline TQRgb tqRgb( int r, int g, int b )// set RGB value { return (0xff << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -Q_EXPORT inline TQRgb qRgba( int r, int g, int b, int a )// set RGBA value +Q_EXPORT inline TQRgb tqRgba( int r, int g, int b, int a )// set RGBA value { return ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -Q_EXPORT inline int qGray( int r, int g, int b )// convert R,G,B to gray 0..255 +Q_EXPORT inline int tqGray( int r, int g, int b )// convert R,G,B to gray 0..255 { return (r*11+g*16+b*5)/32; } -Q_EXPORT inline int qGray( TQRgb rgb ) // convert RGB to gray 0..255 -{ return qGray( qRed(rgb), qGreen(rgb), qBlue(rgb) ); } +Q_EXPORT inline int tqGray( TQRgb rgb ) // convert RGB to gray 0..255 +{ return tqGray( tqRed(rgb), tqGreen(rgb), tqBlue(rgb) ); } class Q_EXPORT TQColor @@ -190,13 +190,13 @@ inline TQRgb TQColor::rgb() const { return d.argb; } inline int TQColor::red() const -{ return qRed(d.argb); } +{ return tqRed(d.argb); } inline int TQColor::green() const -{ return qGreen(d.argb); } +{ return tqGreen(d.argb); } inline int TQColor::blue() const -{ return qBlue(d.argb); } +{ return tqBlue(d.argb); } inline bool TQColor::isValid() const { |