From 7aca21e6bfe1f8b43b8eda226ee5215e6352179a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Fri, 3 Jun 2005 19:31:26 +0000 Subject: [PATCH] added const to some operators git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12943 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/servers/app/RGBColor.h | 7 +++++-- src/servers/app/RGBColor.cpp | 25 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/headers/private/servers/app/RGBColor.h b/headers/private/servers/app/RGBColor.h index 9475e78005..fffeb95efc 100644 --- a/headers/private/servers/app/RGBColor.h +++ b/headers/private/servers/app/RGBColor.h @@ -67,8 +67,11 @@ public: const RGBColor & operator=(const RGBColor &col); const RGBColor & operator=(const rgb_color &col); - bool operator==(const rgb_color &col); - bool operator==(const RGBColor &col); + bool operator==(const rgb_color &col) const; + bool operator==(const RGBColor &col) const; + + bool IsTransparentMagic() const; + protected: rgb_color color32; diff --git a/src/servers/app/RGBColor.cpp b/src/servers/app/RGBColor.cpp index 098c8c822c..5a43a2590f 100644 --- a/src/servers/app/RGBColor.cpp +++ b/src/servers/app/RGBColor.cpp @@ -338,19 +338,30 @@ void RGBColor::PrintToStream(void) const \brief Overloaded comaparison \return true if all color elements are exactly equal */ -bool RGBColor::operator==(const rgb_color &col) +bool RGBColor::operator==(const rgb_color &col) const { - return (color32.red==col.red && color32.green==col.green - && color32.blue==col.blue && color32.alpha==col.alpha)?true:false; + return color32.red == col.red && + color32.green == col.green && + color32.blue == col.blue && + color32.alpha == col.alpha; } /*! \brief Overloaded comaparison \return true if all color elements are exactly equal */ -bool RGBColor::operator==(const RGBColor &col) +bool RGBColor::operator==(const RGBColor &col) const { - return (color32.red==col.color32.red && color32.green==col.color32.green - && color32.blue==col.color32.blue - && color32.alpha==col.color32.alpha)?true:false; + return color32.red == col.color32.red && + color32.green == col.color32.green && + color32.blue == col.color32.blue && + color32.alpha == col.color32.alpha; +} + +// IsTransparentMagic +bool +RGBColor::IsTransparentMagic() const +{ + // TODO: validate this for B_CMAP8 for example + return *this == B_TRANSPARENT_COLOR; }