[search] Simplified SearchParams.

1 files changed, 11 insertions, 11 deletions

diff --git a/storage/downloader_search_params.hpp b/storage/downloader_search_params.hpp
index 1b7d4cc981..2312b9033b 100644
--- a/storage/downloader_search_params.hpp
+++ b/storage/downloader_search_params.hpp
@@ -2,9 +2,9 @@
 
 #include "storage/index.hpp"
 
-#include "std/function.hpp"
-#include "std/string.hpp"
-#include "std/vector.hpp"
+#include <functional>
+#include <string>
+#include <vector>
 
 namespace storage
 {
@@ -30,15 +30,15 @@ struct DownloaderSearchResult
   TCountryId m_countryId;
   /// \brief |m_matchedName| is a name of found feature in case of searching in World.mwm
   /// and is a local name of mwm (group or leaf) in case of searching in country tree.
-  string m_matchedName;
+  std::string m_matchedName;
 };
 
 struct DownloaderSearchResults
 {
   DownloaderSearchResults() : m_endMarker(false) {}
 
-  vector<DownloaderSearchResult> m_results;
-  string m_query;
+  std::vector<DownloaderSearchResult> m_results;
+  std::string m_query;
   /// \brief |m_endMarker| == true if it's the last call of TOnResults callback for the search.
   /// Otherwise |m_endMarker| == false.
   bool m_endMarker;
@@ -46,14 +46,14 @@ struct DownloaderSearchResults
 
 struct DownloaderSearchParams
 {
-  using TOnResults = function<void (DownloaderSearchResults const &)>;
+  using OnResults = std::function<void(DownloaderSearchResults const &)>;
 
-  TOnResults m_onResults;
-  string m_query;
-  string m_inputLocale;
+  OnResults m_onResults;
+  std::string m_query;
+  std::string m_inputLocale;
 };
 
-inline string DebugPrint(DownloaderSearchResult const & r)
+inline std::string DebugPrint(DownloaderSearchResult const & r)
 {
   return "(" + r.m_countryId + " " + r.m_matchedName + ")";
 }