[base] [coding] Moved file_name_utils.{c,h}pp from coding/ to base/.

33 files changed, 39 insertions, 52 deletions

diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp
index 1fe85994db..e2140d9019 100644
--- a/generator/altitude_generator.cpp
+++ b/generator/altitude_generator.cpp
@@ -9,7 +9,6 @@
 #include "indexer/feature_processor.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/read_write_utils.hpp"
 #include "coding/reader.hpp"
@@ -20,6 +19,7 @@
 
 #include "base/assert.hpp"
 #include "base/checked_cast.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 #include "base/stl_helpers.hpp"
diff --git a/generator/booking_quality_check/booking_quality_check.cpp b/generator/booking_quality_check/booking_quality_check.cpp
index aedb3cd049..ee3f2d93ff 100644
--- a/generator/booking_quality_check/booking_quality_check.cpp
+++ b/generator/booking_quality_check/booking_quality_check.cpp
@@ -11,8 +11,7 @@
 
 #include "geometry/distance_on_sphere.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/exception.hpp"
 #include "base/geo_object_id.hpp"
 #include "base/stl_helpers.hpp"
diff --git a/generator/borders_loader.cpp b/generator/borders_loader.cpp
index 3d5888db6d..91fbd96700 100644
--- a/generator/borders_loader.cpp
+++ b/generator/borders_loader.cpp
@@ -2,8 +2,6 @@
 
 #include "generator/borders_generator.hpp"
 
-#include "defines.hpp"
-
 #include "platform/platform.hpp"
 
 #include "storage/country_polygon.hpp"
@@ -11,7 +9,6 @@
 #include "indexer/scales.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/read_write_utils.hpp"
 
 #include "geometry/mercator.hpp"
@@ -19,6 +16,7 @@
 #include "geometry/simplification.hpp"
 
 #include "base/exception.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
@@ -29,6 +27,8 @@
 #include <iostream>
 #include <vector>
 
+#include "defines.hpp"
+
 using namespace std;
 
 namespace borders
diff --git a/generator/descriptions_section_builder.hpp b/generator/descriptions_section_builder.hpp
index 5bbb3f56e5..d38d3101e2 100644
--- a/generator/descriptions_section_builder.hpp
+++ b/generator/descriptions_section_builder.hpp
@@ -7,11 +7,11 @@
 #include "indexer/ftypes_matcher.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/string_utf8_multilang.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/geo_object_id.hpp"
 #include "base/logging.hpp"
 
diff --git a/generator/feature_segments_checker/feature_segments_checker.cpp b/generator/feature_segments_checker/feature_segments_checker.cpp
index 607c5cf31c..d418868304 100644
--- a/generator/feature_segments_checker/feature_segments_checker.cpp
+++ b/generator/feature_segments_checker/feature_segments_checker.cpp
@@ -2,8 +2,6 @@
 
 #include "routing_common/bicycle_model.hpp"
 
-#include "coding/file_name_utils.hpp"
-
 #include "indexer/classificator_loader.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/feature_altitude.hpp"
@@ -16,6 +14,7 @@
 #include "platform/platform.hpp"
 
 #include "base/checked_cast.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/math.hpp"
 
diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp
index 307d123598..ac877fc745 100644
--- a/generator/feature_sorter.cpp
+++ b/generator/feature_sorter.cpp
@@ -23,13 +23,13 @@
 #include "platform/mwm_version.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/point_coding.hpp"
 
 #include "geometry/polygon.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 #include "base/string_utils.hpp"
diff --git a/generator/generate_info.hpp b/generator/generate_info.hpp
index 36ad67ef3e..6c0d13cfba 100644
--- a/generator/generate_info.hpp
+++ b/generator/generate_info.hpp
@@ -2,8 +2,7 @@
 
 #include "generator/cities_boundaries_builder.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include "defines.hpp"
diff --git a/generator/generator_tests/altitude_test.cpp b/generator/generator_tests/altitude_test.cpp
index d36d7a7bce..29d3aa4333 100644
--- a/generator/generator_tests/altitude_test.cpp
+++ b/generator/generator_tests/altitude_test.cpp
@@ -14,14 +14,13 @@
 
 #include "geometry/point2d.hpp"
 
-#include "coding/file_name_utils.hpp"
-
 #include "platform/country_file.hpp"
 #include "platform/platform.hpp"
 #include "platform/platform_tests_support/scoped_dir.hpp"
 #include "platform/platform_tests_support/scoped_file.hpp"
 #include "platform/platform_tests_support/writable_dir_changer.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 
diff --git a/generator/generator_tests/city_roads_tests.cpp b/generator/generator_tests/city_roads_tests.cpp
index 1c3ab117bd..bf30e7cc76 100644
--- a/generator/generator_tests/city_roads_tests.cpp
+++ b/generator/generator_tests/city_roads_tests.cpp
@@ -16,10 +16,10 @@
 #include "platform/platform.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/reader.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include <algorithm>
diff --git a/generator/generator_tests/common.cpp b/generator/generator_tests/common.cpp
index 8246adaac0..e5bda9408a 100644
--- a/generator/generator_tests/common.cpp
+++ b/generator/generator_tests/common.cpp
@@ -1,9 +1,9 @@
 #include "generator/generator_tests/common.hpp"
 
-#include "coding/file_name_utils.hpp"
-
 #include "platform/platform.hpp"
 
+#include "base/file_name_utils.hpp"
+
 namespace generator_tests
 {
 OsmElement MakeOsmElement(uint64_t id, Tags const & tags, OsmElement::EntityType t)
diff --git a/generator/generator_tests/descriptions_section_builder_tests.cpp b/generator/generator_tests/descriptions_section_builder_tests.cpp
index e733362164..5c2760ab15 100644
--- a/generator/generator_tests/descriptions_section_builder_tests.cpp
+++ b/generator/generator_tests/descriptions_section_builder_tests.cpp
@@ -14,8 +14,7 @@
 #include "platform/platform.hpp"
 #include "platform/platform_tests_support/scoped_mwm.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/assert.hpp"
 
 #include <algorithm>
diff --git a/generator/generator_tests/maxspeeds_tests.cpp b/generator/generator_tests/maxspeeds_tests.cpp
index 9088379cbc..6decbeb82d 100644
--- a/generator/generator_tests/maxspeeds_tests.cpp
+++ b/generator/generator_tests/maxspeeds_tests.cpp
@@ -18,7 +18,6 @@
 #include "indexer/feature_processor.hpp"
 #include "indexer/mwm_set.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/reader.hpp"
 #include "coding/writer.hpp"
 
@@ -30,6 +29,7 @@
 #include "platform/platform_tests_support/scoped_dir.hpp"
 #include "platform/platform_tests_support/scoped_file.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/geo_object_id.hpp"
 #include "base/logging.hpp"
 
diff --git a/generator/generator_tests/region_info_collector_tests.cpp b/generator/generator_tests/region_info_collector_tests.cpp
index e735182615..ab41dc02ba 100644
--- a/generator/generator_tests/region_info_collector_tests.cpp
+++ b/generator/generator_tests/region_info_collector_tests.cpp
@@ -6,12 +6,11 @@
 #include "generator/regions/collector_region_info.hpp"
 #include "generator/regions/region_info.hpp"
 
-#include "coding/file_name_utils.hpp"
+#include "platform/platform.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/geo_object_id.hpp"
 
-#include "platform/platform.hpp"
-
 #include <cstdint>
 #include <limits>
 #include <string>
diff --git a/generator/generator_tests/regions_tests.cpp b/generator/generator_tests/regions_tests.cpp
index b4dd3314e6..ba9528222e 100644
--- a/generator/generator_tests/regions_tests.cpp
+++ b/generator/generator_tests/regions_tests.cpp
@@ -10,8 +10,7 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/macros.hpp"
 
 #include <algorithm>
diff --git a/generator/generator_tests/restriction_collector_test.cpp b/generator/generator_tests/restriction_collector_test.cpp
index d70da21267..a65aee7b61 100644
--- a/generator/generator_tests/restriction_collector_test.cpp
+++ b/generator/generator_tests/restriction_collector_test.cpp
@@ -1,7 +1,6 @@
 #include "testing/testing.hpp"
 
 #include "generator/generator_tests_support/routing_helpers.hpp"
-
 #include "generator/restriction_collector.hpp"
 
 #include "routing/restrictions_serialization.hpp"
@@ -13,8 +12,7 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/geo_object_id.hpp"
 #include "base/stl_helpers.hpp"
 
diff --git a/generator/generator_tests/restriction_test.cpp b/generator/generator_tests/restriction_test.cpp
index b1dc6a9ef0..7be2e9e084 100644
--- a/generator/generator_tests/restriction_test.cpp
+++ b/generator/generator_tests/restriction_test.cpp
@@ -3,7 +3,6 @@
 #include "generator/generator_tests_support/routing_helpers.hpp"
 #include "generator/generator_tests_support/test_feature.hpp"
 #include "generator/generator_tests_support/test_mwm_builder.hpp"
-
 #include "generator/restriction_collector.hpp"
 #include "generator/restriction_generator.hpp"
 
@@ -17,8 +16,8 @@
 #include "platform/platform_tests_support/scoped_file.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include <algorithm>
diff --git a/generator/generator_tests/road_access_test.cpp b/generator/generator_tests/road_access_test.cpp
index 84f7fcf2f0..127b3f7875 100644
--- a/generator/generator_tests/road_access_test.cpp
+++ b/generator/generator_tests/road_access_test.cpp
@@ -3,7 +3,6 @@
 #include "generator/generator_tests_support/routing_helpers.hpp"
 #include "generator/generator_tests_support/test_feature.hpp"
 #include "generator/generator_tests_support/test_mwm_builder.hpp"
-
 #include "generator/road_access_generator.hpp"
 
 #include "routing/road_access_serialization.hpp"
@@ -19,8 +18,8 @@
 #include "geometry/point2d.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
diff --git a/generator/generator_tests/speed_cameras_test.cpp b/generator/generator_tests/speed_cameras_test.cpp
index 6355e346cd..e0dfef6885 100644
--- a/generator/generator_tests/speed_cameras_test.cpp
+++ b/generator/generator_tests/speed_cameras_test.cpp
@@ -26,11 +26,11 @@
 #include "platform/platform_tests_support/scoped_dir.hpp"
 #include "platform/platform_tests_support/scoped_file.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 
 #include "geometry/point2d.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/macros.hpp"
 #include "base/math.hpp"
diff --git a/generator/generator_tests/sponsored_storage_tests.cpp b/generator/generator_tests/sponsored_storage_tests.cpp
index f323fad6a0..0c67465caa 100644
--- a/generator/generator_tests/sponsored_storage_tests.cpp
+++ b/generator/generator_tests/sponsored_storage_tests.cpp
@@ -5,7 +5,7 @@
 
 #include "platform/platform_tests_support/scoped_file.hpp"
 
-#include "coding/file_name_utils.hpp"
+#include "base/file_name_utils.hpp"
 
 using platform::tests_support::ScopedFile;
 
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 155a4b1dda..1fcb7f6009 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -56,9 +56,9 @@
 #include "platform/platform.hpp"
 
 #include "coding/endianness.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/transliteration.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/timer.hpp"
 
 #include <csignal>
diff --git a/generator/intermediate_data.hpp b/generator/intermediate_data.hpp
index 253faf04c7..9ec53e0f03 100644
--- a/generator/intermediate_data.hpp
+++ b/generator/intermediate_data.hpp
@@ -3,13 +3,13 @@
 #include "generator/generate_info.hpp"
 #include "generator/intermediate_elements.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/mmap_reader.hpp"
 
 #include "base/assert.hpp"
 #include "base/control_flow.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include <algorithm>
diff --git a/generator/locality_sorter.cpp b/generator/locality_sorter.cpp
index 1709466c1c..2c8ac3266a 100644
--- a/generator/locality_sorter.cpp
+++ b/generator/locality_sorter.cpp
@@ -8,7 +8,6 @@
 #include "indexer/scales_patch.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 
 #include "geometry/convex_hull.hpp"
@@ -16,6 +15,7 @@
 #include "platform/platform.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 #include "base/string_utils.hpp"
diff --git a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
index 3eb7002914..8263c1e673 100644
--- a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
+++ b/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
@@ -4,11 +4,11 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/internal/file_data.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 
diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index 9a3530d1b7..542cbbd109 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -11,11 +11,11 @@
 #include "geometry/mercator.hpp"
 #include "geometry/tree4d.hpp"
 
+#include "coding/parse_xml.hpp"
+
 #include "base/assert.hpp"
 #include "base/stl_helpers.hpp"
-
-#include "coding/file_name_utils.hpp"
-#include "coding/parse_xml.hpp"
+#include "base/file_name_utils.hpp"
 
 #include <fstream>
 #include <memory>
diff --git a/generator/platform_helpers.cpp b/generator/platform_helpers.cpp
index f136163b2f..4f092c5ffb 100644
--- a/generator/platform_helpers.cpp
+++ b/generator/platform_helpers.cpp
@@ -2,7 +2,7 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
+#include "base/file_name_utils.hpp"
 
 #include "defines.hpp"
 
diff --git a/generator/regions/regions.cpp b/generator/regions/regions.cpp
index 1e93a97c55..ca3e5884ce 100644
--- a/generator/regions/regions.cpp
+++ b/generator/regions/regions.cpp
@@ -12,10 +12,10 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/transliteration.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/stl_helpers.hpp"
 #include "base/timer.hpp"
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index 0fdb9725eb..a5dbce5f37 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -30,7 +30,6 @@
 #include "indexer/feature_processor.hpp"
 
 #include "coding/file_container.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/geometry_coding.hpp"
 #include "coding/point_coding.hpp"
 #include "coding/reader.hpp"
@@ -38,6 +37,7 @@
 #include "geometry/point2d.hpp"
 
 #include "base/checked_cast.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/geo_object_id.hpp"
 #include "base/logging.hpp"
 #include "base/timer.hpp"
diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index 298ca3b629..0862774d1a 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -25,13 +25,13 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/map_uint32_to_val.hpp"
 #include "coding/reader_writer_ops.hpp"
 #include "coding/writer.hpp"
 
 #include "base/assert.hpp"
 #include "base/checked_cast.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 #include "base/stl_helpers.hpp"
diff --git a/generator/sponsored_object_storage.hpp b/generator/sponsored_object_storage.hpp
index 6a17480144..a04e395226 100644
--- a/generator/sponsored_object_storage.hpp
+++ b/generator/sponsored_object_storage.hpp
@@ -5,8 +5,7 @@
 #include "geometry/distance_on_sphere.hpp"
 #include "geometry/latlon.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
diff --git a/generator/transit_generator.cpp b/generator/transit_generator.cpp
index 3373ca6cd3..fa7b894e19 100644
--- a/generator/transit_generator.cpp
+++ b/generator/transit_generator.cpp
@@ -19,13 +19,13 @@
 #include "geometry/rect2d.hpp"
 #include "geometry/region2d.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_writer.hpp"
 
 #include "platform/platform.hpp"
 
 #include "base/assert.hpp"
 #include "base/exception.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include <vector>
diff --git a/generator/translator_coastline.cpp b/generator/translator_coastline.cpp
index 8ac96e2fa6..869bef3790 100644
--- a/generator/translator_coastline.cpp
+++ b/generator/translator_coastline.cpp
@@ -10,7 +10,7 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
+#include "base/file_name_utils.hpp"
 
 #include "defines.hpp"
 
diff --git a/generator/translator_country.cpp b/generator/translator_country.cpp
index 4c486e113f..13dd78ada3 100644
--- a/generator/translator_country.cpp
+++ b/generator/translator_country.cpp
@@ -17,8 +17,7 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/assert.hpp"
 
 #include <cctype>
diff --git a/generator/translator_world.cpp b/generator/translator_world.cpp
index a2bb792516..298c486756 100644
--- a/generator/translator_world.cpp
+++ b/generator/translator_world.cpp
@@ -9,7 +9,7 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
+#include "base/file_name_utils.hpp"
 
 #include "defines.hpp"