From 54877816d28ec828ce8372702022fd44a9af3da7 Mon Sep 17 00:00:00 2001 From: vng Date: Thu, 5 Jun 2014 19:31:33 +0300 Subject: [PATCH] =?UTF-8?q?Put=20=E2=80=9Cconst=E2=80=9D=20modifier=20wher?= =?UTF-8?q?e=20needed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- map/bookmark.cpp | 4 ++-- map/bookmark_manager.cpp | 2 +- map/bookmark_manager.hpp | 2 +- map/user_mark_container.cpp | 2 +- map/user_mark_container.hpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/map/bookmark.cpp b/map/bookmark.cpp index a1adad3392..4fdcdc8ead 100644 --- a/map/bookmark.cpp +++ b/map/bookmark.cpp @@ -71,7 +71,7 @@ void BookmarkCategory::AddBookmark(m2::PointD const & ptOrg, BookmarkData const void BookmarkCategory::ReplaceBookmark(size_t index, BookmarkData const & bm) { - Controller c = base_t::GetController(); + Controller & c = base_t::GetController(); ASSERT_LESS (index, c.GetUserMarkCount(), ()); if (index < c.GetUserMarkCount()) { @@ -124,7 +124,7 @@ template void DeleteItem(vector & v, size_t i) void BookmarkCategory::DeleteBookmark(size_t index) { - base_t::Controller c = base_t::GetController(); + base_t::Controller & c = base_t::GetController(); ASSERT_LESS(index, c.GetUserMarkCount(), ()); c.DeleteUserMark(index); } diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp index 824db49765..ddace6b659 100644 --- a/map/bookmark_manager.cpp +++ b/map/bookmark_manager.cpp @@ -313,7 +313,7 @@ void BookmarkManager::ActivateMark(UserMark const * mark) m_selection.ActivateMark(mark); } -UserMark const * BookmarkManager::FindNearestUserMark(const m2::AnyRectD & rect) +UserMark const * BookmarkManager::FindNearestUserMark(const m2::AnyRectD & rect) const { double d = numeric_limits::max(); UserMark const * mark = FindUserMarksContainer(UserMarkContainer::API_MARK)->FindMarkInRect(rect, d); diff --git a/map/bookmark_manager.hpp b/map/bookmark_manager.hpp index ab312f0cb6..c3f1c609fa 100644 --- a/map/bookmark_manager.hpp +++ b/map/bookmark_manager.hpp @@ -61,7 +61,7 @@ public: bool DeleteBmCategory(size_t index); void ActivateMark(UserMark const * mark); - UserMark const * FindNearestUserMark(m2::AnyRectD const & rect); + UserMark const * FindNearestUserMark(m2::AnyRectD const & rect) const; /// Additional layer methods void UserMarksSetVisible(UserMarkContainer::Type type, bool isVisible); diff --git a/map/user_mark_container.cpp b/map/user_mark_container.cpp index 35b92c7e30..fcd79afbc1 100644 --- a/map/user_mark_container.cpp +++ b/map/user_mark_container.cpp @@ -129,7 +129,7 @@ UserMarkContainer::~UserMarkContainer() Clear(); } -UserMark const * UserMarkContainer::FindMarkInRect(m2::AnyRectD const & rect, double & d) +UserMark const * UserMarkContainer::FindMarkInRect(m2::AnyRectD const & rect, double & d) const { UserMark * mark = NULL; d = numeric_limits::max(); diff --git a/map/user_mark_container.hpp b/map/user_mark_container.hpp index 59481a0023..e649435b4a 100644 --- a/map/user_mark_container.hpp +++ b/map/user_mark_container.hpp @@ -31,7 +31,7 @@ public: Controller(UserMarkContainer * container) : m_container(container) {} - UserMark * CreateUserMark(m2::PointD ptOrg) { return m_container->CreateUserMark(ptOrg); } + UserMark * CreateUserMark(m2::PointD const & ptOrg) { return m_container->CreateUserMark(ptOrg); } size_t GetUserMarkCount() const { return m_container->GetUserMarkCount(); } UserMark const * GetUserMark(size_t index) const { return m_container->GetUserMark(index); } UserMark * GetUserMarkForEdit(size_t index) { return m_container->GetUserMark(index); } @@ -61,7 +61,7 @@ public: // If not found mark on rect result is NULL // If mark is found in "d" return distance from rect center // In multiple select choose mark with min(d) - UserMark const * FindMarkInRect(m2::AnyRectD const & rect, double & d); + UserMark const * FindMarkInRect(m2::AnyRectD const & rect, double & d) const; void Draw(PaintOverlayEvent const & e, UserMarkDLCache * cache) const; void ActivateMark(UserMark const * mark);