diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-30 00:07:54 +0300 |
| commit | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (patch) | |
| tree | 2d85d112997176e9ab765e638b0e7f2e16677b83 /src/gui/rect.cpp | |
| parent | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (diff) | |
| parent | 8983700f6c8cc6496626ed3af235e1ec31fe5501 (diff) | |
| download | mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.gz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.bz2 mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.tar.xz mv-a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/rect.cpp')
| -rw-r--r-- | src/gui/rect.cpp | 14 |
1 files changed, 1 insertions, 13 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; -} |