[coding] Removed JoinFoldersToPath.

4 files changed, 10 insertions, 13 deletions

diff --git a/generator/booking_quality_check/booking_addr_match.cpp b/generator/booking_quality_check/booking_addr_match.cpp
index eeff581d2b..82883ca39a 100644
--- a/generator/booking_quality_check/booking_addr_match.cpp
+++ b/generator/booking_quality_check/booking_addr_match.cpp
@@ -57,7 +57,7 @@ int main(int argc, char * argv[])
   if (!FLAGS_user_resource_path.empty())
   {
     platform.SetResourceDir(FLAGS_user_resource_path);
-    countriesFile = base::JoinFoldersToPath(FLAGS_user_resource_path, COUNTRIES_FILE);
+    countriesFile = base::JoinPath(FLAGS_user_resource_path, COUNTRIES_FILE);
   }
 
   if (!FLAGS_data_path.empty())
diff --git a/generator/borders_loader.cpp b/generator/borders_loader.cpp
index effca15af8..283040081b 100644
--- a/generator/borders_loader.cpp
+++ b/generator/borders_loader.cpp
@@ -169,13 +169,13 @@ void UnpackBorders(string const & baseDir, string const & targetDir)
     MYTHROW(FileSystemException, ("Unable to find or create directory", targetDir));
 
   vector<storage::CountryDef> countries;
-  FilesContainerR reader(base::JoinFoldersToPath(baseDir, PACKED_POLYGONS_FILE));
+  FilesContainerR reader(base::JoinPath(baseDir, PACKED_POLYGONS_FILE));
   ReaderSource<ModelReaderPtr> src(reader.GetReader(PACKED_POLYGONS_INFO_TAG));
   rw::Read(src, countries);
 
   for (size_t id = 0; id < countries.size(); id++)
   {
-    ofstream poly(base::JoinFoldersToPath(targetDir, countries[id].m_countryId + ".poly"));
+    ofstream poly(base::JoinPath(targetDir, countries[id].m_countryId + ".poly"));
     poly << countries[id].m_countryId << endl;
     src = reader.GetReader(strings::to_string(id));
     uint32_t const count = ReadVarUint<uint32_t>(src);
diff --git a/generator/generate_info.hpp b/generator/generate_info.hpp
index 29ced81bd1..36ad67ef3e 100644
--- a/generator/generate_info.hpp
+++ b/generator/generate_info.hpp
@@ -97,19 +97,19 @@ struct GenerateInfo
   std::string GetTmpFileName(std::string const & fileName,
                              std::string const & ext = DATA_FILE_EXTENSION_TMP) const
   {
-    return base::JoinFoldersToPath(m_tmpDir, fileName + ext);
+    return base::JoinPath(m_tmpDir, fileName + ext);
   }
 
   std::string GetTargetFileName(std::string const & fileName,
                                 std::string const & ext = DATA_FILE_EXTENSION) const
   {
-    return base::JoinFoldersToPath(m_targetDir, fileName + ext);
+    return base::JoinPath(m_targetDir, fileName + ext);
   }
 
   std::string GetIntermediateFileName(std::string const & fileName,
                                       std::string const & ext = "") const
   {
-    return base::JoinFoldersToPath(m_intermediateDir, fileName + ext);
+    return base::JoinPath(m_intermediateDir, fileName + ext);
   }
 
   std::string GetAddressesFileName() const
diff --git a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
index eadb067372..3eb7002914 100644
--- a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
+++ b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
@@ -26,13 +26,10 @@ UNIT_TEST(IncrementalUpdates_Smoke)
 {
   base::ScopedLogAbortLevelChanger ignoreLogError(base::LogLevel::LCRITICAL);
 
-  string const oldMwmPath = base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
-  string const newMwmPath1 =
-      base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass-new1.mwm");
-  string const newMwmPath2 =
-      base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass-new2.mwm");
-  string const diffPath =
-      base::JoinFoldersToPath(GetPlatform().WritableDir(), "minsk-pass.mwmdiff");
+  string const oldMwmPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
+  string const newMwmPath1 = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass-new1.mwm");
+  string const newMwmPath2 = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass-new2.mwm");
+  string const diffPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwmdiff");
 
   SCOPE_GUARD(cleanup, [&] {
     FileWriter::DeleteFileX(newMwmPath1);