diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-26 13:00:56 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-26 15:33:00 +0200 |
| commit | f3721d77067d4d0f81971a4bfb1bb135bf146d8a (patch) | |
| tree | 33dbdff4faa162c5158fc5bf531b486213d4ded6 /src/gui/painting/qrgb.h | |
| parent | 93132154b5283bf26baee47c60471a245884382f (diff) | |
get rid of Q_*_EXPORT_INLINE macros
> Girish:
> We should be able to remove the macro completely today,
> just mark all those functions as plain inline.
> With Qt5, we don't have to worry about bc yet.
this fixes "import attribute ignored" warnings on mingw with -fno-keep-inline-dllexport
Change-Id: I616e5de7c8d59953ce03a316b941a439fae56298
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/painting/qrgb.h')
| -rw-r--r-- | src/gui/painting/qrgb.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gui/painting/qrgb.h b/src/gui/painting/qrgb.h index 6d046be1d5..dd59069236 100644 --- a/src/gui/painting/qrgb.h +++ b/src/gui/painting/qrgb.h @@ -53,31 +53,31 @@ typedef unsigned int QRgb; // RGB triplet const QRgb RGB_MASK = 0x00ffffff; // masks RGB values -Q_GUI_EXPORT_INLINE int qRed(QRgb rgb) // get red part of RGB +inline int qRed(QRgb rgb) // get red part of RGB { return ((rgb >> 16) & 0xff); } -Q_GUI_EXPORT_INLINE int qGreen(QRgb rgb) // get green part of RGB +inline int qGreen(QRgb rgb) // get green part of RGB { return ((rgb >> 8) & 0xff); } -Q_GUI_EXPORT_INLINE int qBlue(QRgb rgb) // get blue part of RGB +inline int qBlue(QRgb rgb) // get blue part of RGB { return (rgb & 0xff); } -Q_GUI_EXPORT_INLINE int qAlpha(QRgb rgb) // get alpha part of RGBA +inline int qAlpha(QRgb rgb) // get alpha part of RGBA { return rgb >> 24; } -Q_GUI_EXPORT_INLINE QRgb qRgb(int r, int g, int b)// set RGB value +inline QRgb qRgb(int r, int g, int b)// set RGB value { return (0xffu << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -Q_GUI_EXPORT_INLINE QRgb qRgba(int r, int g, int b, int a)// set RGBA value +inline QRgb qRgba(int r, int g, int b, int a)// set RGBA value { return ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -Q_GUI_EXPORT_INLINE int qGray(int r, int g, int b)// convert R,G,B to gray 0..255 +inline int qGray(int r, int g, int b)// convert R,G,B to gray 0..255 { return (r*11+g*16+b*5)/32; } -Q_GUI_EXPORT_INLINE int qGray(QRgb rgb) // convert RGB to gray 0..255 +inline int qGray(QRgb rgb) // convert RGB to gray 0..255 { return qGray(qRed(rgb), qGreen(rgb), qBlue(rgb)); } -Q_GUI_EXPORT_INLINE bool qIsGray(QRgb rgb) +inline bool qIsGray(QRgb rgb) { return qRed(rgb) == qGreen(rgb) && qRed(rgb) == qBlue(rgb); } QT_END_NAMESPACE |