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

15 files changed, 21 insertions, 21 deletions

diff --git a/map/benchmark_tool/features_loading.cpp b/map/benchmark_tool/features_loading.cpp
index 6851035b60..1821ee7766 100644
--- a/map/benchmark_tool/features_loading.cpp
+++ b/map/benchmark_tool/features_loading.cpp
@@ -7,12 +7,10 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/macros.hpp"
 #include "base/timer.hpp"
 
-
 namespace bench
 {
 
diff --git a/map/benchmark_tools.cpp b/map/benchmark_tools.cpp
index 9003d4b1f2..584b86b148 100644
--- a/map/benchmark_tools.cpp
+++ b/map/benchmark_tools.cpp
@@ -9,12 +9,11 @@
 #include "platform/http_client.hpp"
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/reader.hpp"
 
 #include "geometry/mercator.hpp"
 
-#include "3party/jansson/myjansson.hpp"
+#include "base/file_name_utils.hpp"
 
 #include <algorithm>
 #include <atomic>
@@ -22,6 +21,8 @@
 #include <string>
 #include <vector>
 
+#include "3party/jansson/myjansson.hpp"
+
 namespace
 {
 struct BenchmarkHandle
diff --git a/map/bookmark_catalog.cpp b/map/bookmark_catalog.cpp
index e237d55878..69db5202df 100644
--- a/map/bookmark_catalog.cpp
+++ b/map/bookmark_catalog.cpp
@@ -6,12 +6,12 @@
 #include "platform/platform.hpp"
 #include "platform/preferred_languages.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/serdes_json.hpp"
 #include "coding/sha1.hpp"
 #include "coding/zip_creator.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 #include "base/visitor.hpp"
diff --git a/map/bookmark_helpers.cpp b/map/bookmark_helpers.cpp
index f62f971e57..1dbcd1cf4e 100644
--- a/map/bookmark_helpers.cpp
+++ b/map/bookmark_helpers.cpp
@@ -10,12 +10,12 @@
 #include "platform/platform.hpp"
 #include "platform/preferred_languages.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/sha1.hpp"
 #include "coding/zip_reader.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/scope_guard.hpp"
 #include "base/string_utils.hpp"
 
diff --git a/map/bookmark_manager.cpp b/map/bookmark_manager.cpp
index f128afc515..9c8890b3b4 100644
--- a/map/bookmark_manager.cpp
+++ b/map/bookmark_manager.cpp
@@ -16,7 +16,6 @@
 #include "indexer/classificator.hpp"
 #include "indexer/scales.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/hex.hpp"
 #include "coding/internal/file_data.hpp"
@@ -27,6 +26,7 @@
 
 #include "geometry/transformations.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/macros.hpp"
 #include "base/string_utils.hpp"
 
diff --git a/map/cloud.cpp b/map/cloud.cpp
index 681d1a764f..25cb872cdf 100644
--- a/map/cloud.cpp
+++ b/map/cloud.cpp
@@ -1,6 +1,5 @@
 #include "map/cloud.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/internal/file_data.hpp"
@@ -15,15 +14,16 @@
 #include "platform/http_uploader.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/stl_helpers.hpp"
 
-#include "3party/Alohalytics/src/alohalytics.h"
-
 #include <algorithm>
 #include <chrono>
 #include <sstream>
 
+#include "3party/Alohalytics/src/alohalytics.h"
+
 #include "private.h"
 
 using namespace std::chrono;
diff --git a/map/framework.cpp b/map/framework.cpp
index af74fca2cb..bcf4c25c75 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -75,7 +75,6 @@
 #include "platform/socket.hpp"
 
 #include "coding/endianness.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/point_coding.hpp"
 #include "coding/string_utf8_multilang.hpp"
 #include "coding/transliteration.hpp"
@@ -95,6 +94,7 @@
 #include "partners_api/opentable_api.hpp"
 #include "partners_api/partners.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/math.hpp"
 #include "base/scope_guard.hpp"
diff --git a/map/gps_tracker.cpp b/map/gps_tracker.cpp
index c1a391b5bd..ef21a0de34 100644
--- a/map/gps_tracker.cpp
+++ b/map/gps_tracker.cpp
@@ -1,10 +1,10 @@
 #include "map/gps_tracker.hpp"
 #include "map/framework.hpp"
 
-#include "coding/file_name_utils.hpp"
-
 #include "platform/platform.hpp"
 
+#include "base/file_name_utils.hpp"
+
 #include "std/atomic.hpp"
 
 #include "defines.hpp"
diff --git a/map/local_ads_manager.cpp b/map/local_ads_manager.cpp
index 7750d13696..108ab500c3 100644
--- a/map/local_ads_manager.cpp
+++ b/map/local_ads_manager.cpp
@@ -20,11 +20,11 @@
 #include "platform/preferred_languages.hpp"
 #include "platform/settings.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/point_coding.hpp"
 #include "coding/string_utf8_multilang.hpp"
 #include "coding/url_encode.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/url_helpers.hpp"
 
 #include "private.h"
diff --git a/map/map_tests/bookmarks_test.cpp b/map/map_tests/bookmarks_test.cpp
index 4c2f55694e..95861c9619 100644
--- a/map/map_tests/bookmarks_test.cpp
+++ b/map/map_tests/bookmarks_test.cpp
@@ -15,10 +15,11 @@
 #include "platform/platform.hpp"
 #include "platform/preferred_languages.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/string_utf8_multilang.hpp"
 
+#include "base/file_name_utils.hpp"
+
 #include <array>
 #include <fstream>
 #include <memory>
diff --git a/map/map_tests/gps_track_storage_test.cpp b/map/map_tests/gps_track_storage_test.cpp
index bb35a49b52..59b11dc8a9 100644
--- a/map/map_tests/gps_track_storage_test.cpp
+++ b/map/map_tests/gps_track_storage_test.cpp
@@ -4,11 +4,11 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_writer.hpp"
 
 #include "geometry/latlon.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 
diff --git a/map/map_tests/gps_track_test.cpp b/map/map_tests/gps_track_test.cpp
index 07f7398224..5b1117c4bf 100644
--- a/map/map_tests/gps_track_test.cpp
+++ b/map/map_tests/gps_track_test.cpp
@@ -4,11 +4,11 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_writer.hpp"
 
 #include "geometry/latlon.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 
diff --git a/map/notifications/notification_queue_storage.cpp b/map/notifications/notification_queue_storage.cpp
index 36c033af38..3ea150d0a4 100644
--- a/map/notifications/notification_queue_storage.cpp
+++ b/map/notifications/notification_queue_storage.cpp
@@ -2,11 +2,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"
 
 namespace notifications
diff --git a/map/power_management/power_manager.cpp b/map/power_management/power_manager.cpp
index 91f5632815..fd41458c37 100644
--- a/map/power_management/power_manager.cpp
+++ b/map/power_management/power_manager.cpp
@@ -2,13 +2,13 @@
 
 #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 "coding/serdes_json.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 using namespace power_management;
diff --git a/map/user.cpp b/map/user.cpp
index 7b1e0def8f..30a9b434f9 100644
--- a/map/user.cpp
+++ b/map/user.cpp
@@ -5,13 +5,13 @@
 #include "platform/platform.hpp"
 #include "platform/preferred_languages.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/serdes_json.hpp"
 #include "coding/url_encode.hpp"
 #include "coding/writer.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 #include "base/stl_helpers.hpp"