From e605a3ac816747cb7e5d5d207e8f8cbe28d162db Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Fri, 10 Apr 2015 11:49:30 +0300 Subject: Fix include path for platform --- platform/apple_location_service.mm | 8 ++++---- platform/apple_video_timer.mm | 4 ++-- platform/chunks_download_strategy.cpp | 12 ++++++------ platform/chunks_download_strategy.hpp | 10 +++++----- platform/constants.hpp | 2 +- platform/file_logging.cpp | 8 ++++---- platform/file_logging.hpp | 2 +- platform/http_request.cpp | 18 +++++++++--------- platform/http_request.hpp | 10 +++++----- platform/http_thread_apple.mm | 8 ++++---- platform/http_thread_callback.hpp | 2 +- platform/http_thread_qt.cpp | 10 +++++----- platform/http_thread_qt.hpp | 4 ++-- platform/http_thread_tizen.cpp | 8 ++++---- platform/http_thread_tizen.hpp | 4 ++-- platform/ios_video_timer.mm | 4 ++-- platform/location.hpp | 8 ++++---- platform/location_service.cpp | 8 ++++---- platform/location_service.hpp | 2 +- platform/platform.cpp | 12 ++++++------ platform/platform.hpp | 16 ++++++++-------- platform/platform_android.cpp | 18 +++++++++--------- platform/platform_ios.mm | 8 ++++---- platform/platform_linux.cpp | 6 +++--- platform/platform_mac.mm | 6 +++--- platform/platform_qt.cpp | 14 +++++++------- platform/platform_tests/apk_test.cpp | 14 +++++++------- platform/platform_tests/downloader_test.cpp | 26 +++++++++++++------------- platform/platform_tests/jansson_test.cpp | 4 ++-- platform/platform_tests/language_test.cpp | 6 +++--- platform/platform_tests/location_test.cpp | 4 ++-- platform/platform_tests/platform_test.cpp | 12 ++++++------ platform/platform_tests/video_timer_test.cpp | 10 +++++----- platform/platform_tizen.cpp | 6 +++--- platform/platform_unix_impl.cpp | 10 +++++----- platform/platform_unix_impl.hpp | 4 ++-- platform/platform_win.cpp | 12 ++++++------ platform/preferred_languages.cpp | 12 ++++++------ platform/preferred_languages.hpp | 2 +- platform/pthread_video_timer.cpp | 6 +++--- platform/servers_list.cpp | 14 +++++++------- platform/servers_list.hpp | 4 ++-- platform/settings.cpp | 24 ++++++++++++------------ platform/settings.hpp | 4 ++-- platform/tizen_utils.hpp | 4 ++-- platform/video_timer.cpp | 4 ++-- platform/video_timer.hpp | 2 +- platform/wifi_info.hpp | 6 +++--- platform/wifi_info_windows.cpp | 10 +++++----- platform/wifi_location_service.cpp | 14 +++++++------- 50 files changed, 213 insertions(+), 213 deletions(-) diff --git a/platform/apple_location_service.mm b/platform/apple_location_service.mm index 8fb0b24e2f..c4568c26b1 100644 --- a/platform/apple_location_service.mm +++ b/platform/apple_location_service.mm @@ -1,9 +1,9 @@ -#include "location_service.hpp" +#include "platform/location_service.hpp" -#include "../base/logging.hpp" -#include "../base/macros.hpp" +#include "base/logging.hpp" +#include "base/macros.hpp" -#include "../std/target_os.hpp" +#include "std/target_os.hpp" #import diff --git a/platform/apple_video_timer.mm b/platform/apple_video_timer.mm index 7d0dce0733..b60e7a9f00 100644 --- a/platform/apple_video_timer.mm +++ b/platform/apple_video_timer.mm @@ -1,6 +1,6 @@ -#include "video_timer.hpp" +#include "platform/video_timer.hpp" -#include "../std/target_os.hpp" +#include "std/target_os.hpp" #include diff --git a/platform/chunks_download_strategy.cpp b/platform/chunks_download_strategy.cpp index cd004dcebf..efcf89bef9 100644 --- a/platform/chunks_download_strategy.cpp +++ b/platform/chunks_download_strategy.cpp @@ -1,12 +1,12 @@ -#include "chunks_download_strategy.hpp" +#include "platform/chunks_download_strategy.hpp" -#include "../coding/file_writer.hpp" -#include "../coding/file_reader.hpp" -#include "../coding/varint.hpp" +#include "coding/file_writer.hpp" +#include "coding/file_reader.hpp" +#include "coding/varint.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace downloader diff --git a/platform/chunks_download_strategy.hpp b/platform/chunks_download_strategy.hpp index 6b7e701e13..afd8d42d42 100644 --- a/platform/chunks_download_strategy.hpp +++ b/platform/chunks_download_strategy.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../std/string.hpp" -#include "../std/vector.hpp" -#include "../std/utility.hpp" -#include "../std/stdint.hpp" -#include "../std/static_assert.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" +#include "std/utility.hpp" +#include "std/stdint.hpp" +#include "std/static_assert.hpp" namespace downloader diff --git a/platform/constants.hpp b/platform/constants.hpp index fa1ef661aa..51b2e3be40 100644 --- a/platform/constants.hpp +++ b/platform/constants.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../std/stdint.hpp" +#include "std/stdint.hpp" static const uint32_t READER_CHUNK_LOG_SIZE = 10; diff --git a/platform/file_logging.cpp b/platform/file_logging.cpp index 4bc391bf41..79adb91426 100644 --- a/platform/file_logging.cpp +++ b/platform/file_logging.cpp @@ -1,10 +1,10 @@ -#include "file_logging.hpp" +#include "platform/file_logging.hpp" -#include "../std/mutex.hpp" +#include "std/mutex.hpp" -#include "../coding/file_writer.hpp" +#include "coding/file_writer.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" namespace { diff --git a/platform/file_logging.hpp b/platform/file_logging.hpp index 7a578bcdc6..4c801b8905 100644 --- a/platform/file_logging.hpp +++ b/platform/file_logging.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../base/logging.hpp" +#include "base/logging.hpp" // @todo this functionality is not located in logging.hpp since file_logging uses FileWriter which depends on coding lib. diff --git a/platform/http_request.cpp b/platform/http_request.cpp index 92942b6d2b..1787b05294 100644 --- a/platform/http_request.cpp +++ b/platform/http_request.cpp @@ -1,19 +1,19 @@ -#include "http_request.hpp" -#include "chunks_download_strategy.hpp" -#include "http_thread_callback.hpp" +#include "platform/http_request.hpp" +#include "platform/chunks_download_strategy.hpp" +#include "platform/http_thread_callback.hpp" -#include "../defines.hpp" +#include "defines.hpp" #ifdef DEBUG -#include "../base/thread.hpp" +#include "base/thread.hpp" #endif -#include "../coding/internal/file_data.hpp" -#include "../coding/file_writer.hpp" +#include "coding/internal/file_data.hpp" +#include "coding/file_writer.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/unique_ptr.hpp" +#include "std/unique_ptr.hpp" #ifdef OMIM_OS_IPHONE diff --git a/platform/http_request.hpp b/platform/http_request.hpp index d44168c0d8..cc37416a81 100644 --- a/platform/http_request.hpp +++ b/platform/http_request.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../std/stdint.hpp" -#include "../std/function.hpp" -#include "../std/string.hpp" -#include "../std/vector.hpp" -#include "../std/utility.hpp" +#include "std/stdint.hpp" +#include "std/function.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" +#include "std/utility.hpp" namespace downloader { diff --git a/platform/http_thread_apple.mm b/platform/http_thread_apple.mm index 6976682ab6..0688e8d06e 100644 --- a/platform/http_thread_apple.mm +++ b/platform/http_thread_apple.mm @@ -1,10 +1,10 @@ #import "http_thread_apple.h" -#include "http_thread_callback.hpp" -#include "platform.hpp" +#include "platform/http_thread_callback.hpp" +#include "platform/platform.hpp" -#include "../base/logging.hpp" -#include "../base/macros.hpp" +#include "base/logging.hpp" +#include "base/macros.hpp" #ifdef OMIM_OS_IPHONE #include "../iphone/Maps/Classes/MapsAppDelegate.h" diff --git a/platform/http_thread_callback.hpp b/platform/http_thread_callback.hpp index 3b827bed35..a9b2d5c2c5 100644 --- a/platform/http_thread_callback.hpp +++ b/platform/http_thread_callback.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/stdint.hpp" +#include "std/stdint.hpp" namespace downloader { diff --git a/platform/http_thread_qt.cpp b/platform/http_thread_qt.cpp index b2a31f8d59..d59038debb 100644 --- a/platform/http_thread_qt.cpp +++ b/platform/http_thread_qt.cpp @@ -1,11 +1,11 @@ -#include "http_thread_qt.hpp" -#include "http_thread_callback.hpp" +#include "platform/http_thread_qt.hpp" +#include "platform/http_thread_callback.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" #include #include diff --git a/platform/http_thread_qt.hpp b/platform/http_thread_qt.hpp index 41009f8ced..fae304e10e 100644 --- a/platform/http_thread_qt.hpp +++ b/platform/http_thread_qt.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/string.hpp" -#include "../std/stdint.hpp" +#include "std/string.hpp" +#include "std/stdint.hpp" #include #include diff --git a/platform/http_thread_tizen.cpp b/platform/http_thread_tizen.cpp index ea2b9a510b..455741e5a2 100644 --- a/platform/http_thread_tizen.cpp +++ b/platform/http_thread_tizen.cpp @@ -1,9 +1,9 @@ -#include "http_thread_tizen.hpp" +#include "platform/http_thread_tizen.hpp" #include"../base/logging.hpp" -#include "platform.hpp" -#include "http_thread_callback.hpp" -#include "tizen_utils.hpp" +#include "platform/platform.hpp" +#include "platform/http_thread_callback.hpp" +#include "platform/tizen_utils.hpp" #include diff --git a/platform/http_thread_tizen.hpp b/platform/http_thread_tizen.hpp index 6d3f9b17b1..838ef14c63 100644 --- a/platform/http_thread_tizen.hpp +++ b/platform/http_thread_tizen.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../std/target_os.hpp" -#include "../../std/noncopyable.hpp" +#include "std/target_os.hpp" +#include "std/noncopyable.hpp" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wignored-qualifiers" diff --git a/platform/ios_video_timer.mm b/platform/ios_video_timer.mm index 061da11da4..b60b234687 100644 --- a/platform/ios_video_timer.mm +++ b/platform/ios_video_timer.mm @@ -1,6 +1,6 @@ -#include "video_timer.hpp" +#include "platform/video_timer.hpp" -#include "../std/target_os.hpp" +#include "std/target_os.hpp" #import #import diff --git a/platform/location.hpp b/platform/location.hpp index 576c95a3ee..6cbbe6ea8e 100644 --- a/platform/location.hpp +++ b/platform/location.hpp @@ -1,11 +1,11 @@ #pragma once -#include "../base/base.hpp" +#include "base/base.hpp" -#include "../routing/turns.hpp" +#include "routing/turns.hpp" -#include "../std/string.hpp" -#include "../std/cmath.hpp" +#include "std/string.hpp" +#include "std/cmath.hpp" namespace location diff --git a/platform/location_service.cpp b/platform/location_service.cpp index 8c2ac1a560..bab9c686a7 100644 --- a/platform/location_service.cpp +++ b/platform/location_service.cpp @@ -1,8 +1,8 @@ -#include "location_service.hpp" +#include "platform/location_service.hpp" -#include "../std/target_os.hpp" -#include "../std/vector.hpp" -#include "../std/ctime.hpp" +#include "std/target_os.hpp" +#include "std/vector.hpp" +#include "std/ctime.hpp" namespace { diff --git a/platform/location_service.hpp b/platform/location_service.hpp index a2986b1583..99b125743b 100644 --- a/platform/location_service.hpp +++ b/platform/location_service.hpp @@ -1,6 +1,6 @@ #pragma once -#include "location.hpp" +#include "platform/location.hpp" namespace location { diff --git a/platform/platform.cpp b/platform/platform.cpp index b83001ba34..480007728c 100644 --- a/platform/platform.cpp +++ b/platform/platform.cpp @@ -1,11 +1,11 @@ -#include "platform.hpp" +#include "platform/platform.hpp" -#include "../coding/sha2.hpp" -#include "../coding/base64.hpp" -#include "../coding/file_name_utils.hpp" -#include "../coding/writer.hpp" +#include "coding/sha2.hpp" +#include "coding/base64.hpp" +#include "coding/file_name_utils.hpp" +#include "coding/writer.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" string Platform::ReadPathForFile(string const & file, string searchScope) const diff --git a/platform/platform.hpp b/platform/platform.hpp index 2e2654068a..7d916994c6 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -1,16 +1,16 @@ #pragma once -#include "../coding/reader.hpp" +#include "coding/reader.hpp" -#include "../base/exception.hpp" +#include "base/exception.hpp" -#include "../std/string.hpp" -#include "../std/vector.hpp" -#include "../std/utility.hpp" -#include "../std/function.hpp" -#include "../std/bitset.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" +#include "std/utility.hpp" +#include "std/function.hpp" +#include "std/bitset.hpp" -#include "../defines.hpp" +#include "defines.hpp" DECLARE_EXCEPTION(FileAbsentException, RootException); diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp index 957fb04bc4..92e6fde61c 100644 --- a/platform/platform_android.cpp +++ b/platform/platform_android.cpp @@ -1,14 +1,14 @@ -#include "platform.hpp" -#include "platform_unix_impl.hpp" -#include "constants.hpp" +#include "platform/platform.hpp" +#include "platform/platform_unix_impl.hpp" +#include "platform/constants.hpp" -#include "../coding/zip_reader.hpp" -#include "../coding/file_name_utils.hpp" +#include "coding/zip_reader.hpp" +#include "coding/file_name_utils.hpp" -#include "../base/logging.hpp" -#include "../base/thread.hpp" -#include "../base/regexp.hpp" -#include "../base/string_utils.hpp" +#include "base/logging.hpp" +#include "base/thread.hpp" +#include "base/regexp.hpp" +#include "base/string_utils.hpp" #include // for sysconf #include diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index 1a8e99869d..2f6a71b63a 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -1,8 +1,8 @@ -#include "platform.hpp" -#include "platform_unix_impl.hpp" -#include "constants.hpp" +#include "platform/platform.hpp" +#include "platform/platform_unix_impl.hpp" +#include "platform/constants.hpp" -#include "../coding/file_reader.hpp" +#include "coding/file_reader.hpp" #include diff --git a/platform/platform_linux.cpp b/platform/platform_linux.cpp index f99bdb027f..52af71453b 100644 --- a/platform/platform_linux.cpp +++ b/platform/platform_linux.cpp @@ -1,7 +1,7 @@ -#include "platform.hpp" +#include "platform/platform.hpp" -#include "../base/logging.hpp" -#include "../coding/file_reader.hpp" +#include "base/logging.hpp" +#include "coding/file_reader.hpp" #include #include diff --git a/platform/platform_mac.mm b/platform/platform_mac.mm index 78c9bd3197..6c415f08d2 100644 --- a/platform/platform_mac.mm +++ b/platform/platform_mac.mm @@ -1,8 +1,8 @@ -#include "platform.hpp" +#include "platform/platform.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/target_os.hpp" +#include "std/target_os.hpp" #include #include diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp index 5e11198333..5d4e185dde 100644 --- a/platform/platform_qt.cpp +++ b/platform/platform_qt.cpp @@ -1,13 +1,13 @@ -#include "platform.hpp" -#include "constants.hpp" +#include "platform/platform.hpp" +#include "platform/constants.hpp" -#include "../coding/file_reader.hpp" +#include "coding/file_reader.hpp" -#include "../base/logging.hpp" -#include "../base/regexp.hpp" +#include "base/logging.hpp" +#include "base/regexp.hpp" -#include "../std/target_os.hpp" -#include "../std/algorithm.hpp" +#include "std/target_os.hpp" +#include "std/algorithm.hpp" #include #include diff --git a/platform/platform_tests/apk_test.cpp b/platform/platform_tests/apk_test.cpp index d0612e7ff7..d44196c20c 100644 --- a/platform/platform_tests/apk_test.cpp +++ b/platform/platform_tests/apk_test.cpp @@ -1,14 +1,14 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../platform.hpp" +#include "platform/platform.hpp" -#include "../../coding/zip_reader.hpp" -#include "../../coding/internal/file_data.hpp" +#include "coding/zip_reader.hpp" +#include "coding/internal/file_data.hpp" -#include "../../base/thread.hpp" -#include "../../base/logging.hpp" +#include "base/thread.hpp" +#include "base/logging.hpp" -#include "../../std/numeric.hpp" +#include "std/numeric.hpp" namespace diff --git a/platform/platform_tests/downloader_test.cpp b/platform/platform_tests/downloader_test.cpp index 16f7bdf962..6886c44b7c 100644 --- a/platform/platform_tests/downloader_test.cpp +++ b/platform/platform_tests/downloader_test.cpp @@ -1,21 +1,21 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../http_request.hpp" -#include "../chunks_download_strategy.hpp" -#include "../platform.hpp" +#include "platform/http_request.hpp" +#include "platform/chunks_download_strategy.hpp" +#include "platform/platform.hpp" -#include "../../defines.hpp" +#include "defines.hpp" -#include "../../coding/sha2.hpp" -#include "../../coding/file_reader.hpp" -#include "../../coding/file_writer.hpp" -#include "../../coding/internal/file_data.hpp" +#include "coding/sha2.hpp" +#include "coding/file_reader.hpp" +#include "coding/file_writer.hpp" +#include "coding/internal/file_data.hpp" -#include "../../base/logging.hpp" -#include "../../base/std_serialization.hpp" +#include "base/logging.hpp" +#include "base/std_serialization.hpp" -#include "../../std/bind.hpp" -#include "../../std/unique_ptr.hpp" +#include "std/bind.hpp" +#include "std/unique_ptr.hpp" #include diff --git a/platform/platform_tests/jansson_test.cpp b/platform/platform_tests/jansson_test.cpp index b81dc8b249..5af6d4f965 100644 --- a/platform/platform_tests/jansson_test.cpp +++ b/platform/platform_tests/jansson_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../../3party/jansson/myjansson.hpp" +#include "3party/jansson/myjansson.hpp" UNIT_TEST(Jansson_Smoke) { diff --git a/platform/platform_tests/language_test.cpp b/platform/platform_tests/language_test.cpp index 9040cb296e..8697f2f8f4 100644 --- a/platform/platform_tests/language_test.cpp +++ b/platform/platform_tests/language_test.cpp @@ -1,8 +1,8 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../preferred_languages.hpp" +#include "platform/preferred_languages.hpp" -#include "../../std/string.hpp" +#include "std/string.hpp" UNIT_TEST(LangNormalize_Smoke) diff --git a/platform/platform_tests/location_test.cpp b/platform/platform_tests/location_test.cpp index 3c79dba77c..13db41e70b 100644 --- a/platform/platform_tests/location_test.cpp +++ b/platform/platform_tests/location_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../location.hpp" +#include "platform/location.hpp" UNIT_TEST(IsLatValid) diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index e25b8baaaf..4cd82f1cf8 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -1,13 +1,13 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../platform.hpp" +#include "platform/platform.hpp" -#include "../../defines.hpp" +#include "defines.hpp" -#include "../../coding/file_writer.hpp" -#include "../../coding/internal/file_data.hpp" +#include "coding/file_writer.hpp" +#include "coding/internal/file_data.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" char const * TEST_FILE_NAME = "some_temporary_unit_test_file.tmp"; diff --git a/platform/platform_tests/video_timer_test.cpp b/platform/platform_tests/video_timer_test.cpp index 04c3797c50..f004917798 100644 --- a/platform/platform_tests/video_timer_test.cpp +++ b/platform/platform_tests/video_timer_test.cpp @@ -1,11 +1,11 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../video_timer.hpp" +#include "platform/video_timer.hpp" -#include "../../base/thread.hpp" -#include "../../base/logging.hpp" +#include "base/thread.hpp" +#include "base/logging.hpp" -#include "../../std/bind.hpp" +#include "std/bind.hpp" void incrementValue(int & i) diff --git a/platform/platform_tizen.cpp b/platform/platform_tizen.cpp index f474681476..57e18b4ef8 100644 --- a/platform/platform_tizen.cpp +++ b/platform/platform_tizen.cpp @@ -9,12 +9,12 @@ #include #include -#include "../coding/file_reader.hpp" +#include "coding/file_reader.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" #include -#include "../../tizen/inc/FIo.hpp" +#include "tizen/inc/FIo.hpp" Platform::Platform() diff --git a/platform/platform_unix_impl.cpp b/platform/platform_unix_impl.cpp index 4ca1c81c47..fbb17cfe0d 100644 --- a/platform/platform_unix_impl.cpp +++ b/platform/platform_unix_impl.cpp @@ -1,12 +1,12 @@ -#include "platform.hpp" -#include "platform_unix_impl.hpp" +#include "platform/platform.hpp" +#include "platform/platform_unix_impl.hpp" -#include "../base/logging.hpp" -#include "../base/regexp.hpp" +#include "base/logging.hpp" +#include "base/regexp.hpp" #include #include -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" #if defined(OMIM_OS_MAC) || defined(OMIM_OS_IPHONE) #include diff --git a/platform/platform_unix_impl.hpp b/platform/platform_unix_impl.hpp index efca59f8cb..94177e105b 100644 --- a/platform/platform_unix_impl.hpp +++ b/platform/platform_unix_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/string.hpp" -#include "../std/vector.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" namespace pl { diff --git a/platform/platform_win.cpp b/platform/platform_win.cpp index 271a5f1a07..1025f80e20 100644 --- a/platform/platform_win.cpp +++ b/platform/platform_win.cpp @@ -1,12 +1,12 @@ -#include "platform.hpp" +#include "platform/platform.hpp" -#include "../base/scope_guard.hpp" -#include "../base/logging.hpp" +#include "base/scope_guard.hpp" +#include "base/logging.hpp" -#include "../coding/file_writer.hpp" +#include "coding/file_writer.hpp" -#include "../std/windows.hpp" -#include "../std/bind.hpp" +#include "std/windows.hpp" +#include "std/bind.hpp" #include diff --git a/platform/preferred_languages.cpp b/platform/preferred_languages.cpp index 30684341a1..c931a98cc9 100644 --- a/platform/preferred_languages.cpp +++ b/platform/preferred_languages.cpp @@ -1,11 +1,11 @@ -#include "preferred_languages.hpp" +#include "platform/preferred_languages.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" -#include "../base/macros.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" +#include "base/macros.hpp" -#include "../std/target_os.hpp" -#include "../std/set.hpp" +#include "std/target_os.hpp" +#include "std/set.hpp" #if defined(OMIM_OS_MAC) || defined(OMIM_OS_IPHONE) #include diff --git a/platform/preferred_languages.hpp b/platform/preferred_languages.hpp index 01582c9571..557febe048 100644 --- a/platform/preferred_languages.hpp +++ b/platform/preferred_languages.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" namespace languages { diff --git a/platform/pthread_video_timer.cpp b/platform/pthread_video_timer.cpp index 1a321d7f1a..5777519a59 100644 --- a/platform/pthread_video_timer.cpp +++ b/platform/pthread_video_timer.cpp @@ -1,10 +1,10 @@ -#include "../std/target_os.hpp" +#include "std/target_os.hpp" #ifndef OMIM_OS_WINDOWS_NATIVE -#include "video_timer.hpp" +#include "platform/video_timer.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" #include #include diff --git a/platform/servers_list.cpp b/platform/servers_list.cpp index 2448affac9..ed72ea3937 100644 --- a/platform/servers_list.cpp +++ b/platform/servers_list.cpp @@ -1,12 +1,12 @@ -#include "servers_list.hpp" -#include "http_request.hpp" -#include "settings.hpp" -#include "platform.hpp" +#include "platform/servers_list.hpp" +#include "platform/http_request.hpp" +#include "platform/settings.hpp" +#include "platform/platform.hpp" -#include "../base/logging.hpp" -#include "../base/assert.hpp" +#include "base/logging.hpp" +#include "base/assert.hpp" -#include "../3party/jansson/myjansson.hpp" +#include "3party/jansson/myjansson.hpp" #define SETTINGS_SERVERS_KEY "LastBaseUrls" diff --git a/platform/servers_list.hpp b/platform/servers_list.hpp index a71e364977..65c16d3226 100644 --- a/platform/servers_list.hpp +++ b/platform/servers_list.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/vector.hpp" -#include "../std/string.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" namespace downloader diff --git a/platform/settings.cpp b/platform/settings.cpp index dd77ba23ab..4a50da4264 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -1,21 +1,21 @@ -#include "settings.hpp" +#include "platform/settings.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../coding/reader_streambuf.hpp" -#include "../coding/file_writer.hpp" -#include "../coding/file_reader.hpp" +#include "coding/reader_streambuf.hpp" +#include "coding/file_writer.hpp" +#include "coding/file_reader.hpp" -#include "../geometry/rect2d.hpp" -#include "../geometry/any_rect2d.hpp" +#include "geometry/rect2d.hpp" +#include "geometry/any_rect2d.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../std/sstream.hpp" -#include "../std/iostream.hpp" -#include "../std/cmath.hpp" +#include "std/sstream.hpp" +#include "std/iostream.hpp" +#include "std/cmath.hpp" #define FIRST_LAUNCH_KEY "FirstLaunchOnDate" diff --git a/platform/settings.hpp b/platform/settings.hpp index 39c01aeb89..122075d8ba 100644 --- a/platform/settings.hpp +++ b/platform/settings.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/string.hpp" -#include "../std/map.hpp" +#include "std/string.hpp" +#include "std/map.hpp" namespace Settings { diff --git a/platform/tizen_utils.hpp b/platform/tizen_utils.hpp index a890f63294..51344d0660 100644 --- a/platform/tizen_utils.hpp +++ b/platform/tizen_utils.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/string.hpp" -#include "../std/target_os.hpp" +#include "std/string.hpp" +#include "std/target_os.hpp" #include #ifdef OMIM_OS_TIZEN diff --git a/platform/video_timer.cpp b/platform/video_timer.cpp index 8a2fab5c9d..2a785cd027 100644 --- a/platform/video_timer.cpp +++ b/platform/video_timer.cpp @@ -1,6 +1,6 @@ -#include "video_timer.hpp" +#include "platform/video_timer.hpp" -#include "../std/bind.hpp" +#include "std/bind.hpp" VideoTimer::VideoTimer(TFrameFn fn) : m_frameFn(fn), m_state(EStopped) {} diff --git a/platform/video_timer.hpp b/platform/video_timer.hpp index b91c13736f..715dc84e5c 100644 --- a/platform/video_timer.hpp +++ b/platform/video_timer.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/function.hpp" +#include "std/function.hpp" /// Timer, synchronized to Vertical Sync class VideoTimer diff --git a/platform/wifi_info.hpp b/platform/wifi_info.hpp index f7e7992fdb..21aa042526 100644 --- a/platform/wifi_info.hpp +++ b/platform/wifi_info.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../std/function.hpp" +#include "std/function.hpp" -#include "../std/vector.hpp" -#include "../std/string.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" class WiFiInfo { diff --git a/platform/wifi_info_windows.cpp b/platform/wifi_info_windows.cpp index 7ba77cf9b4..027d95a136 100644 --- a/platform/wifi_info_windows.cpp +++ b/platform/wifi_info_windows.cpp @@ -1,13 +1,13 @@ -#include "../std/target_os.hpp" +#include "std/target_os.hpp" #ifdef OMIM_OS_WINDOWS -#include "wifi_info.hpp" +#include "platform/wifi_info.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/windows.hpp" -#include "../std/cstdio.hpp" +#include "std/windows.hpp" +#include "std/cstdio.hpp" #include #include diff --git a/platform/wifi_location_service.cpp b/platform/wifi_location_service.cpp index 1989eb9d7e..466d214546 100644 --- a/platform/wifi_location_service.cpp +++ b/platform/wifi_location_service.cpp @@ -1,13 +1,13 @@ -#include "location_service.hpp" -#include "wifi_info.hpp" -#include "http_request.hpp" +#include "platform/location_service.hpp" +#include "platform/wifi_info.hpp" +#include "platform/http_request.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/bind.hpp" -#include "../std/ctime.hpp" +#include "std/bind.hpp" +#include "std/ctime.hpp" -#include "../3party/jansson/myjansson.hpp" +#include "3party/jansson/myjansson.hpp" #define MWM_GEOLOCATION_SERVER "http://geolocation.server/" -- cgit v1.2.3