From 90d2a193ec4d535cd681c8b78ddbcd8fdb39f97d Mon Sep 17 00:00:00 2001 From: vng Date: Sat, 11 Feb 2012 12:30:56 +0300 Subject: [PATCH] Remove useless entities and includes. --- search/category_info.hpp | 20 -------------------- search/keyword_matcher.cpp | 5 ++++- search/keyword_matcher.hpp | 5 +++-- search/lang_keywords_scorer.cpp | 4 ++++ search/lang_keywords_scorer.hpp | 3 ++- search/search.pro | 1 - search/search_engine.cpp | 3 --- search/search_engine.hpp | 3 --- search/search_query.cpp | 1 - search/search_query.hpp | 2 -- 10 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 search/category_info.hpp diff --git a/search/category_info.hpp b/search/category_info.hpp deleted file mode 100644 index f1907460cb..0000000000 --- a/search/category_info.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "../base/base.hpp" -#include "../std/vector.hpp" - -namespace search -{ - -struct CategoryInfo -{ - static uint32_t const DO_NOT_SUGGEST = 255; - - CategoryInfo() : m_score(DO_NOT_SUGGEST) {} - - vector m_types; - // Score to - uint8_t m_score; -}; - -} // namespace search diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp index 9d8a487cc1..4592eda926 100644 --- a/search/keyword_matcher.cpp +++ b/search/keyword_matcher.cpp @@ -1,10 +1,13 @@ #include "keyword_matcher.hpp" + #include "../indexer/search_delimiters.hpp" #include "../indexer/search_string_utils.hpp" + #include "../base/stl_add.hpp" -#include "../base/string_utils.hpp" + #include "../std/algorithm.hpp" + namespace search { diff --git a/search/keyword_matcher.hpp b/search/keyword_matcher.hpp index 10e44b67d3..0cd41b0697 100644 --- a/search/keyword_matcher.hpp +++ b/search/keyword_matcher.hpp @@ -1,10 +1,11 @@ #pragma once #include "search_common.hpp" -#include "../base/assert.hpp" -#include "../base/buffer_vector.hpp" + #include "../base/string_utils.hpp" + #include "../std/string.hpp" + namespace search { diff --git a/search/lang_keywords_scorer.cpp b/search/lang_keywords_scorer.cpp index 6b5e87422e..3631e263c8 100644 --- a/search/lang_keywords_scorer.cpp +++ b/search/lang_keywords_scorer.cpp @@ -1,9 +1,13 @@ #include "lang_keywords_scorer.hpp" + #include "../indexer/search_string_utils.hpp" #include "../indexer/search_delimiters.hpp" + #include "../base/stl_add.hpp" + #include "../std/algorithm.hpp" + namespace search { diff --git a/search/lang_keywords_scorer.hpp b/search/lang_keywords_scorer.hpp index 7c0fc5c6d1..33fa3e4447 100644 --- a/search/lang_keywords_scorer.hpp +++ b/search/lang_keywords_scorer.hpp @@ -1,8 +1,9 @@ #pragma once #include "keyword_matcher.hpp" -#include "../base/base.hpp" + #include "../std/vector.hpp" + namespace search { diff --git a/search/search.pro b/search/search.pro index 1ca37f0421..780752e84e 100644 --- a/search/search.pro +++ b/search/search.pro @@ -19,7 +19,6 @@ HEADERS += \ latlon_match.hpp \ approximate_string_match.hpp \ feature_offset_match.hpp \ - category_info.hpp \ lang_keywords_scorer.hpp \ params.hpp \ diff --git a/search/search_engine.cpp b/search/search_engine.cpp index 59600a0349..2d0dae2fca 100644 --- a/search/search_engine.cpp +++ b/search/search_engine.cpp @@ -1,5 +1,4 @@ #include "search_engine.hpp" -#include "category_info.hpp" #include "result.hpp" #include "search_query.hpp" @@ -18,9 +17,7 @@ #include "../base/stl_add.hpp" #include "../std/algorithm.hpp" -#include "../std/function.hpp" #include "../std/map.hpp" -#include "../std/string.hpp" #include "../std/utility.hpp" #include "../std/vector.hpp" #include "../std/bind.hpp" diff --git a/search/search_engine.hpp b/search/search_engine.hpp index 334fbeb983..3b8111f012 100644 --- a/search/search_engine.hpp +++ b/search/search_engine.hpp @@ -6,8 +6,6 @@ #include "../coding/reader.hpp" -#include "../base/base.hpp" -#include "../base/string_utils.hpp" #include "../base/mutex.hpp" #include "../std/scoped_ptr.hpp" @@ -21,7 +19,6 @@ class Index; namespace search { -struct CategoryInfo; class Query; class Results; diff --git a/search/search_query.cpp b/search/search_query.cpp index 7b2517cf2c..d0348289b1 100644 --- a/search/search_query.cpp +++ b/search/search_query.cpp @@ -1,5 +1,4 @@ #include "search_query.hpp" -#include "category_info.hpp" #include "feature_offset_match.hpp" #include "lang_keywords_scorer.hpp" #include "latlon_match.hpp" diff --git a/search/search_query.hpp b/search/search_query.hpp index bd5ea7c41f..69fd53324f 100644 --- a/search/search_query.hpp +++ b/search/search_query.hpp @@ -11,7 +11,6 @@ #include "../std/map.hpp" #include "../std/scoped_ptr.hpp" -#include "../std/shared_ptr.hpp" #include "../std/string.hpp" #include "../std/unordered_set.hpp" #include "../std/vector.hpp" @@ -26,7 +25,6 @@ namespace storage { class CountryInfoGetter; } namespace search { -struct CategoryInfo; class LangKeywordsScorer; namespace impl