summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-03-20 00:58:11 +0300
committerAndrei Karas <akaras@inbox.ru>2014-03-20 00:58:11 +0300
commit81bd7930164b79a841b03e4a8a1937e5aeb3ab54 (patch)
tree8985bccb7c439001cbb1402a449a45f315805421 /src/gui
parent55829fa86de2dbf8935fcb55195f1c5dd4a8b5bb (diff)
downloadmanaverse-81bd7930164b79a841b03e4a8a1937e5aeb3ab54.tar.gz
manaverse-81bd7930164b79a841b03e4a8a1937e5aeb3ab54.tar.bz2
manaverse-81bd7930164b79a841b03e4a8a1937e5aeb3ab54.tar.xz
manaverse-81bd7930164b79a841b03e4a8a1937e5aeb3ab54.zip
Improve rect.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/rect.cpp14
-rw-r--r--src/gui/rect.h11
2 files changed, 2 insertions, 23 deletions
diff --git a/src/gui/rect.cpp b/src/gui/rect.cpp
index 5f9d2bf0f..3f59d94cb 100644
--- a/src/gui/rect.cpp
+++ b/src/gui/rect.cpp
@@ -135,22 +135,10 @@ bool Rect::isIntersecting(const Rect& rectangle) const
return true;
}
-bool Rect::isPointInRect(int x_, int y_) const
+bool Rect::isPointInRect(const int x_, const int y_) const
{
return x_ >= x
&& y_ >= y
&& x_ < x + width
&& y_ < y + height;
}
-
-std::ostream& operator<<(std::ostream& out,
- const Rect& rectangle)
-{
- out << "Rect [x = " << rectangle.x
- << ", y = " << rectangle.y
- << ", width = " << rectangle.width
- << ", height = " << rectangle.height
- << "]";
-
- return out;
-}
diff --git a/src/gui/rect.h b/src/gui/rect.h
index 69c0120ca..8b570a9f7 100644
--- a/src/gui/rect.h
+++ b/src/gui/rect.h
@@ -127,16 +127,7 @@ class Rect
* @return True if the point is inside the rectangle.
* @since 0.1.0
*/
- bool isPointInRect(int x, int y) const A_WARN_UNUSED;
-
- /**
- * Output operator for output.
- *
- * @param out The stream to output to.
- * @param rectangle The rectangle to output.
- */
- friend std::ostream& operator<<(std::ostream& out,
- const Rect& rectangle);
+ bool isPointInRect(const int x, const int y) const A_WARN_UNUSED;
/**
* Holds the x coordinate of the rectangle.