From 25360bb42cc22cf09f6e0dbe66dc386de62d49c6 Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Tue, 31 May 2016 15:46:29 +0300
Subject: [PATCH] [search] Removed the "search_" prefix where it was redundant.

---
 generator/search_index_builder.cpp                   |  2 +-
 map/framework.cpp                                    |  2 +-
 map/framework.hpp                                    |  2 +-
 search/{search_common.hpp => common.hpp}             |  1 -
 search/{search_engine.cpp => engine.cpp}             |  9 ++++++---
 search/{search_engine.hpp => engine.hpp}             |  0
 search/feature_offset_match.hpp                      |  2 +-
 search/features_layer.hpp                            |  2 +-
 search/features_layer_matcher.hpp                    |  2 +-
 search/geocoder.hpp                                  |  2 +-
 search/house_detector.cpp                            |  2 +-
 search/intersection_result.hpp                       |  2 +-
 search/keyword_matcher.hpp                           |  2 +-
 search/{search_model.cpp => model.cpp}               |  2 +-
 search/{search_model.hpp => model.hpp}               |  0
 search/pre_ranking_info.hpp                          |  2 +-
 search/processor.cpp                                 |  4 ++--
 search/ranking_info.hpp                              |  2 +-
 search/ranking_utils.hpp                             |  2 +-
 search/result.cpp                                    |  7 ++++---
 search/search.pro                                    | 12 ++++++------
 search/search_tests/keyword_matcher_test.cpp         |  2 +-
 search/search_tests/string_intersection_test.cpp     |  2 +-
 search/search_tests_support/test_search_engine.hpp   |  2 +-
 ...ring_intersection.hpp => string_intersection.hpp} |  6 ++----
 search/types_skipper.hpp                             |  2 +-
 26 files changed, 38 insertions(+), 37 deletions(-)
 rename search/{search_common.hpp => common.hpp} (99%)
 rename search/{search_engine.cpp => engine.cpp} (98%)
 rename search/{search_engine.hpp => engine.hpp} (100%)
 rename search/{search_model.cpp => model.cpp} (99%)
 rename search/{search_model.hpp => model.hpp} (100%)
 rename search/{search_string_intersection.hpp => string_intersection.hpp} (91%)

diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index 9d9c0fa6b4..49071e2019 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -1,7 +1,7 @@
 #include "search_index_builder.hpp"
 
+#include "search/common.hpp"
 #include "search/reverse_geocoder.hpp"
-#include "search/search_common.hpp"
 #include "search/search_index_values.hpp"
 #include "search/search_trie.hpp"
 #include "search/types_skipper.hpp"
diff --git a/map/framework.cpp b/map/framework.cpp
index 46fa6f4931..c7a7b107be 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -11,12 +11,12 @@
 #include "routing/route.hpp"
 #include "routing/routing_algorithm.hpp"
 
+#include "search/engine.hpp"
 #include "search/geometry_utils.hpp"
 #include "search/intermediate_result.hpp"
 #include "search/processor_factory.hpp"
 #include "search/result.hpp"
 #include "search/reverse_geocoder.hpp"
-#include "search/search_engine.hpp"
 
 #include "storage/storage_helpers.hpp"
 
diff --git a/map/framework.hpp b/map/framework.hpp
index b804ac06d8..1fd41a1d7f 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -21,8 +21,8 @@
 
 #include "editor/user_stats.hpp"
 
+#include "search/engine.hpp"
 #include "search/query_saver.hpp"
-#include "search/search_engine.hpp"
 
 #include "storage/downloader_search_params.hpp"
 #include "storage/downloading_policy.hpp"
diff --git a/search/search_common.hpp b/search/common.hpp
similarity index 99%
rename from search/search_common.hpp
rename to search/common.hpp
index 1901e42c95..2bdc9300a6 100644
--- a/search/search_common.hpp
+++ b/search/common.hpp
@@ -2,7 +2,6 @@
 
 namespace search
 {
-
 /// Upper bound for max count of tokens for indexing and scoring.
 int constexpr MAX_TOKENS = 32;
 int constexpr MAX_SUGGESTS_COUNT = 5;
diff --git a/search/search_engine.cpp b/search/engine.cpp
similarity index 98%
rename from search/search_engine.cpp
rename to search/engine.cpp
index 5bfe2f6c42..e7a7809e6c 100644
--- a/search/search_engine.cpp
+++ b/search/engine.cpp
@@ -1,4 +1,4 @@
-#include "search_engine.hpp"
+#include "search/engine.hpp"
 
 #include "geometry_utils.hpp"
 #include "processor.hpp"
@@ -271,7 +271,7 @@ void Engine::MainLoop(Context & context)
 }
 
 template <typename... TArgs>
-void Engine::PostMessage(TArgs && ... args)
+void Engine::PostMessage(TArgs &&... args)
 {
   lock_guard<mutex> lock(m_mu);
   m_messages.emplace(forward<TArgs>(args)...);
@@ -286,7 +286,10 @@ void Engine::DoSearch(SearchParams const & params, m2::RectD const & viewport,
   // Initialize query processor.
   processor.Init(viewportSearch);
   handle->Attach(processor);
-  MY_SCOPE_GUARD(detach, [&handle] { handle->Detach(); });
+  MY_SCOPE_GUARD(detach, [&handle]
+                 {
+                   handle->Detach();
+                 });
 
   // Early exit when query processing is cancelled.
   if (processor.IsCancelled())
diff --git a/search/search_engine.hpp b/search/engine.hpp
similarity index 100%
rename from search/search_engine.hpp
rename to search/engine.hpp
diff --git a/search/feature_offset_match.hpp b/search/feature_offset_match.hpp
index 9ce4023339..26d411517e 100644
--- a/search/feature_offset_match.hpp
+++ b/search/feature_offset_match.hpp
@@ -1,7 +1,7 @@
 #pragma once
+#include "search/common.hpp"
 #include "search/processor.hpp"
 #include "search/query_params.hpp"
-#include "search/search_common.hpp"
 #include "search/search_index_values.hpp"
 #include "search/token_slice.hpp"
 
diff --git a/search/features_layer.hpp b/search/features_layer.hpp
index b3ec6bb467..9c361d3c45 100644
--- a/search/features_layer.hpp
+++ b/search/features_layer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "search/search_model.hpp"
+#include "search/model.hpp"
 
 #include "base/string_utils.hpp"
 
diff --git a/search/features_layer_matcher.hpp b/search/features_layer_matcher.hpp
index 8b18e1484c..b6ff10cd23 100644
--- a/search/features_layer_matcher.hpp
+++ b/search/features_layer_matcher.hpp
@@ -3,9 +3,9 @@
 #include "search/cancel_exception.hpp"
 #include "search/features_layer.hpp"
 #include "search/house_numbers_matcher.hpp"
+#include "search/model.hpp"
 #include "search/mwm_context.hpp"
 #include "search/reverse_geocoder.hpp"
-#include "search/search_model.hpp"
 #include "search/street_vicinity_loader.hpp"
 
 #include "indexer/feature.hpp"
diff --git a/search/geocoder.hpp b/search/geocoder.hpp
index 13810f27f4..6aae10cc35 100644
--- a/search/geocoder.hpp
+++ b/search/geocoder.hpp
@@ -5,12 +5,12 @@
 #include "search/features_layer_path_finder.hpp"
 #include "search/geometry_cache.hpp"
 #include "search/mode.hpp"
+#include "search/model.hpp"
 #include "search/mwm_context.hpp"
 #include "search/nested_rects_cache.hpp"
 #include "search/pre_ranking_info.hpp"
 #include "search/query_params.hpp"
 #include "search/ranking_utils.hpp"
-#include "search/search_model.hpp"
 
 #include "indexer/index.hpp"
 #include "indexer/mwm_set.hpp"
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index 8ce620fb8f..a5f33f6b46 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -1,7 +1,7 @@
 #include "house_detector.hpp"
 
 #include "search/algos.hpp"
-#include "search/search_common.hpp"
+#include "search/common.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_impl.hpp"
diff --git a/search/intersection_result.hpp b/search/intersection_result.hpp
index 9285cbe5cd..31144e77e5 100644
--- a/search/intersection_result.hpp
+++ b/search/intersection_result.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "search/search_model.hpp"
+#include "search/model.hpp"
 
 #include "std/cstdint.hpp"
 #include "std/string.hpp"
diff --git a/search/keyword_matcher.hpp b/search/keyword_matcher.hpp
index 1b81b8a7a7..6e4a12f1e6 100644
--- a/search/keyword_matcher.hpp
+++ b/search/keyword_matcher.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "search/search_common.hpp"
+#include "search/common.hpp"
 
 #include "base/string_utils.hpp"
 
diff --git a/search/search_model.cpp b/search/model.cpp
similarity index 99%
rename from search/search_model.cpp
rename to search/model.cpp
index 4b45a728a2..f3fcd82db1 100644
--- a/search/search_model.cpp
+++ b/search/model.cpp
@@ -1,4 +1,4 @@
-#include "search/search_model.hpp"
+#include "search/model.hpp"
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
diff --git a/search/search_model.hpp b/search/model.hpp
similarity index 100%
rename from search/search_model.hpp
rename to search/model.hpp
diff --git a/search/pre_ranking_info.hpp b/search/pre_ranking_info.hpp
index 3b0cd80c7b..58b0e07041 100644
--- a/search/pre_ranking_info.hpp
+++ b/search/pre_ranking_info.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "search/search_model.hpp"
+#include "search/model.hpp"
 
 #include "std/cstdint.hpp"
 
diff --git a/search/processor.cpp b/search/processor.cpp
index 60385621e2..7acd509445 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -1,5 +1,6 @@
 #include "processor.hpp"
 
+#include "search/common.hpp"
 #include "search/dummy_rank_table.hpp"
 #include "search/geometry_utils.hpp"
 #include "search/intermediate_result.hpp"
@@ -10,9 +11,8 @@
 #include "search/ranking_info.hpp"
 #include "search/ranking_utils.hpp"
 #include "search/region.hpp"
-#include "search/search_common.hpp"
 #include "search/search_index_values.hpp"
-#include "search/search_string_intersection.hpp"
+#include "search/string_intersection.hpp"
 
 #include "storage/country_info_getter.hpp"
 #include "storage/index.hpp"
diff --git a/search/ranking_info.hpp b/search/ranking_info.hpp
index d5ee955af4..cf241a62a5 100644
--- a/search/ranking_info.hpp
+++ b/search/ranking_info.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "search/model.hpp"
 #include "search/pre_ranking_info.hpp"
 #include "search/ranking_utils.hpp"
-#include "search/search_model.hpp"
 
 #include "std/iostream.hpp"
 
diff --git a/search/ranking_utils.hpp b/search/ranking_utils.hpp
index 75b94e4c50..1af9bbe6ce 100644
--- a/search/ranking_utils.hpp
+++ b/search/ranking_utils.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "search/model.hpp"
 #include "search/query_params.hpp"
-#include "search/search_model.hpp"
 
 #include "indexer/search_delimiters.hpp"
 #include "indexer/search_string_utils.hpp"
diff --git a/search/result.cpp b/search/result.cpp
index 0eaa4ed449..0fad1be9e5 100644
--- a/search/result.cpp
+++ b/search/result.cpp
@@ -1,6 +1,7 @@
-#include "result.hpp"
-#include "geometry_utils.hpp"
-#include "search_common.hpp"
+#include "search/result.hpp"
+
+#include "search/common.hpp"
+#include "search/geometry_utils.hpp"
 
 namespace search
 {
diff --git a/search/search.pro b/search/search.pro
index 894529fb5b..96405af26a 100644
--- a/search/search.pro
+++ b/search/search.pro
@@ -13,7 +13,9 @@ HEADERS += \
     approximate_string_match.hpp \
     cancel_exception.hpp \
     cbv_ptr.hpp \
+    common.hpp \
     dummy_rank_table.hpp \
+    engine.hpp \
     feature_offset_match.hpp \
     features_filter.hpp \
     features_layer.hpp \
@@ -35,6 +37,7 @@ HEADERS += \
     locality_finder.hpp \
     locality_scorer.hpp \
     mode.hpp \
+    model.hpp \
     mwm_context.hpp \
     nested_rects_cache.hpp \
     params.hpp \
@@ -52,14 +55,11 @@ HEADERS += \
     result.hpp \
     retrieval.hpp \
     reverse_geocoder.hpp \
-    search_common.hpp \
-    search_engine.hpp \
     search_index_values.hpp \
-    search_model.hpp \
-    search_string_intersection.hpp \
     search_trie.hpp \
     stats_cache.hpp \
     street_vicinity_loader.hpp \
+    string_intersection.hpp \
     suggest.hpp \
     token_slice.hpp \
     types_skipper.hpp \
@@ -68,6 +68,7 @@ SOURCES += \
     approximate_string_match.cpp \
     cbv_ptr.cpp \
     dummy_rank_table.cpp \
+    engine.cpp \
     features_filter.cpp \
     features_layer.cpp \
     features_layer_matcher.cpp \
@@ -87,6 +88,7 @@ SOURCES += \
     locality_finder.cpp \
     locality_scorer.cpp \
     mode.cpp \
+    model.cpp \
     mwm_context.cpp \
     nested_rects_cache.cpp \
     params.cpp \
@@ -103,8 +105,6 @@ SOURCES += \
     result.cpp \
     retrieval.cpp \
     reverse_geocoder.cpp \
-    search_engine.cpp \
-    search_model.cpp \
     street_vicinity_loader.cpp \
     token_slice.cpp \
     types_skipper.cpp \
diff --git a/search/search_tests/keyword_matcher_test.cpp b/search/search_tests/keyword_matcher_test.cpp
index c24061b08c..c9cf1f407e 100644
--- a/search/search_tests/keyword_matcher_test.cpp
+++ b/search/search_tests/keyword_matcher_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
+#include "search/common.hpp"
 #include "search/keyword_matcher.hpp"
-#include "search/search_common.hpp"
 
 #include "indexer/search_delimiters.hpp"
 #include "indexer/search_string_utils.hpp"
diff --git a/search/search_tests/string_intersection_test.cpp b/search/search_tests/string_intersection_test.cpp
index 1923556778..0443a0b335 100644
--- a/search/search_tests/string_intersection_test.cpp
+++ b/search/search_tests/string_intersection_test.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/search_string_intersection.hpp"
+#include "search/string_intersection.hpp"
 
 #include "indexer/feature_covering.hpp"
 
diff --git a/search/search_tests_support/test_search_engine.hpp b/search/search_tests_support/test_search_engine.hpp
index c2d2938f67..b363413d4f 100644
--- a/search/search_tests_support/test_search_engine.hpp
+++ b/search/search_tests_support/test_search_engine.hpp
@@ -4,7 +4,7 @@
 
 #include "geometry/rect2d.hpp"
 
-#include "search/search_engine.hpp"
+#include "search/engine.hpp"
 
 #include "std/string.hpp"
 #include "std/unique_ptr.hpp"
diff --git a/search/search_string_intersection.hpp b/search/string_intersection.hpp
similarity index 91%
rename from search/search_string_intersection.hpp
rename to search/string_intersection.hpp
index 377e8e35d2..f1548bb29e 100644
--- a/search/search_string_intersection.hpp
+++ b/search/string_intersection.hpp
@@ -2,12 +2,11 @@
 
 #include "indexer/search_delimiters.hpp"
 
-
 namespace search
 {
-
 template <typename LowTokensIterType, typename F>
-void SearchStringTokensIntersectionRanges(string const & s, LowTokensIterType itLowBeg, LowTokensIterType itLowEnd, F f)
+void SearchStringTokensIntersectionRanges(string const & s, LowTokensIterType itLowBeg,
+                                          LowTokensIterType itLowEnd, F f)
 {
   // split input query by tokens and prefix
   search::Delimiters delimsTest;
@@ -48,5 +47,4 @@ void SearchStringTokensIntersectionRanges(string const & s, LowTokensIterType it
       f(result);
   }
 }
-
 }
diff --git a/search/types_skipper.hpp b/search/types_skipper.hpp
index 0938aba0c8..3a234d1792 100644
--- a/search/types_skipper.hpp
+++ b/search/types_skipper.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "search_model.hpp"
+#include "search/model.hpp"
 
 #include "base/buffer_vector.hpp"