diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2015-10-14 10:31:32 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2015-10-14 10:31:32 +0300 |
commit | fc2898bf5129154bbfd323e38a0d5b049dab494e (patch) | |
tree | cd72e5e5e74f9e0fd8dee40471099b9998f10740 /platform/get_text_by_id.hpp | |
parent | 91b9d32760e8bf4c799dc79412137c8d42198ea9 (diff) |
Corrections after colleagues comments.
Diffstat (limited to 'platform/get_text_by_id.hpp')
-rw-r--r-- | platform/get_text_by_id.hpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/platform/get_text_by_id.hpp b/platform/get_text_by_id.hpp index 50c5184a46..ff644e37d3 100644 --- a/platform/get_text_by_id.hpp +++ b/platform/get_text_by_id.hpp @@ -14,6 +14,9 @@ enum class TextSource TtsSound = 0 }; +class GetTextById; +typedef unique_ptr<GetTextById> TGetTextByIdPtr; + /// GetTextById represents text messages which are saved in textsDir /// in a specified locale. class GetTextById @@ -25,9 +28,9 @@ public: string operator()(string const & textId) const; string GetLocale() const { return m_locale; } private: - friend unique_ptr<GetTextById> GetTextByIdFactory(TextSource textSouce, string const & localeName); - friend unique_ptr<GetTextById> ForTestingGetTextByIdFactory(string const & jsonBuffer, string const & localeName); - friend unique_ptr<GetTextById> MakeGetTextById(string const & jsonBuffer, string const & localeName); + friend TGetTextByIdPtr GetTextByIdFactory(TextSource textSource, 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); void InitFromJson(string const & jsonBuffer); @@ -38,11 +41,11 @@ private: unordered_map<string, string> m_localeTexts; }; -/// Factoris to create intances of GetTextById. -/// If unique_ptr<GetTextById> is created by GetTextByIdFactory or ForTestingGetTextByIdFactory -/// threre are only two possibities. +/// Factories to create GetTextById instances. +/// If TGetTextByIdPtr is created by GetTextByIdFactory or ForTestingGetTextByIdFactory +/// threre are only two possibities: /// * a factory returns a valid instance /// * a factory returns nullptr -unique_ptr<GetTextById> GetTextByIdFactory(TextSource textSouce, string const & localeName); -unique_ptr<GetTextById> ForTestingGetTextByIdFactory(string const & jsonBuffer, string const & localeName); +TGetTextByIdPtr GetTextByIdFactory(TextSource textSource, string const & localeName); +TGetTextByIdPtr ForTestingGetTextByIdFactory(string const & jsonBuffer, string const & localeName); } // namespace platform |