From d0984bf97fd26c58b49d37a7c279d8b0400ffbac Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Tue, 4 Aug 2020 14:11:41 +0300
Subject: [PATCH] [search marks] renaming used -> visited

---
 map/framework.cpp   |  4 ++--
 map/search_mark.cpp | 10 +++++-----
 map/search_mark.hpp |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/map/framework.cpp b/map/framework.cpp
index 02837e1eb9..053748f198 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1857,7 +1857,7 @@ void Framework::FillSearchResultsMarks(search::Results::ConstIter begin,
       m_searchMarks.MarkUnavailableIfNeeded(mark);
     }
 
-    if (isFeature && m_searchMarks.IsUsed(mark->GetFeatureID()))
+    if (isFeature && m_searchMarks.IsVisited(mark->GetFeatureID()))
       mark->SetVisited(true);
 
     if (fn)
@@ -4008,7 +4008,7 @@ void Framework::ShowViewportSearchResults(search::Results const & results, bool
 
 void Framework::ClearViewportSearchResults()
 {
-  m_searchMarks.ClearUsed();
+  m_searchMarks.ClearVisited();
   m_searchMarks.ClearUnavailable();
   GetBookmarkManager().GetEditSession().ClearGroup(UserMark::Type::SEARCH);
 }
diff --git a/map/search_mark.cpp b/map/search_mark.cpp
index afcda87977..c32c52da28 100644
--- a/map/search_mark.cpp
+++ b/map/search_mark.cpp
@@ -727,21 +727,21 @@ void SearchMarks::OnDeactivate(FeatureID const & featureId)
       return;
 
     mark->SetVisited(true);
-    m_used.insert(featureId);
+    m_visited.insert(featureId);
 
     mark->SetAvailable(true);
     mark->SetReason({});
   });
 }
 
-bool SearchMarks::IsUsed(FeatureID const & id) const
+bool SearchMarks::IsVisited(FeatureID const & id) const
 {
-  return m_used.find(id) != m_used.cend();
+  return m_visited.find(id) != m_visited.cend();
 }
 
-void SearchMarks::ClearUsed()
+void SearchMarks::ClearVisited()
 {
-  m_used.clear();
+  m_visited.clear();
 }
 
 void SearchMarks::SetUnavailable(FeatureID const & id, std::string const & reason)
diff --git a/map/search_mark.hpp b/map/search_mark.hpp
index 190f3df196..8dd5eaf9fb 100644
--- a/map/search_mark.hpp
+++ b/map/search_mark.hpp
@@ -117,8 +117,8 @@ public:
   void OnActivate(FeatureID const & featureId);
   void OnDeactivate(FeatureID const & featureId);
 
-  bool IsUsed(FeatureID const & id) const;
-  void ClearUsed();
+  bool IsVisited(FeatureID const & id) const;
+  void ClearVisited();
 
   void SetUnavailable(FeatureID const & id, std::string const & reason);
   bool IsUnavailable(FeatureID const & id) const;
@@ -136,6 +136,6 @@ private:
 
   static std::map<std::string, m2::PointF> m_searchMarksSizes;
 
-  std::set<FeatureID> m_used;
+  std::set<FeatureID> m_visited;
   std::map<FeatureID, std::string> m_unavailable;
 };