From 341cb8032ac822a250b18543b6f1384a35e99572 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Thu, 28 Apr 2016 18:33:36 +0300 Subject: [PATCH] [platform] write_dir_changer -> writable_dir_changer --- .../platform_tests_support.pro | 4 ++-- ..._dir_changer.cpp => writable_dir_changer.cpp} | 2 +- ..._dir_changer.hpp => writable_dir_changer.hpp} | 0 .../download_calc_size_test.cpp | 2 +- .../storage_integration_tests/migrate_tests.cpp | 2 +- .../storage_3levels_tests.cpp | 2 +- .../storage_downloading_tests.cpp | 2 +- .../storage_group_download_tests.cpp | 2 +- .../storage_http_tests.cpp | 2 +- .../storage_update_tests.cpp | 2 +- storage/storage_tests/storage_tests.cpp | 2 +- .../platform/platform.xcodeproj/project.pbxproj | 16 ++++++++-------- 12 files changed, 19 insertions(+), 19 deletions(-) rename platform/platform_tests_support/{write_dir_changer.cpp => writable_dir_changer.cpp} (96%) rename platform/platform_tests_support/{write_dir_changer.hpp => writable_dir_changer.hpp} (100%) diff --git a/platform/platform_tests_support/platform_tests_support.pro b/platform/platform_tests_support/platform_tests_support.pro index 1d7235af2c..f5456cad2c 100644 --- a/platform/platform_tests_support/platform_tests_support.pro +++ b/platform/platform_tests_support/platform_tests_support.pro @@ -10,10 +10,10 @@ SOURCES += \ scoped_dir.cpp \ scoped_file.cpp \ scoped_mwm.cpp \ - write_dir_changer.cpp \ + writable_dir_changer.cpp \ HEADERS += \ scoped_dir.hpp \ scoped_file.hpp \ scoped_mwm.hpp \ - write_dir_changer.hpp \ + writable_dir_changer.hpp \ diff --git a/platform/platform_tests_support/write_dir_changer.cpp b/platform/platform_tests_support/writable_dir_changer.cpp similarity index 96% rename from platform/platform_tests_support/write_dir_changer.cpp rename to platform/platform_tests_support/writable_dir_changer.cpp index dab46e09cb..a61859bd72 100644 --- a/platform/platform_tests_support/write_dir_changer.cpp +++ b/platform/platform_tests_support/writable_dir_changer.cpp @@ -1,6 +1,6 @@ #include "testing/testing.hpp" -#include "write_dir_changer.hpp" +#include "writable_dir_changer.hpp" #include "platform/platform.hpp" #include "platform/settings.hpp" diff --git a/platform/platform_tests_support/write_dir_changer.hpp b/platform/platform_tests_support/writable_dir_changer.hpp similarity index 100% rename from platform/platform_tests_support/write_dir_changer.hpp rename to platform/platform_tests_support/writable_dir_changer.hpp diff --git a/storage/storage_integration_tests/download_calc_size_test.cpp b/storage/storage_integration_tests/download_calc_size_test.cpp index 88ccb2a21d..4e84386ca7 100644 --- a/storage/storage_integration_tests/download_calc_size_test.cpp +++ b/storage/storage_integration_tests/download_calc_size_test.cpp @@ -6,7 +6,7 @@ #include "platform/mwm_version.hpp" #include "platform/platform.hpp" -#include "platform/platform_tests_support/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" using namespace storage; diff --git a/storage/storage_integration_tests/migrate_tests.cpp b/storage/storage_integration_tests/migrate_tests.cpp index 8493bff093..a836daf037 100644 --- a/storage/storage_integration_tests/migrate_tests.cpp +++ b/storage/storage_integration_tests/migrate_tests.cpp @@ -7,7 +7,7 @@ #include "platform/local_country_file_utils.hpp" #include "platform/platform.hpp" #include "platform/platform_tests_support/scoped_dir.hpp" -#include "platform/platform_tests_support/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "coding/file_name_utils.hpp" diff --git a/storage/storage_integration_tests/storage_3levels_tests.cpp b/storage/storage_integration_tests/storage_3levels_tests.cpp index cefe208345..4c575a66bd 100644 --- a/storage/storage_integration_tests/storage_3levels_tests.cpp +++ b/storage/storage_integration_tests/storage_3levels_tests.cpp @@ -5,7 +5,7 @@ #include "map/framework.hpp" #include "platform/platform.hpp" -#include "platform/platform_tests_support/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "coding/file_name_utils.hpp" diff --git a/storage/storage_integration_tests/storage_downloading_tests.cpp b/storage/storage_integration_tests/storage_downloading_tests.cpp index 1ac228000a..bf9747663f 100644 --- a/storage/storage_integration_tests/storage_downloading_tests.cpp +++ b/storage/storage_integration_tests/storage_downloading_tests.cpp @@ -8,7 +8,7 @@ #include "platform/mwm_version.hpp" #include "platform/platform.hpp" #include "platform/platform_tests_support/scoped_dir.hpp" -#include "platform/platform_tests_support/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "coding/file_name_utils.hpp" diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/storage/storage_integration_tests/storage_group_download_tests.cpp index 34c0b9805a..884eead739 100644 --- a/storage/storage_integration_tests/storage_group_download_tests.cpp +++ b/storage/storage_integration_tests/storage_group_download_tests.cpp @@ -8,7 +8,7 @@ #include "platform/local_country_file_utils.hpp" #include "platform/platform.hpp" #include "platform/platform_tests_support/scoped_dir.hpp" -#include "platform/platform_tests_support/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "coding/file_name_utils.hpp" diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/storage/storage_integration_tests/storage_http_tests.cpp index 872d49e53a..0e15bc889a 100644 --- a/storage/storage_integration_tests/storage_http_tests.cpp +++ b/storage/storage_integration_tests/storage_http_tests.cpp @@ -8,7 +8,7 @@ #include "platform/mwm_version.hpp" #include "platform/platform.hpp" #include "platform/platform_tests_support/scoped_dir.hpp" -#include "platform/platform_tests_support/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "coding/file_name_utils.hpp" diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/storage/storage_integration_tests/storage_update_tests.cpp index 37e0c99f63..c587340508 100644 --- a/storage/storage_integration_tests/storage_update_tests.cpp +++ b/storage/storage_integration_tests/storage_update_tests.cpp @@ -7,7 +7,7 @@ #include "platform/http_request.hpp" #include "platform/local_country_file_utils.hpp" #include "platform/platform.hpp" -#include "platform/platform_tests_support/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "coding/file_name_utils.hpp" #include "coding/internal/file_data.hpp" diff --git a/storage/storage_tests/storage_tests.cpp b/storage/storage_tests/storage_tests.cpp index 31849335af..6d35f48a01 100644 --- a/storage/storage_tests/storage_tests.cpp +++ b/storage/storage_tests/storage_tests.cpp @@ -21,7 +21,7 @@ #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/write_dir_changer.hpp" +#include "platform/platform_tests_support/writable_dir_changer.hpp" #include "platform/platform_tests_support/scoped_dir.hpp" diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj index f8415c768e..2c07e21ba3 100644 --- a/xcode/platform/platform.xcodeproj/project.pbxproj +++ b/xcode/platform/platform.xcodeproj/project.pbxproj @@ -16,8 +16,8 @@ 671182F31C80AC4200CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182F21C80AC3D00CB8177 /* WorldCoasts_obsolete.mwm */; }; 671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62041AE9014C00076BD0 /* measurement_utils.cpp */; }; 671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C62051AE9014C00076BD0 /* measurement_utils.hpp */; }; - 67247FFD1C60BD6500EDE56A /* write_dir_changer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FFB1C60BD6500EDE56A /* write_dir_changer.cpp */; }; - 67247FFE1C60BD6500EDE56A /* write_dir_changer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FFC1C60BD6500EDE56A /* write_dir_changer.hpp */; }; + 67247FFD1C60BD6500EDE56A /* writable_dir_changer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FFB1C60BD6500EDE56A /* writable_dir_changer.cpp */; }; + 67247FFE1C60BD6500EDE56A /* writable_dir_changer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FFC1C60BD6500EDE56A /* writable_dir_changer.hpp */; }; 674125081B4C00CC00A3E828 /* country_defines.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125001B4C00CC00A3E828 /* country_defines.cpp */; }; 674125091B4C00CC00A3E828 /* country_defines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674125011B4C00CC00A3E828 /* country_defines.hpp */; }; 6741250A1B4C00CC00A3E828 /* country_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674125021B4C00CC00A3E828 /* country_file.cpp */; }; @@ -105,8 +105,8 @@ 671182F21C80AC3D00CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_obsolete.mwm; sourceTree = ""; }; 671C62041AE9014C00076BD0 /* measurement_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measurement_utils.cpp; sourceTree = ""; }; 671C62051AE9014C00076BD0 /* measurement_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = measurement_utils.hpp; sourceTree = ""; }; - 67247FFB1C60BD6500EDE56A /* write_dir_changer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write_dir_changer.cpp; sourceTree = ""; }; - 67247FFC1C60BD6500EDE56A /* write_dir_changer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = write_dir_changer.hpp; sourceTree = ""; }; + 67247FFB1C60BD6500EDE56A /* writable_dir_changer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = writable_dir_changer.cpp; sourceTree = ""; }; + 67247FFC1C60BD6500EDE56A /* writable_dir_changer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = writable_dir_changer.hpp; sourceTree = ""; }; 674125001B4C00CC00A3E828 /* country_defines.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_defines.cpp; sourceTree = ""; }; 674125011B4C00CC00A3E828 /* country_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_defines.hpp; sourceTree = ""; }; 674125021B4C00CC00A3E828 /* country_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_file.cpp; sourceTree = ""; }; @@ -243,8 +243,8 @@ 675340E41C58C43A002CF0D9 /* platform_tests_support */ = { isa = PBXGroup; children = ( - 67247FFB1C60BD6500EDE56A /* write_dir_changer.cpp */, - 67247FFC1C60BD6500EDE56A /* write_dir_changer.hpp */, + 67247FFB1C60BD6500EDE56A /* writable_dir_changer.cpp */, + 67247FFC1C60BD6500EDE56A /* writable_dir_changer.hpp */, 675340F41C58C4B3002CF0D9 /* scoped_dir.cpp */, 675340F51C58C4B3002CF0D9 /* scoped_dir.hpp */, 675340F61C58C4B3002CF0D9 /* scoped_file.cpp */, @@ -400,7 +400,7 @@ 675343BA1A3F5D5A00A0A8C3 /* http_thread_callback.hpp in Headers */, 676C84211C64CD3300DC9603 /* mwm_traits.hpp in Headers */, 675343B41A3F5D5A00A0A8C3 /* chunks_download_strategy.hpp in Headers */, - 67247FFE1C60BD6500EDE56A /* write_dir_changer.hpp in Headers */, + 67247FFE1C60BD6500EDE56A /* writable_dir_changer.hpp in Headers */, 674125091B4C00CC00A3E828 /* country_defines.hpp in Headers */, 675343CD1A3F5D5A00A0A8C3 /* platform.hpp in Headers */, 675343D81A3F5D5A00A0A8C3 /* video_timer.hpp in Headers */, @@ -549,7 +549,7 @@ 67A2526A1BB40E100063F8A8 /* platform_qt.cpp in Sources */, 675343D91A3F5D5A00A0A8C3 /* wifi_info_windows.cpp in Sources */, 56EB1EDE1C6B6E6C0022D831 /* mwm_traits.cpp in Sources */, - 67247FFD1C60BD6500EDE56A /* write_dir_changer.cpp in Sources */, + 67247FFD1C60BD6500EDE56A /* writable_dir_changer.cpp in Sources */, 6741250C1B4C00CC00A3E828 /* local_country_file_utils.cpp in Sources */, 67AB92EA1B7B3E9100AB5194 /* get_text_by_id.cpp in Sources */, 671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */,