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

13 files changed, 14 insertions, 18 deletions

diff --git a/platform/get_text_by_id.cpp b/platform/get_text_by_id.cpp
index 4af9031aec..d24b44b792 100644
--- a/platform/get_text_by_id.cpp
+++ b/platform/get_text_by_id.cpp
@@ -1,8 +1,7 @@
 #include "platform/get_text_by_id.hpp"
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include "3party/jansson/myjansson.hpp"
diff --git a/platform/local_country_file.cpp b/platform/local_country_file.cpp
index b806e5f13e..f9cc45adb6 100644
--- a/platform/local_country_file.cpp
+++ b/platform/local_country_file.cpp
@@ -3,9 +3,9 @@
 #include "platform/platform.hpp"
 
 #include "coding/internal/file_data.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/sha1.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include "std/sstream.hpp"
diff --git a/platform/local_country_file_utils.cpp b/platform/local_country_file_utils.cpp
index f768144294..7591061ebc 100644
--- a/platform/local_country_file_utils.cpp
+++ b/platform/local_country_file_utils.cpp
@@ -5,11 +5,11 @@
 #include "platform/platform.hpp"
 #include "platform/settings.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/reader.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
diff --git a/platform/platform.cpp b/platform/platform.cpp
index 2559735a92..78033740c7 100644
--- a/platform/platform.cpp
+++ b/platform/platform.cpp
@@ -3,10 +3,10 @@
 #include "platform/local_country_file.hpp"
 
 #include "coding/base64.hpp"
-#include "coding/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/writer.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index cb9629ad4a..296d36ec99 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -5,11 +5,11 @@
 #include "platform/settings.hpp"
 
 #include "coding/zip_reader.hpp"
-#include "coding/file_name_utils.hpp"
 
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
-#include "base/thread.hpp"
 #include "base/string_utils.hpp"
+#include "base/thread.hpp"
 
 #include <memory>
 #include <regex>
diff --git a/platform/platform_linux.cpp b/platform/platform_linux.cpp
index 46c1b3bf89..d98ed56122 100644
--- a/platform/platform_linux.cpp
+++ b/platform/platform_linux.cpp
@@ -2,9 +2,9 @@
 #include "platform/socket.hpp"
 
 #include "coding/file_reader.hpp"
-#include "coding/file_name_utils.hpp"
 
 #include "base/exception.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/macros.hpp"
 #include "base/scope_guard.hpp"
diff --git a/platform/platform_mac.mm b/platform/platform_mac.mm
index 87830f4189..7ad3fd6c2a 100644
--- a/platform/platform_mac.mm
+++ b/platform/platform_mac.mm
@@ -1,7 +1,6 @@
 #include "platform/platform.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include "std/target_os.hpp"
diff --git a/platform/platform_tests/local_country_file_tests.cpp b/platform/platform_tests/local_country_file_tests.cpp
index 16b5100b80..c62c3dce26 100644
--- a/platform/platform_tests/local_country_file_tests.cpp
+++ b/platform/platform_tests/local_country_file_tests.cpp
@@ -9,10 +9,10 @@
 #include "platform/platform_tests_support/scoped_file.hpp"
 #include "platform/settings.hpp"
 
-#include "coding/file_name_utils.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/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp
index 514110f899..a7171a2015 100644
--- a/platform/platform_tests/platform_test.cpp
+++ b/platform/platform_tests/platform_test.cpp
@@ -6,10 +6,10 @@
 
 #include "defines.hpp"
 
-#include "coding/file_name_utils.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/platform/platform_tests_support/scoped_dir.cpp b/platform/platform_tests_support/scoped_dir.cpp
index 67ef05e1a6..3af7cc5b77 100644
--- a/platform/platform_tests_support/scoped_dir.cpp
+++ b/platform/platform_tests_support/scoped_dir.cpp
@@ -2,8 +2,7 @@
 
 #include "testing/testing.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include "std/sstream.hpp"
diff --git a/platform/platform_tests_support/scoped_file.cpp b/platform/platform_tests_support/scoped_file.cpp
index f7fc36d75e..4a9c5c9f69 100644
--- a/platform/platform_tests_support/scoped_file.cpp
+++ b/platform/platform_tests_support/scoped_file.cpp
@@ -6,12 +6,12 @@
 #include "platform/mwm_version.hpp"
 #include "platform/platform_tests_support/scoped_dir.hpp"
 
-#include "coding/file_name_utils.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/writer.hpp"
 
 #include "base/assert.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include "std/sstream.hpp"
diff --git a/platform/platform_tests_support/writable_dir_changer.cpp b/platform/platform_tests_support/writable_dir_changer.cpp
index 5e3b70ea95..23ec917d25 100644
--- a/platform/platform_tests_support/writable_dir_changer.cpp
+++ b/platform/platform_tests_support/writable_dir_changer.cpp
@@ -5,7 +5,7 @@
 #include "platform/platform.hpp"
 #include "platform/settings.hpp"
 
-#include "coding/file_name_utils.hpp"
+#include "base/file_name_utils.hpp"
 #include "coding/internal/file_data.hpp"
 
 WritableDirChanger::WritableDirChanger(string const & testDir, SettingsDirPolicy settingsDirPolicy)
diff --git a/platform/platform_unix_impl.cpp b/platform/platform_unix_impl.cpp
index 6d93476b2c..2e791afdd1 100644
--- a/platform/platform_unix_impl.cpp
+++ b/platform/platform_unix_impl.cpp
@@ -1,8 +1,7 @@
 #include "platform/platform.hpp"
 #include "platform/platform_unix_impl.hpp"
 
-#include "coding/file_name_utils.hpp"
-
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"