Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvng <viktor.govako@gmail.com>2015-06-18 14:26:05 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:52:04 +0300
commitfddad64d856f1af0ec9360b6d3c2f0c79c15b86d (patch)
treeaef066733c873719ef439e9a588e9bef081056ef /map/user_mark.hpp
parentb329ee53bf429f4ee9aaa16c98dc4c91de45610f (diff)
[metadata] Renaming (refactoring) according to code style.
Diffstat (limited to 'map/user_mark.hpp')
-rw-r--r--map/user_mark.hpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/map/user_mark.hpp b/map/user_mark.hpp
index c7cdb6c6ef..d3e667fb64 100644
--- a/map/user_mark.hpp
+++ b/map/user_mark.hpp
@@ -1,13 +1,15 @@
#pragma once
-#include "geometry/point2d.hpp"
+#include "search/result.hpp"
#include "indexer/feature.hpp"
-#include "search/result.hpp"
+#include "geometry/point2d.hpp"
#include "std/string.hpp"
#include "std/unique_ptr.hpp"
+#include "std/utility.hpp"
+
class UserMarkContainer;
class PaintOverlayEvent;
@@ -177,8 +179,8 @@ public:
search::AddressInfo const & GetInfo() const { return m_info; }
void SetInfo(search::AddressInfo const & info) { m_info = info; }
- feature::FeatureMetadata const & GetMetadata() const { return m_metadata; }
- void SetMetadata(feature::FeatureMetadata const & metadata) { m_metadata = metadata; }
+ feature::Metadata const & GetMetadata() const { return m_metadata; }
+ void SetMetadata(feature::Metadata && metadata) { m_metadata = move(metadata); }
unique_ptr<UserMarkCopy> Copy() const override
{
@@ -197,7 +199,7 @@ public:
protected:
search::AddressInfo m_info;
- feature::FeatureMetadata m_metadata;
+ feature::Metadata m_metadata;
};
class PoiMarkPoint : public SearchMarkPoint