diff options
| author | Maxim Pimenov <m@maps.me> | 2019-03-19 13:11:53 +0300 |
|---|---|---|
| committer | Arsentiy Milchakov <milcars@mapswithme.com> | 2019-03-19 15:06:58 +0300 |
| commit | db525bf9088dc134f78d5f5ee930765a31b8a4c8 (patch) | |
| tree | 0a6f7995e70773df57d0fc28cd9ddd539b2dc908 /indexer | |
| parent | 939620a534af3d58288c4734fa99f3a85f4b587e (diff) | |
[coding] Removed JoinFoldersToPath.
Diffstat (limited to 'indexer')
| -rw-r--r-- | indexer/indexer_tests/centers_table_test.cpp | 2 | ||||
| -rw-r--r-- | indexer/indexer_tests/rank_table_test.cpp | 5 | ||||
| -rw-r--r-- | indexer/map_style_reader.cpp | 9 |
3 files changed, 7 insertions, 9 deletions
diff --git a/indexer/indexer_tests/centers_table_test.cpp b/indexer/indexer_tests/centers_table_test.cpp index a0207931fd..4fa2b265e0 100644 --- a/indexer/indexer_tests/centers_table_test.cpp +++ b/indexer/indexer_tests/centers_table_test.cpp @@ -34,7 +34,7 @@ struct CentersTableTest UNIT_CLASS_TEST(CentersTableTest, Smoke) { - string const kMap = base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwm"); + string const kMap = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwm"); feature::DataHeader header(kMap); auto const codingParams = header.GetDefGeometryCodingParams(); diff --git a/indexer/indexer_tests/rank_table_test.cpp b/indexer/indexer_tests/rank_table_test.cpp index d138ab1eb8..9a95f24ecc 100644 --- a/indexer/indexer_tests/rank_table_test.cpp +++ b/indexer/indexer_tests/rank_table_test.cpp @@ -76,9 +76,8 @@ UNIT_TEST(RankTableBuilder_EndToEnd) { classificator::Load(); - string const originalMapPath = - base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwm"); - string const mapPath = base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass-copy.mwm"); + string const originalMapPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwm"); + string const mapPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass-copy.mwm"); base::CopyFileX(originalMapPath, mapPath); SCOPE_GUARD(cleanup, bind(&FileWriter::DeleteFileX, mapPath)); diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp index efb77d543c..e1eb9b120a 100644 --- a/indexer/map_style_reader.cpp +++ b/indexer/map_style_reader.cpp @@ -98,7 +98,7 @@ ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin"; auto overriddenRulesFile = - base::JoinFoldersToPath({GetPlatform().WritableDir(), kStylesOverrideDir}, rulesFile); + base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile); if (GetPlatform().IsFileExistsByFullPath(overriddenRulesFile)) rulesFile = overriddenRulesFile; @@ -110,10 +110,9 @@ ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file, { std::string const resourceDir = std::string("resources-") + density + GetStyleResourcesSuffix(GetCurrentStyle()); - std::string resFile = base::JoinFoldersToPath(resourceDir, file); + std::string resFile = base::JoinPath(resourceDir, file); - auto overriddenResFile = - base::JoinFoldersToPath({GetPlatform().WritableDir(), kStylesOverrideDir}, resFile); + auto overriddenResFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, resFile); if (GetPlatform().IsFileExistsByFullPath(overriddenResFile)) resFile = overriddenResFile; @@ -122,7 +121,7 @@ ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file, ReaderPtr<Reader> StyleReader::GetDefaultResourceReader(std::string const & file) const { - return GetPlatform().GetReader(base::JoinFoldersToPath("resources-default", file)); + return GetPlatform().GetReader(base::JoinPath("resources-default", file)); } StyleReader & GetStyleReader() |