From f9f5807b5edcbb498a8e9b4810c4548f00e90a2d Mon Sep 17 00:00:00 2001 From: Keith Wansbrough Date: Wed, 21 Oct 2015 21:39:21 +0100 Subject: [PATCH] Make ApiMarkPoint a StyledPoint. --- map/api_mark_point.hpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/map/api_mark_point.hpp b/map/api_mark_point.hpp index 491c0ac7cb..eeb3583af0 100644 --- a/map/api_mark_point.hpp +++ b/map/api_mark_point.hpp @@ -1,20 +1,22 @@ #pragma once #include "map/user_mark.hpp" +#include "map/styled_point.hpp" -class ApiMarkPoint : public UserMark +class ApiMarkPoint : public StyledPoint { public: ApiMarkPoint(m2::PointD const & ptOrg, UserMarkContainer * container) - : UserMark(ptOrg, container) + : StyledPoint(ptOrg, container) { } ApiMarkPoint(string const & name, string const & id, + string const & style, m2::PointD const & ptOrg, UserMarkContainer * container) - : UserMark(ptOrg, container) + : StyledPoint(style, ptOrg, container) , m_name(name) , m_id(id) { @@ -31,7 +33,7 @@ public: unique_ptr Copy() const override { return unique_ptr( - new UserMarkCopy(new ApiMarkPoint(m_name, m_id, m_ptOrg, m_container))); + new UserMarkCopy(new ApiMarkPoint(m_name, m_id, GetStyle(), m_ptOrg, m_container))); } virtual void FillLogEvent(TEventContainer & details) const override