RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Minor fixes.

Browse source
This commit is contained in:
vng 2014-09-02 12:59:09 +03:00 • committed by Alex Zolotarev
parent 8b502dbb09
commit e9848b4e46
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
map/framework.hpp
View file

@ -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

3
map/navigator.hpp
View file

@ -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
{

2
platform/preferred_languages.cpp
View file

@ -163,7 +163,7 @@ string GetCurrentOrig()
string Normalize(string const & lang)
{
strings::SimpleTokenizer const iter(lang, "-_ ");
ASSERT(iter, ());
ASSERT(iter, (lang));
return *iter;
}

11
search/search_query.cpp
View file

@ -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()