diff options
| author | Igor Khmurets <subzero@mapswithme.com> | 2014-05-21 16:18:58 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:15:58 +0300 |
| commit | 44bac99e1bd79c00ab896fb28953403e0ec63f18 (patch) | |
| tree | f0c048498d9c6d954d9d3992012985eabda0d5be /map/bookmark.hpp | |
| parent | 3e7701a1da1406cd259dcb9a7ac145ea71bea567 (diff) | |
[ios] Fixed merge conflicts with new UserMark
Diffstat (limited to 'map/bookmark.hpp')
| -rw-r--r-- | map/bookmark.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/map/bookmark.hpp b/map/bookmark.hpp index e5b859e546..ea427aa68b 100644 --- a/map/bookmark.hpp +++ b/map/bookmark.hpp @@ -87,12 +87,12 @@ public: } void SetData(BookmarkData const & data) { m_data = data; } + BookmarkData const & GetData() { return m_data; } virtual Type GetMarkType() const { return BOOKMARK; } - m2::PointD const & GetOrg() const { return m_org; } - string const & GetName() const { return m_name; } - void SetName(string const & name) { m_name = name; } + string const & GetName() const { return m_data.GetName(); } + void SetName(string const & name) { m_data.SetName(name); } /// @return Now its a bookmark color - name of icon file string const & GetType() const { return m_data.GetType(); } //void SetType(string const & type) { m_type = type; } |