Remove indexer -> search dependency.

indexer/index.hpp

@@ -5,11 +5,10 @@
 #include "features_vector.hpp"
 #include "scale_index.hpp"
 #include "scales.hpp"
+#include "search_trie.hpp"
 
 #include "../../defines.hpp"
 
-#include "../search/search_trie.hpp"
-
 #include "../platform/platform.hpp"
 
 #include "../geometry/rect2d.hpp"

indexer/indexer.pro

@@ -80,3 +80,5 @@ HEADERS += \
     coding_params.hpp \
     feature_loader_base.hpp \
     feature_loader.hpp \
+    search_trie.hpp \
+    string_search_utils.hpp \

indexer/search_index_builder.cpp

@@ -1,11 +1,10 @@
 #include "search_index_builder.hpp"
 #include "features_vector.hpp"
+#include "search_trie.hpp"
+#include "string_search_utils.hpp"
 
 #include "../defines.hpp"
 
-#include "../search/search_trie.hpp"
-#include "../search/string_search_utils.hpp"
-
 #include "../coding/trie_builder.hpp"
 #include "../coding/writer.hpp"
 

search/approximate_string_match.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "string_search_utils.hpp"
+#include "../indexer/string_search_utils.hpp"
 #include "../base/base.hpp"
 #include "../base/buffer_vector.hpp"
 #include "../std/queue.hpp"

search/engine.hpp

@@ -1,7 +1,7 @@
 #pragma once
-#include "search_trie.hpp"
 
 #include "../indexer/index.hpp"
+#include "../indexer/search_trie.hpp"
 
 #include "../geometry/rect2d.hpp"
 

search/keyword_matcher.cpp

@@ -1,6 +1,6 @@
 #include "keyword_matcher.hpp"
 #include "delimiters.hpp"
-#include "string_search_utils.hpp"
+#include "../indexer/string_search_utils.hpp"
 #include "../base/logging.hpp"
 #include "../base/string_utils.hpp"
 #include "../std/bind.hpp"

search/query.cpp

@@ -2,10 +2,10 @@
 #include "categories_holder.hpp"
 #include "delimiters.hpp"
 #include "latlon_match.hpp"
-#include "string_search_utils.hpp"
 #include "search_trie_matching.hpp"
 
 #include "../indexer/feature_visibility.hpp"
+#include "../indexer/string_search_utils.hpp"
 
 #include "../base/exception.hpp"
 #include "../base/stl_add.hpp"

search/search.pro

@@ -18,9 +18,7 @@ HEADERS += \
     result.hpp \
     latlon_match.hpp \
     categories_holder.hpp \
-    search_trie.hpp \
     search_trie_matching.hpp \
-    string_search_utils.hpp \
     approximate_string_match.hpp \
 
 SOURCES += \

search/search_tests/keyword_matcher_test.cpp

@@ -2,7 +2,7 @@
 #include "../keyword_matcher.hpp"
 #include "match_cost_mock.hpp"
 #include "../approximate_string_match.hpp"
-#include "../string_search_utils.hpp"
+#include "../../indexer/string_search_utils.hpp"
 #include "../../testing/testing_utils.hpp"
 #include "../../base/string_utils.hpp"
 #include "../../std/scoped_ptr.hpp"

search/search_trie_matching.cpp

@@ -1,8 +1,8 @@
 #include "search_trie_matching.hpp"
 #include "query.hpp"
-#include "string_search_utils.hpp"
 
 #include "../indexer/feature_visibility.hpp"
+#include "../indexer/string_search_utils.hpp"
 
 #include "../std/algorithm.hpp"
 #include "../std/functional.hpp"

search/search_trie_matching.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "search_trie.hpp"
+#include "../indexer/search_trie.hpp"
 
 class FeaturesVector;