diff options
author | Yuri Gorshenin <y@maps.me> | 2015-10-06 12:54:34 +0300 |
---|---|---|
committer | Yuri Gorshenin <y@maps.me> | 2015-10-06 15:16:29 +0300 |
commit | c47b9d67901618708289e572aecf1867b0a95550 (patch) | |
tree | f7235dc74d3959b69154fb2b9a5f35bead4aa46d /map/framework.hpp | |
parent | ac73294cccf6cf4d64b5b13c01cb2644e9577700 (diff) |
[search] CountryInfoGetter is extracted into individual unit.
Diffstat (limited to 'map/framework.hpp')
-rw-r--r-- | map/framework.hpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/map/framework.hpp b/map/framework.hpp index 6ae17beb07..2d30557cd8 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -64,6 +64,11 @@ namespace search struct AddressInfo; } +namespace storage +{ +class CountryInfoGetter; +} + namespace gui { class Controller; } namespace anim { class Controller; } namespace routing { namespace turns{ class Settings; } } @@ -105,7 +110,10 @@ protected: StringsBundle m_stringsBundle; - mutable unique_ptr<search::Engine> m_pSearchEngine; + // The order matters here: storage::CountryInfoGetter must be + // initialized before search::Engine. + unique_ptr<storage::CountryInfoGetter> m_infoGetter; + unique_ptr<search::Engine> m_searchEngine; search::QuerySaver m_searchQuerySaver; model::FeaturesFetcher m_model; @@ -320,7 +328,9 @@ public: #endif // USE_DRAPE private: - search::Engine * GetSearchEngine() const; + void InitCountryInfoGetter(); + void InitSearchEngine(); + search::SearchParams m_lastSearch; uint8_t m_fixedSearchResults; |