[search] Refactored search API.

4 files changed, 12 insertions, 16 deletions

diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index ba54ad127b..16a8c45380 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -458,13 +458,9 @@ void DrawWidget::wheelEvent(QWheelEvent * e)
   m_framework->Scale(exp(e->delta() / 360.0), m2::PointD(L2D(e->x()), L2D(e->y())), false);
 }
 
-bool DrawWidget::Search(search::SearchParams params)
+bool DrawWidget::Search(search::EverywhereSearchParams const & params)
 {
-  double lat, lon;
-  if (m_framework->GetCurrentPosition(lat, lon))
-    params.SetPosition(lat, lon);
-
-  return m_framework->Search(params);
+  return m_framework->SearchEverywhere(params);
 }
 
 string DrawWidget::GetDistance(search::Result const & res) const
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp
index 4125ffed22..ec69452f20 100644
--- a/qt/draw_widget.hpp
+++ b/qt/draw_widget.hpp
@@ -4,13 +4,15 @@
 
 #include "map/framework.hpp"
 
+#include "search/everywhere_search_params.hpp"
+
 #include "drape_frontend/gui/skin.hpp"
 
 #include "drape_frontend/drape_engine.hpp"
 
-#include "std/unique_ptr.hpp"
-#include "std/mutex.hpp"
 #include "std/condition_variable.hpp"
+#include "std/mutex.hpp"
+#include "std/unique_ptr.hpp"
 
 #include <QtWidgets/QOpenGLWidget>
 
@@ -52,7 +54,7 @@ namespace qt
 
     void SetScaleControl(QScaleSlider * pScale);
 
-    bool Search(search::SearchParams params);
+    bool Search(search::EverywhereSearchParams const & params);
     string GetDistance(search::Result const & res) const;
     void ShowSearchResult(search::Result const & res);
 
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index 65095e57b1..6cf1654c12 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -117,10 +117,8 @@ void SearchPanel::OnSearchResult(ResultsT * results)
   {
     ClearResults();
 
-    for (ResultsT::IterT i = results->Begin(); i != results->End(); ++i)
+    for (auto const & res : *results)
     {
-      ResultT const & res = *i;
-
       QString const name = QString::fromStdString(res.GetString());
       QString strHigh;
       int pos = 0;
@@ -298,7 +296,7 @@ void SearchPanel::OnSearchTextChanged(QString const & str)
   {
     ClearResults();
 
-    m_pDrawWidget->GetFramework().CancelInteractiveSearch();
+    m_pDrawWidget->GetFramework().CancelSearch(search::Mode::Everywhere);
 
     // hide X button
     m_pClearButton->setVisible(false);
@@ -324,7 +322,7 @@ void SearchPanel::OnSearchPanelItemClicked(int row, int)
 
 void SearchPanel::hideEvent(QHideEvent *)
 {
-  m_pDrawWidget->GetFramework().CancelInteractiveSearch();
+  m_pDrawWidget->GetFramework().CancelSearch(search::Mode::Everywhere);
 }
 
 void SearchPanel::OnAnimationTimer()
diff --git a/qt/search_panel.hpp b/qt/search_panel.hpp
index d1ff5ad1bc..1d253481fb 100644
--- a/qt/search_panel.hpp
+++ b/qt/search_panel.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "search/result.hpp"
-#include "search/params.hpp"
+#include "search/everywhere_search_params.hpp"
 
 #include "std/vector.hpp"
 
@@ -37,7 +37,7 @@ class SearchPanel : public QWidget
   typedef search::Result ResultT;
   vector<ResultT> m_results;
 
-  search::SearchParams m_params;
+  search::EverywhereSearchParams m_params;
 
   Q_OBJECT