From 15f39716e8435cfbe09f77baedf2e57a2c8633e5 Mon Sep 17 00:00:00 2001 From: Yury Melnichek Date: Thu, 1 Sep 2011 20:53:34 +0200 Subject: [PATCH] [search] Move search/delimeters.?pp -> indexer/search_delimiters.?pp --- indexer/indexer.pro | 2 ++ search/delimiters.cpp => indexer/search_delimiters.cpp | 0 search/delimiters.hpp => indexer/search_delimiters.hpp | 0 search/keyword_matcher.cpp | 2 +- search/query.cpp | 4 ++-- search/search.pro | 2 -- 6 files changed, 5 insertions(+), 5 deletions(-) rename search/delimiters.cpp => indexer/search_delimiters.cpp (100%) rename search/delimiters.hpp => indexer/search_delimiters.hpp (100%) diff --git a/indexer/indexer.pro b/indexer/indexer.pro index 0601a5b907..c05a86e8af 100644 --- a/indexer/indexer.pro +++ b/indexer/indexer.pro @@ -36,6 +36,7 @@ SOURCES += \ coding_params.cpp \ feature_loader_base.cpp \ feature_loader.cpp \ + search_delimiters.cpp \ HEADERS += \ feature.hpp \ @@ -80,3 +81,4 @@ HEADERS += \ feature_loader.hpp \ search_trie.hpp \ string_search_utils.hpp \ + search_delimiters.hpp \ diff --git a/search/delimiters.cpp b/indexer/search_delimiters.cpp similarity index 100% rename from search/delimiters.cpp rename to indexer/search_delimiters.cpp diff --git a/search/delimiters.hpp b/indexer/search_delimiters.hpp similarity index 100% rename from search/delimiters.hpp rename to indexer/search_delimiters.hpp diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp index ce0404f2df..6f6ec51a81 100644 --- a/search/keyword_matcher.cpp +++ b/search/keyword_matcher.cpp @@ -1,5 +1,5 @@ #include "keyword_matcher.hpp" -#include "delimiters.hpp" +#include "../indexer/search_delimiters.hpp" #include "../indexer/string_search_utils.hpp" #include "../base/logging.hpp" #include "../base/string_utils.hpp" diff --git a/search/query.cpp b/search/query.cpp index d0bbffe149..ddbaf6a42b 100644 --- a/search/query.cpp +++ b/search/query.cpp @@ -1,12 +1,12 @@ #include "query.hpp" #include "categories_holder.hpp" -#include "delimiters.hpp" #include "latlon_match.hpp" #include "search_trie_matching.hpp" #include "../indexer/feature_visibility.hpp" -#include "../indexer/string_search_utils.hpp" #include "../indexer/scales.hpp" +#include "../indexer/search_delimiters.hpp" +#include "../indexer/string_search_utils.hpp" #include "../base/exception.hpp" #include "../base/stl_add.hpp" diff --git a/search/search.pro b/search/search.pro index de8b5e31ed..63c8db5f02 100644 --- a/search/search.pro +++ b/search/search.pro @@ -10,7 +10,6 @@ DEPENDENCIES = indexer geometry coding base include($$ROOT_DIR/common.pri) HEADERS += \ - delimiters.hpp \ engine.hpp \ intermediate_result.hpp \ keyword_matcher.hpp \ @@ -22,7 +21,6 @@ HEADERS += \ approximate_string_match.hpp \ SOURCES += \ - delimiters.cpp \ engine.cpp \ intermediate_result.cpp \ keyword_matcher.cpp \