From 8530bc5a1d1b3bf32e0c92a543d5bd2f9f24963e Mon Sep 17 00:00:00 2001
From: Yuri Gorshenin <y@maps.me>
Date: Wed, 25 Oct 2017 16:38:46 +0300
Subject: [PATCH] Review fixes.

---
 search/downloader_search_callback.hpp               | 2 ++
 search/everywhere_search_params.hpp                 | 2 +-
 search/search_tests_support/test_search_request.cpp | 8 ++++----
 search/search_tests_support/test_search_request.hpp | 5 +++--
 search/viewport_search_callback.cpp                 | 4 ++--
 search/viewport_search_callback.hpp                 | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/search/downloader_search_callback.hpp b/search/downloader_search_callback.hpp
index 05d584a99b..3d0ee8a178 100644
--- a/search/downloader_search_callback.hpp
+++ b/search/downloader_search_callback.hpp
@@ -2,6 +2,8 @@
 
 #include "storage/downloader_search_params.hpp"
 
+#include <functional>
+
 class Index;
 
 namespace storage
diff --git a/search/everywhere_search_params.hpp b/search/everywhere_search_params.hpp
index ae2db980e4..f327cdc47f 100644
--- a/search/everywhere_search_params.hpp
+++ b/search/everywhere_search_params.hpp
@@ -14,7 +14,7 @@ namespace search
 struct EverywhereSearchParams
 {
   using OnResults =
-      std::function<void(Results const & results, vector<bool> const & isLocalAdsCustomer)>;
+      std::function<void(Results const & results, std::vector<bool> const & isLocalAdsCustomer)>;
 
   std::string m_query;
   std::string m_inputLocale;
diff --git a/search/search_tests_support/test_search_request.cpp b/search/search_tests_support/test_search_request.cpp
index 6ed463cb26..6be5e46905 100644
--- a/search/search_tests_support/test_search_request.cpp
+++ b/search/search_tests_support/test_search_request.cpp
@@ -30,15 +30,15 @@ TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, SearchParams par
 
 TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, string const & query,
                                      string const & locale, Mode mode, m2::RectD const & viewport,
-                                     SearchParams::OnStarted onStarted,
-                                     SearchParams::OnResults onResults)
+                                     SearchParams::OnStarted const & onStarted,
+                                     SearchParams::OnResults const & onResults)
   : m_engine(engine), m_viewport(viewport)
 {
   m_params.m_query = query;
   m_params.m_inputLocale = locale;
   m_params.m_mode = mode;
-  m_params.m_onStarted = move(onStarted);
-  m_params.m_onResults = move(onResults);
+  m_params.m_onStarted = onStarted;
+  m_params.m_onResults = onResults;
 }
 
 void TestSearchRequest::Run()
diff --git a/search/search_tests_support/test_search_request.hpp b/search/search_tests_support/test_search_request.hpp
index 84209169ea..316dba0f1d 100644
--- a/search/search_tests_support/test_search_request.hpp
+++ b/search/search_tests_support/test_search_request.hpp
@@ -37,8 +37,9 @@ public:
 
 protected:
   TestSearchRequest(TestSearchEngine & engine, string const & query, string const & locale,
-                    Mode mode, m2::RectD const & viewport, SearchParams::OnStarted onStarted,
-                    SearchParams::OnResults onResults);
+                    Mode mode, m2::RectD const & viewport,
+                    SearchParams::OnStarted const & onStarted,
+                    SearchParams::OnResults const & onResults);
 
   // Initiates the search.
   void Start();
diff --git a/search/viewport_search_callback.cpp b/search/viewport_search_callback.cpp
index 37dcc3d592..9832f6ca64 100644
--- a/search/viewport_search_callback.cpp
+++ b/search/viewport_search_callback.cpp
@@ -6,9 +6,9 @@
 
 namespace search
 {
-ViewportSearchCallback::ViewportSearchCallback(Delegate & delegate, OnResults onResults)
+ViewportSearchCallback::ViewportSearchCallback(Delegate & delegate, OnResults const & onResults)
   : m_delegate(delegate)
-  , m_onResults(move(onResults))
+  , m_onResults(onResults)
   , m_hotelsModeSet(false)
   , m_firstCall(true)
   , m_lastResultsSize(0)
diff --git a/search/viewport_search_callback.hpp b/search/viewport_search_callback.hpp
index 8689efbde4..09a5332c2f 100644
--- a/search/viewport_search_callback.hpp
+++ b/search/viewport_search_callback.hpp
@@ -29,7 +29,7 @@ public:
 
   using OnResults = SearchParams::OnResults;
 
-  ViewportSearchCallback(Delegate & delegate, OnResults onResults);
+  ViewportSearchCallback(Delegate & delegate, OnResults const & onResults);
 
   void operator()(Results const & results);