diff options
author | Maxim Pimenov <m@maps.me> | 2019-05-20 18:53:57 +0300 |
---|---|---|
committer | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2019-05-21 13:40:48 +0300 |
commit | 17a02d356057c2981c1d136a6e16b426be81d957 (patch) | |
tree | 8a433d692f467d7930de9666e611823d2fe021e0 /storage | |
parent | ef265805673726959c73785cee9669c62c29a2bb (diff) |
[base] [coding] Moved file_name_utils.{c,h}pp from coding/ to base/.
Diffstat (limited to 'storage')
9 files changed, 12 insertions, 14 deletions
diff --git a/storage/country_info_reader_light.cpp b/storage/country_info_reader_light.cpp index c57a7e186a..2db93c2a42 100644 --- a/storage/country_info_reader_light.cpp +++ b/storage/country_info_reader_light.cpp @@ -6,13 +6,13 @@ #include "platform/platform.hpp" #include "platform/preferred_languages.hpp" -#include "coding/file_name_utils.hpp" #include "coding/file_reader.hpp" #include "coding/geometry_coding.hpp" #include "coding/read_write_utils.hpp" #include "geometry/region2d.hpp" +#include "base/file_name_utils.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" diff --git a/storage/storage.cpp b/storage/storage.cpp index 92bce25bff..ef7a46c117 100644 --- a/storage/storage.cpp +++ b/storage/storage.cpp @@ -11,11 +11,11 @@ #include "platform/servers_list.hpp" #include "platform/settings.hpp" -#include "coding/file_name_utils.hpp" #include "coding/internal/file_data.hpp" #include "coding/url_encode.hpp" #include "base/exception.hpp" +#include "base/file_name_utils.hpp" #include "base/gmtime.hpp" #include "base/logging.hpp" #include "base/scope_guard.hpp" diff --git a/storage/storage_integration_tests/migrate_tests.cpp b/storage/storage_integration_tests/migrate_tests.cpp index d01e6317b4..602cc386db 100644 --- a/storage/storage_integration_tests/migrate_tests.cpp +++ b/storage/storage_integration_tests/migrate_tests.cpp @@ -9,8 +9,7 @@ #include "platform/platform_tests_support/scoped_dir.hpp" #include "platform/platform_tests_support/writable_dir_changer.hpp" -#include "coding/file_name_utils.hpp" - +#include "base/file_name_utils.hpp" #include "base/scope_guard.hpp" #include "base/string_utils.hpp" #include "base/thread.hpp" diff --git a/storage/storage_integration_tests/storage_3levels_tests.cpp b/storage/storage_integration_tests/storage_3levels_tests.cpp index d1618a61ef..7312cc1698 100644 --- a/storage/storage_integration_tests/storage_3levels_tests.cpp +++ b/storage/storage_integration_tests/storage_3levels_tests.cpp @@ -7,7 +7,7 @@ #include "platform/platform.hpp" #include "platform/platform_tests_support/writable_dir_changer.hpp" -#include "coding/file_name_utils.hpp" +#include "base/file_name_utils.hpp" #include "std/algorithm.hpp" #include "std/unique_ptr.hpp" diff --git a/storage/storage_integration_tests/storage_downloading_tests.cpp b/storage/storage_integration_tests/storage_downloading_tests.cpp index 988097a37d..3793ca6036 100644 --- a/storage/storage_integration_tests/storage_downloading_tests.cpp +++ b/storage/storage_integration_tests/storage_downloading_tests.cpp @@ -10,10 +10,10 @@ #include "platform/platform_tests_support/scoped_dir.hpp" #include "platform/platform_tests_support/writable_dir_changer.hpp" -#include "coding/file_name_utils.hpp" #include "coding/file_writer.hpp" #include "coding/sha1.hpp" +#include "base/file_name_utils.hpp" #include "base/scope_guard.hpp" #include "base/string_utils.hpp" #include "base/thread.hpp" diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/storage/storage_integration_tests/storage_group_download_tests.cpp index a89006f6f0..68964f102a 100644 --- a/storage/storage_integration_tests/storage_group_download_tests.cpp +++ b/storage/storage_integration_tests/storage_group_download_tests.cpp @@ -10,11 +10,10 @@ #include "platform/platform_tests_support/scoped_dir.hpp" #include "platform/platform_tests_support/writable_dir_changer.hpp" -#include "coding/file_name_utils.hpp" - #include "storage/storage.hpp" #include "base/assert.hpp" +#include "base/file_name_utils.hpp" #include "std/condition_variable.hpp" #include "std/mutex.hpp" diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/storage/storage_integration_tests/storage_http_tests.cpp index a2602f307d..4b0ce0afbc 100644 --- a/storage/storage_integration_tests/storage_http_tests.cpp +++ b/storage/storage_integration_tests/storage_http_tests.cpp @@ -10,8 +10,7 @@ #include "platform/platform_tests_support/scoped_dir.hpp" #include "platform/platform_tests_support/writable_dir_changer.hpp" -#include "coding/file_name_utils.hpp" - +#include "base/file_name_utils.hpp" #include "base/scope_guard.hpp" #include "base/string_utils.hpp" #include "base/thread.hpp" diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/storage/storage_integration_tests/storage_update_tests.cpp index d1dffe7015..e320a89e63 100644 --- a/storage/storage_integration_tests/storage_update_tests.cpp +++ b/storage/storage_integration_tests/storage_update_tests.cpp @@ -9,11 +9,12 @@ #include "platform/platform.hpp" #include "platform/platform_tests_support/writable_dir_changer.hpp" -#include "coding/file_name_utils.hpp" #include "coding/internal/file_data.hpp" #include "storage/storage.hpp" +#include "base/file_name_utils.hpp" + #include "std/unique_ptr.hpp" using namespace platform; diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 2d299e2491..3b198c181d 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -32,13 +32,11 @@ #include "geometry/mercator.hpp" -#include "coding/file_name_utils.hpp" #include "coding/file_writer.hpp" #include "coding/internal/file_data.hpp" -#include "defines.hpp" - #include "base/assert.hpp" +#include "base/file_name_utils.hpp" #include "base/scope_guard.hpp" #include "base/string_utils.hpp" @@ -53,6 +51,8 @@ #include "std/unique_ptr.hpp" #include "std/vector.hpp" +#include "defines.hpp" + using namespace platform::tests_support; using namespace platform; |