Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--platform/get_text_by_id.cpp17
-rw-r--r--platform/get_text_by_id.hpp1
-rw-r--r--platform/platform_tests/get_text_by_id_tests.cpp1
3 files changed, 8 insertions, 11 deletions
diff --git a/platform/get_text_by_id.cpp b/platform/get_text_by_id.cpp
index 91d5e5342b..f2e48e8e49 100644
--- a/platform/get_text_by_id.cpp
+++ b/platform/get_text_by_id.cpp
@@ -9,22 +9,21 @@
#include "std/target_os.hpp"
-
namespace
{
string GetTextSourceString(platform::TextSource textSouce)
{
#if defined(OMIM_OS_ANDROID) || defined(OMIM_OS_IPHONE)
- switch(textSouce)
+ switch (textSouce)
{
- case platform::TextSource::TtsSound:
- return "sound-strings";
+ case platform::TextSource::TtsSound:
+ return "sound-strings";
}
#else
- switch(textSouce)
+ switch (textSouce)
{
- case platform::TextSource::TtsSound:
- return "../data/sound-strings";
+ case platform::TextSource::TtsSound:
+ return "../data/sound-strings";
}
#endif
ASSERT(false, ());
@@ -35,8 +34,8 @@ namespace platform
{
GetTextById::GetTextById(TextSource textSouce, string const & localeName)
{
- string const pathToJson = my::JoinFoldersToPath({GetTextSourceString(textSouce),
- localeName + ".json"}, "localize.json");
+ string const pathToJson = my::JoinFoldersToPath(
+ {GetTextSourceString(textSouce), localeName + ".json"}, "localize.json");
string jsonBuffer;
ReaderPtr<Reader>(GetPlatform().GetReader(pathToJson)).ReadAsString(jsonBuffer);
diff --git a/platform/get_text_by_id.hpp b/platform/get_text_by_id.hpp
index 807025644e..c018e7ec84 100644
--- a/platform/get_text_by_id.hpp
+++ b/platform/get_text_by_id.hpp
@@ -3,7 +3,6 @@
#include <std/string.hpp>
#include <std/unordered_map.hpp>
-
namespace platform
{
// class GetTextById is ready to work with different sources of text strings.
diff --git a/platform/platform_tests/get_text_by_id_tests.cpp b/platform/platform_tests/get_text_by_id_tests.cpp
index 0d6113f825..657669a11d 100644
--- a/platform/platform_tests/get_text_by_id_tests.cpp
+++ b/platform/platform_tests/get_text_by_id_tests.cpp
@@ -2,7 +2,6 @@
#include "platform/get_text_by_id.hpp"
-
using namespace platform;
UNIT_TEST(GetTextByIdEnglishTest)