diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-01-11 19:17:13 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-01-11 19:17:13 +0000 |
| commit | 8f8acc24933830d4f5784616b9b0c5896bde0b93 (patch) | |
| tree | e34d995f6ef854e3ac2b365326ffabf3dad265da /otk/color.hh | |
| parent | 684405eec8553918b62e334bffe29eb4712ec95c (diff) | |
rm prefixes for all elements in the otk namepsace
Diffstat (limited to 'otk/color.hh')
| -rw-r--r-- | otk/color.hh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/otk/color.hh b/otk/color.hh index cbbff646..7fe281b4 100644 --- a/otk/color.hh +++ b/otk/color.hh @@ -1,6 +1,6 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifndef COLOR_HH -#define COLOR_HH +#ifndef __color_hh +#define __color_hh extern "C" { #include <X11/Xlib.h> @@ -11,12 +11,12 @@ extern "C" { namespace otk { -class BColor { +class Color { public: - BColor(unsigned int _screen = ~(0u)); - BColor(int _r, int _g, int _b, unsigned int _screen = ~(0u)); - BColor(const std::string &_name, unsigned int _screen = ~(0u)); - ~BColor(void); + Color(unsigned int _screen = ~(0u)); + Color(int _r, int _g, int _b, unsigned int _screen = ~(0u)); + Color(const std::string &_name, unsigned int _screen = ~(0u)); + ~Color(void); inline const std::string &name(void) const { return colorname; } @@ -41,11 +41,11 @@ public: // operators #ifndef SWIG - BColor &operator=(const BColor &c); + Color &operator=(const Color &c); #endif - inline bool operator==(const BColor &c) const + inline bool operator==(const Color &c) const { return (r == c.r && b == c.b && b == c.b); } - inline bool operator!=(const BColor &c) const + inline bool operator!=(const Color &c) const { return (! operator==(c)); } static void cleanupColorCache(void); @@ -99,4 +99,4 @@ private: } -#endif // COLOR_HH +#endif // __color_hh |