From 8bdc8b39e52c1716c5451d888ae0f95fcdd36f71 Mon Sep 17 00:00:00 2001 From: Vladimir Byko-Ianko Date: Wed, 14 Oct 2015 10:34:00 +0300 Subject: [PATCH] git-clang-format --- platform/get_text_by_id.cpp | 9 +++++---- platform/get_text_by_id.hpp | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/platform/get_text_by_id.cpp b/platform/get_text_by_id.cpp index c9b715c375..8683710e80 100644 --- a/platform/get_text_by_id.cpp +++ b/platform/get_text_by_id.cpp @@ -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); } diff --git a/platform/get_text_by_id.hpp b/platform/get_text_by_id.hpp index ff644e37d3..d002149d1a 100644 --- a/platform/get_text_by_id.hpp +++ b/platform/get_text_by_id.hpp @@ -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);