pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Put “const” modifier where needed.

Browse source
This commit is contained in:
vng 2014-06-05 19:31:33 +03:00 • committed by Alex Zolotarev
parent 82efac282f
commit 54877816d2
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/bookmark.cpp
View file

@ -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 <class T> void DeleteItem(vector<T> & 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);
}

2
map/bookmark_manager.cpp
View file

@ -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<double>::max();
UserMark const * mark = FindUserMarksContainer(UserMarkContainer::API_MARK)->FindMarkInRect(rect, d);

2
map/bookmark_manager.hpp
View file

@ -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);

2
map/user_mark_container.cpp
View file

@ -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<double>::max();

4
map/user_mark_container.hpp
View file

@ -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);