From e9848b4e46a371784cb7334ffb24c7fac099f4ce Mon Sep 17 00:00:00 2001 From: vng Date: Tue, 2 Sep 2014 12:59:09 +0300 Subject: [PATCH] Minor fixes. --- map/framework.hpp | 5 ++--- map/navigator.hpp | 3 +-- platform/preferred_languages.cpp | 2 +- search/search_query.cpp | 11 ++++++++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/map/framework.hpp b/map/framework.hpp index f9b46bd6cb..a447789c85 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -15,6 +15,8 @@ #include "pin_click_manager.hpp" #include "mwm_url.hpp" +#include "move_screen_task.hpp" +#include "track.hpp" #include "../defines.hpp" @@ -41,9 +43,6 @@ #include "../std/unique_ptr.hpp" #include "../std/target_os.hpp" -#include "move_screen_task.hpp" - -#include "track.hpp" //#define DRAW_TOUCH_POINTS diff --git a/map/navigator.hpp b/map/navigator.hpp index 54d87dc3cb..662049dfaf 100644 --- a/map/navigator.hpp +++ b/map/navigator.hpp @@ -6,11 +6,10 @@ #include "../geometry/screenbase.hpp" #include "../base/matrix.hpp" -#include "../base/scheduled_task.hpp" -#include "../std/function.hpp" #include "../std/shared_ptr.hpp" + /// Calculates screen parameters in navigation (dragging, scaling, etc.). class Navigator { diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp index 189b137da3..30684341a1 100644 --- a/platform/preferred_languages.cpp +++ b/platform/preferred_languages.cpp @@ -163,7 +163,7 @@ string GetCurrentOrig() string Normalize(string const & lang) { strings::SimpleTokenizer const iter(lang, "-_ "); - ASSERT(iter, ()); + ASSERT(iter, (lang)); return *iter; } diff --git a/search/search_query.cpp b/search/search_query.cpp index 53c60d9bd9..792cabe298 100644 --- a/search/search_query.cpp +++ b/search/search_query.cpp @@ -200,6 +200,8 @@ void Query::NullPosition() void Query::SetPreferredLocale(string const & locale) { + ASSERT(!locale.empty(), ()); + LOG(LDEBUG, ("New preffered locale:", locale)); int8_t const code = StringUtf8Multilang::GetLangIndex(languages::Normalize(locale)); @@ -218,11 +220,14 @@ void Query::SetPreferredLocale(string const & locale) void Query::SetInputLocale(string const & locale) { - LOG(LDEBUG, ("New input locale:", locale)); + if (!locale.empty()) + { + LOG(LDEBUG, ("New input locale:", locale)); - SetLanguage(LANG_INPUT, StringUtf8Multilang::GetLangIndex(languages::Normalize(locale))); + SetLanguage(LANG_INPUT, StringUtf8Multilang::GetLangIndex(languages::Normalize(locale))); - m_inputLocaleCode = CategoriesHolder::MapLocaleToInteger(locale); + m_inputLocaleCode = CategoriesHolder::MapLocaleToInteger(locale); + } } void Query::ClearCaches()