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

git-clang-format

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2015-10-14 10:34:00 +03:00
parent fc2898bf51
commit 8bdc8b39e5
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platform/get_text_by_id.cpp
View file

@ -43,9 +43,9 @@ bool GetJsonBuffer(platform::TextSource textSource, string const & localeName, s
}
catch (RootException const & ex)
{
LOG(LWARNING, ("Can't open", localeName,"sound instructions file. pathToJson is",
pathToJson, ex.what()));
return false; // No json file for localeName
LOG(LWARNING, ("Can't open", localeName, "sound instructions file. pathToJson is", pathToJson,
ex.what()));
return false; // No json file for localeName
}
return true;
}
@ -82,7 +82,8 @@ TGetTextByIdPtr ForTestingGetTextByIdFactory(string const & jsonBuffer, string c
return MakeGetTextById(jsonBuffer, localeName);
}
GetTextById::GetTextById(string const & jsonBuffer, string const & localeName) : m_locale(localeName)
GetTextById::GetTextById(string const & jsonBuffer, string const & localeName)
: m_locale(localeName)
{
InitFromJson(jsonBuffer);
}

4
platform/get_text_by_id.hpp
View file

@ -27,9 +27,11 @@ public:
/// The boolean flag is set to false otherwise.
string operator()(string const & textId) const;
string GetLocale() const { return m_locale; }
private:
friend TGetTextByIdPtr GetTextByIdFactory(TextSource textSource, string const & localeName);
friend TGetTextByIdPtr ForTestingGetTextByIdFactory(string const & jsonBuffer, string const & localeName);
friend TGetTextByIdPtr ForTestingGetTextByIdFactory(string const & jsonBuffer,
string const & localeName);
friend TGetTextByIdPtr MakeGetTextById(string const & jsonBuffer, string const & localeName);
GetTextById(string const & jsonBuffer, string const & localeName);