diff options
| author | Alex Zolotarev <alex@maps.me> | 2015-03-23 20:53:42 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:40:46 +0300 |
| commit | 303697c6ba4d97d79aa32e724b3ae93f4f2adf4d (patch) | |
| tree | 236197e3f6666ca7df9bc7b108d687ae4c181afb /map/user_mark.hpp | |
| parent | 02158330ed3dc284ab8bde5f74e5480d20774b5e (diff) | |
Typed enum for usermark.
Diffstat (limited to 'map/user_mark.hpp')
| -rw-r--r-- | map/user_mark.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/map/user_mark.hpp b/map/user_mark.hpp index 0218bcb019..caf7534448 100644 --- a/map/user_mark.hpp +++ b/map/user_mark.hpp @@ -24,7 +24,7 @@ class UserMarkCopy; class UserMark : private noncopyable { public: - enum Type + enum class Type { API, SEARCH, @@ -88,7 +88,7 @@ public: { } - UserMark::Type GetMarkType() const { return API; } + UserMark::Type GetMarkType() const { return UserMark::Type::API; } string const & GetName() const { return m_name; } void SetName(string const & name) { m_name = name; } @@ -123,7 +123,7 @@ public: { } - UserMark::Type GetMarkType() const { return SEARCH; } + UserMark::Type GetMarkType() const { return UserMark::Type::SEARCH; } search::AddressInfo const & GetInfo() const { return m_info; } void SetInfo(search::AddressInfo const & info) { m_info = info; } @@ -148,7 +148,7 @@ public: PoiMarkPoint(UserMarkContainer * container) : SearchMarkPoint(m2::PointD(0.0, 0.0), container) {} - UserMark::Type GetMarkType() const { return POI; } + UserMark::Type GetMarkType() const { return UserMark::Type::POI; } unique_ptr<UserMarkCopy> Copy() const override { return unique_ptr<UserMarkCopy>(new UserMarkCopy(this, false)); @@ -165,7 +165,7 @@ public: MyPositionMarkPoint(UserMarkContainer * container) : base_t(container) {} - UserMark::Type GetMarkType() const { return MY_POSITION; } + UserMark::Type GetMarkType() const { return UserMark::Type::MY_POSITION; } }; class ICustomDrawable : public UserMark |