diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 21:51:54 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-03 21:51:54 +0200 |
commit | 52352c6c572f15c10c4c3de641db81723aada468 (patch) | |
tree | c87f2be7179e2d7a203719aa4eed9480dc7d9748 /src/gui/painting/qcolor.h | |
parent | 34f712e79e97b757b4426e1ffa09e065c9e379a1 (diff) |
remove obsolete stuff
everything inside QT3_SUPPORT is gone in
gui/painting
Diffstat (limited to 'src/gui/painting/qcolor.h')
-rw-r--r-- | src/gui/painting/qcolor.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index af7248ce8c..38fce2500d 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -208,30 +208,9 @@ public: static void setAllowX11ColorNames(bool enabled); #endif -#ifdef QT3_SUPPORT - inline QT3_SUPPORT_CONSTRUCTOR QColor(int x, int y, int z, Spec colorSpec) - { if (colorSpec == Hsv) setHsv(x, y, z); else setRgb(x, y, z); } - - inline QT3_SUPPORT void rgb(int *r, int *g, int *b) const - { getRgb(r, g, b); } - inline QT3_SUPPORT void hsv(int *h, int *s, int *v) const - { getHsv(h, s, v); } - - inline QT3_SUPPORT void setRgba(int r, int g, int b, int a) - { setRgb(r, g, b, a); } - inline QT3_SUPPORT void getRgba(int *r, int *g, int *b, int *a) const - { getRgb(r, g, b, a); } - - QT3_SUPPORT uint pixel(int screen = -1) const; -#endif - static bool isValidColor(const QString &name); private: -#ifndef QT3_SUPPORT - // do not allow a spec to be used as an alpha value - QColor(int, int, int, Spec); -#endif void invalidate(); bool setColorFromString(const QString &name); |