From 19abbbf057cdb1cd6baf0be60c01b7ee70e044d7 Mon Sep 17 00:00:00 2001 From: hippoz <10706925-hippoz@users.noreply.gitlab.com> Date: Fri, 18 Mar 2022 03:24:02 +0200 Subject: [PATCH] make all Box methods const --- src/Box.cpp | 6 +++--- src/Box.hpp | 11 ++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/Box.cpp b/src/Box.cpp index ed791f1..204a3b2 100644 --- a/src/Box.cpp +++ b/src/Box.cpp @@ -3,15 +3,15 @@ namespace Raven { -bool Box::contains_point(double x, double y) { +bool Box::contains_point(double x, double y) const { return x >= m_x && m_x + m_width >= x && y >= m_y && m_y + m_height >= y; } -bool Box::contains_point(Point &point) { +bool Box::contains_point(const Point &point) const { return point.get_x() >= m_x && m_x + m_width >= point.get_x() && point.get_y() >= m_y && m_y + m_height >= point.get_y(); } -bool Box::contains_box(Box &other) const { +bool Box::contains_box(const Box &other) const { double ax1 = m_x; double ax2 = m_x + m_width; double ay1 = m_y; diff --git a/src/Box.hpp b/src/Box.hpp index f36e953..5f734fa 100644 --- a/src/Box.hpp +++ b/src/Box.hpp @@ -26,14 +26,19 @@ public: double get_width() { return m_width; } double get_height() { return m_height; } + double get_x() const { return m_x; } + double get_y() const { return m_y; } + double get_width() const { return m_width; } + double get_height() const { return m_height; } + void set_x(double x) { m_x = x; } void set_y(double y) { m_y = y; } void set_width(double width) { m_width = width; } void set_height(double height) { m_height = height; } - bool contains_point(double x, double y); - bool contains_point(Point &point); - bool contains_box(Box &other) const; + bool contains_point(double x, double y) const; + bool contains_point(const Point &point) const; + bool contains_box(const Box &other) const; }; }