From 79fc3ab4e1b891167abea7f3147f59df77975aaa Mon Sep 17 00:00:00 2001 From: ANS-UXI Date: Fri, 3 Mar 2023 04:54:07 +0530 Subject: [PATCH 1/4] Fixes non-portable path to file platform/Platform.hpp Signed-off-by: ANS-UXI --- android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp | 2 +- android/jni/app/organicmaps/Framework.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp b/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp index 748368a633..99f54ef5bb 100644 --- a/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp +++ b/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp @@ -7,7 +7,7 @@ #include "platform/downloader_defines.hpp" #include "platform/http_request.hpp" -#include "platform/platform.hpp" +#include "platform/Platform.hpp" #include "coding/internal/file_data.hpp" #include "coding/reader_streambuf.hpp" diff --git a/android/jni/app/organicmaps/Framework.cpp b/android/jni/app/organicmaps/Framework.cpp index 209e0b1608..2e321235c7 100644 --- a/android/jni/app/organicmaps/Framework.cpp +++ b/android/jni/app/organicmaps/Framework.cpp @@ -40,7 +40,7 @@ #include "platform/location.hpp" #include "platform/measurement_utils.hpp" #include "platform/network_policy.hpp" -#include "platform/platform.hpp" +#include "platform/Platform.hpp" #include "platform/preferred_languages.hpp" #include "platform/settings.hpp" #include "platform/localization.hpp" -- 2.45.3 From f2e9534dfd5d9dd3abf31bdd14e823c28bdb5aac Mon Sep 17 00:00:00 2001 From: ANS-UXI Date: Sat, 11 Mar 2023 05:34:44 +0530 Subject: [PATCH 2/4] Changed platform/Platform.hpp to platform/PlatformNew.hpp Signed-off-by: ANS-UXI Made changes to android/jni/CMakeLists.txt Signed-off-by: ANS-UXI Changed platform/Platform.hpp to platform/PlatformNew.hpp --- android/jni/CMakeLists.txt | 4 ++-- .../jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp | 2 +- android/jni/app/organicmaps/Framework.cpp | 4 ++-- android/jni/app/organicmaps/LocationState.cpp | 2 +- android/jni/app/organicmaps/Map.cpp | 2 +- android/jni/app/organicmaps/MwmApplication.cpp | 2 +- android/jni/app/organicmaps/SearchEngine.cpp | 2 +- android/jni/app/organicmaps/TrafficState.cpp | 2 +- android/jni/app/organicmaps/editor/OpeningHours.cpp | 2 +- android/jni/app/organicmaps/isolines/IsolinesManager.cpp | 2 +- .../jni/app/organicmaps/opengl/androidoglcontextfactory.cpp | 2 +- android/jni/app/organicmaps/platform/HttpThread.cpp | 2 +- android/jni/app/organicmaps/platform/Localization.cpp | 2 +- .../organicmaps/platform/{Platform.cpp => PlatformNew.cpp} | 2 +- .../organicmaps/platform/{Platform.hpp => PlatformNew.hpp} | 0 android/jni/app/organicmaps/platform/SecureStorage.cpp | 2 +- android/jni/app/organicmaps/subway/SubwayManager.cpp | 2 +- .../app/organicmaps/vulkan/android_vulkan_context_factory.cpp | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) rename android/jni/app/organicmaps/platform/{Platform.cpp => PlatformNew.cpp} (99%) rename android/jni/app/organicmaps/platform/{Platform.hpp => PlatformNew.hpp} (100%) diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index c76db68887..c02642d573 100644 --- a/android/jni/CMakeLists.txt +++ b/android/jni/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRC app/organicmaps/opengl/androidoglcontextfactory.hpp app/organicmaps/opengl/gl3stub.h app/organicmaps/platform/GuiThread.hpp - app/organicmaps/platform/Platform.hpp + app/organicmaps/platform/PlatformNew.hpp app/organicmaps/util/FeatureIdBuilder.hpp app/organicmaps/vulkan/android_vulkan_context_factory.hpp @@ -51,7 +51,7 @@ set(SRC app/organicmaps/platform/HttpThread.cpp app/organicmaps/platform/Language.cpp app/organicmaps/platform/Localization.cpp - app/organicmaps/platform/Platform.cpp + app/organicmaps/platform/PlatformNew.cpp app/organicmaps/platform/PThreadImpl.cpp app/organicmaps/platform/SecureStorage.cpp app/organicmaps/platform/SocketImpl.cpp diff --git a/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp b/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp index 99f54ef5bb..d5dad03b2f 100644 --- a/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp +++ b/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp @@ -7,7 +7,7 @@ #include "platform/downloader_defines.hpp" #include "platform/http_request.hpp" -#include "platform/Platform.hpp" +#include "/platform/platform.hpp" #include "coding/internal/file_data.hpp" #include "coding/reader_streambuf.hpp" diff --git a/android/jni/app/organicmaps/Framework.cpp b/android/jni/app/organicmaps/Framework.cpp index 2e321235c7..e0cc7d81d6 100644 --- a/android/jni/app/organicmaps/Framework.cpp +++ b/android/jni/app/organicmaps/Framework.cpp @@ -3,7 +3,7 @@ #include "app/organicmaps/core/jni_helper.hpp" #include "app/organicmaps/UserMarkHelper.hpp" #include "app/organicmaps/opengl/androidoglcontextfactory.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "app/organicmaps/util/FeatureIdBuilder.hpp" #include "app/organicmaps/util/NetworkPolicy.hpp" #include "app/organicmaps/vulkan/android_vulkan_context_factory.hpp" @@ -40,7 +40,7 @@ #include "platform/location.hpp" #include "platform/measurement_utils.hpp" #include "platform/network_policy.hpp" -#include "platform/Platform.hpp" +#include "platform/platform.hpp" #include "platform/preferred_languages.hpp" #include "platform/settings.hpp" #include "platform/localization.hpp" diff --git a/android/jni/app/organicmaps/LocationState.cpp b/android/jni/app/organicmaps/LocationState.cpp index d48a05e89b..2fe87b4a5b 100644 --- a/android/jni/app/organicmaps/LocationState.cpp +++ b/android/jni/app/organicmaps/LocationState.cpp @@ -3,7 +3,7 @@ #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" extern "C" { diff --git a/android/jni/app/organicmaps/Map.cpp b/android/jni/app/organicmaps/Map.cpp index 616b5dbb5b..5f2fab20de 100644 --- a/android/jni/app/organicmaps/Map.cpp +++ b/android/jni/app/organicmaps/Map.cpp @@ -2,7 +2,7 @@ #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "storage/storage_defines.hpp" diff --git a/android/jni/app/organicmaps/MwmApplication.cpp b/android/jni/app/organicmaps/MwmApplication.cpp index bddbc37af0..19bf1430ec 100644 --- a/android/jni/app/organicmaps/MwmApplication.cpp +++ b/android/jni/app/organicmaps/MwmApplication.cpp @@ -1,7 +1,7 @@ #include "app/organicmaps/Framework.hpp" #include "app/organicmaps/platform/GuiThread.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "app/organicmaps/core/jni_helper.hpp" diff --git a/android/jni/app/organicmaps/SearchEngine.cpp b/android/jni/app/organicmaps/SearchEngine.cpp index 67c5bc7c65..27e9bc64c6 100644 --- a/android/jni/app/organicmaps/SearchEngine.cpp +++ b/android/jni/app/organicmaps/SearchEngine.cpp @@ -1,6 +1,6 @@ #include "app/organicmaps/Framework.hpp" #include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "map/bookmarks_search_params.hpp" #include "map/everywhere_search_params.hpp" diff --git a/android/jni/app/organicmaps/TrafficState.cpp b/android/jni/app/organicmaps/TrafficState.cpp index 94ec80fcfc..76c55d5601 100644 --- a/android/jni/app/organicmaps/TrafficState.cpp +++ b/android/jni/app/organicmaps/TrafficState.cpp @@ -2,7 +2,7 @@ #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" extern "C" { diff --git a/android/jni/app/organicmaps/editor/OpeningHours.cpp b/android/jni/app/organicmaps/editor/OpeningHours.cpp index 6b82e5b065..a95c9e467d 100644 --- a/android/jni/app/organicmaps/editor/OpeningHours.cpp +++ b/android/jni/app/organicmaps/editor/OpeningHours.cpp @@ -1,7 +1,7 @@ #include #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "editor/opening_hours_ui.hpp" diff --git a/android/jni/app/organicmaps/isolines/IsolinesManager.cpp b/android/jni/app/organicmaps/isolines/IsolinesManager.cpp index ee4bebe7c7..4139daa741 100644 --- a/android/jni/app/organicmaps/isolines/IsolinesManager.cpp +++ b/android/jni/app/organicmaps/isolines/IsolinesManager.cpp @@ -1,7 +1,7 @@ #include #include "app/organicmaps/Framework.hpp" #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" using namespace std::placeholders; diff --git a/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp b/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp index 9bb15f2606..5cf40f72eb 100644 --- a/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp +++ b/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp @@ -1,7 +1,7 @@ #include "androidoglcontextfactory.hpp" #include "android_gl_utils.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "base/assert.hpp" #include "base/logging.hpp" diff --git a/android/jni/app/organicmaps/platform/HttpThread.cpp b/android/jni/app/organicmaps/platform/HttpThread.cpp index f065ff3f46..2244494fd6 100644 --- a/android/jni/app/organicmaps/platform/HttpThread.cpp +++ b/android/jni/app/organicmaps/platform/HttpThread.cpp @@ -1,4 +1,4 @@ -#include "Platform.hpp" +#include "PlatformNew.hpp" #include "app/organicmaps/core/jni_helper.hpp" #include "base/logging.hpp" diff --git a/android/jni/app/organicmaps/platform/Localization.cpp b/android/jni/app/organicmaps/platform/Localization.cpp index b0802d28de..2bf77e0436 100644 --- a/android/jni/app/organicmaps/platform/Localization.cpp +++ b/android/jni/app/organicmaps/platform/Localization.cpp @@ -2,7 +2,7 @@ #include "app/organicmaps/core/jni_helper.hpp" #include "app/organicmaps/core/ScopedLocalRef.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "platform/localization.hpp" diff --git a/android/jni/app/organicmaps/platform/Platform.cpp b/android/jni/app/organicmaps/platform/PlatformNew.cpp similarity index 99% rename from android/jni/app/organicmaps/platform/Platform.cpp rename to android/jni/app/organicmaps/platform/PlatformNew.cpp index 5c0529ce57..c8276659a4 100644 --- a/android/jni/app/organicmaps/platform/Platform.cpp +++ b/android/jni/app/organicmaps/platform/PlatformNew.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "app/organicmaps/platform/GuiThread.hpp" #include "app/organicmaps/core/jni_helper.hpp" diff --git a/android/jni/app/organicmaps/platform/Platform.hpp b/android/jni/app/organicmaps/platform/PlatformNew.hpp similarity index 100% rename from android/jni/app/organicmaps/platform/Platform.hpp rename to android/jni/app/organicmaps/platform/PlatformNew.hpp diff --git a/android/jni/app/organicmaps/platform/SecureStorage.cpp b/android/jni/app/organicmaps/platform/SecureStorage.cpp index f066654c90..9547189c56 100644 --- a/android/jni/app/organicmaps/platform/SecureStorage.cpp +++ b/android/jni/app/organicmaps/platform/SecureStorage.cpp @@ -1,6 +1,6 @@ #include "platform/secure_storage.hpp" -#include "Platform.hpp" +#include "PlatformNew.hpp" namespace platform { diff --git a/android/jni/app/organicmaps/subway/SubwayManager.cpp b/android/jni/app/organicmaps/subway/SubwayManager.cpp index c495bf572f..06bc03ec0b 100644 --- a/android/jni/app/organicmaps/subway/SubwayManager.cpp +++ b/android/jni/app/organicmaps/subway/SubwayManager.cpp @@ -1,7 +1,7 @@ #include #include #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" extern "C" { diff --git a/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp b/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp index 4c49071cab..f6ea91258e 100644 --- a/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp +++ b/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp @@ -1,6 +1,6 @@ #include "android_vulkan_context_factory.hpp" -#include "app/organicmaps/platform/Platform.hpp" +#include "app/organicmaps/platform/PlatformNew.hpp" #include "drape/drape_diagnostics.hpp" #include "drape/support_manager.hpp" -- 2.45.3 From b4d29faa8ddb9c11bfb2d52a825145d77fc55803 Mon Sep 17 00:00:00 2001 From: ANS-UXI Date: Sat, 11 Mar 2023 14:00:47 +0530 Subject: [PATCH 3/4] Fixed a typo Signed-off-by: ANS-UXI --- android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp b/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp index d5dad03b2f..748368a633 100644 --- a/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp +++ b/android/jni/app/organicmaps/DownloadResourcesLegacyActivity.cpp @@ -7,7 +7,7 @@ #include "platform/downloader_defines.hpp" #include "platform/http_request.hpp" -#include "/platform/platform.hpp" +#include "platform/platform.hpp" #include "coding/internal/file_data.hpp" #include "coding/reader_streambuf.hpp" -- 2.45.3 From a12fc652bb4bca539fbe8e32d70be8ff3f955d6e Mon Sep 17 00:00:00 2001 From: ANS-UXI Date: Sat, 11 Mar 2023 23:44:20 +0530 Subject: [PATCH 4/4] Renamed to AndroidPlatform Signed-off-by: ANS-UXI --- android/jni/CMakeLists.txt | 4 ++-- android/jni/app/organicmaps/Framework.cpp | 2 +- android/jni/app/organicmaps/LocationState.cpp | 2 +- android/jni/app/organicmaps/Map.cpp | 2 +- android/jni/app/organicmaps/MwmApplication.cpp | 2 +- android/jni/app/organicmaps/SearchEngine.cpp | 2 +- android/jni/app/organicmaps/TrafficState.cpp | 2 +- android/jni/app/organicmaps/editor/OpeningHours.cpp | 2 +- android/jni/app/organicmaps/isolines/IsolinesManager.cpp | 2 +- .../jni/app/organicmaps/opengl/androidoglcontextfactory.cpp | 2 +- .../platform/{PlatformNew.cpp => AndroidPlatform.cpp} | 2 +- .../platform/{PlatformNew.hpp => AndroidPlatform.hpp} | 0 android/jni/app/organicmaps/platform/HttpThread.cpp | 2 +- android/jni/app/organicmaps/platform/Localization.cpp | 2 +- android/jni/app/organicmaps/platform/SecureStorage.cpp | 2 +- android/jni/app/organicmaps/subway/SubwayManager.cpp | 2 +- .../app/organicmaps/vulkan/android_vulkan_context_factory.cpp | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) rename android/jni/app/organicmaps/platform/{PlatformNew.cpp => AndroidPlatform.cpp} (99%) rename android/jni/app/organicmaps/platform/{PlatformNew.hpp => AndroidPlatform.hpp} (100%) diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index c02642d573..1e77a0b2ed 100644 --- a/android/jni/CMakeLists.txt +++ b/android/jni/CMakeLists.txt @@ -15,7 +15,7 @@ set(SRC app/organicmaps/opengl/androidoglcontextfactory.hpp app/organicmaps/opengl/gl3stub.h app/organicmaps/platform/GuiThread.hpp - app/organicmaps/platform/PlatformNew.hpp + app/organicmaps/platform/AndroidPlatform.hpp app/organicmaps/util/FeatureIdBuilder.hpp app/organicmaps/vulkan/android_vulkan_context_factory.hpp @@ -51,7 +51,7 @@ set(SRC app/organicmaps/platform/HttpThread.cpp app/organicmaps/platform/Language.cpp app/organicmaps/platform/Localization.cpp - app/organicmaps/platform/PlatformNew.cpp + app/organicmaps/platform/AndroidPlatform.cpp app/organicmaps/platform/PThreadImpl.cpp app/organicmaps/platform/SecureStorage.cpp app/organicmaps/platform/SocketImpl.cpp diff --git a/android/jni/app/organicmaps/Framework.cpp b/android/jni/app/organicmaps/Framework.cpp index e0cc7d81d6..14a03af25f 100644 --- a/android/jni/app/organicmaps/Framework.cpp +++ b/android/jni/app/organicmaps/Framework.cpp @@ -3,7 +3,7 @@ #include "app/organicmaps/core/jni_helper.hpp" #include "app/organicmaps/UserMarkHelper.hpp" #include "app/organicmaps/opengl/androidoglcontextfactory.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "app/organicmaps/util/FeatureIdBuilder.hpp" #include "app/organicmaps/util/NetworkPolicy.hpp" #include "app/organicmaps/vulkan/android_vulkan_context_factory.hpp" diff --git a/android/jni/app/organicmaps/LocationState.cpp b/android/jni/app/organicmaps/LocationState.cpp index 2fe87b4a5b..ed90657237 100644 --- a/android/jni/app/organicmaps/LocationState.cpp +++ b/android/jni/app/organicmaps/LocationState.cpp @@ -3,7 +3,7 @@ #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" extern "C" { diff --git a/android/jni/app/organicmaps/Map.cpp b/android/jni/app/organicmaps/Map.cpp index 5f2fab20de..3abecdeb12 100644 --- a/android/jni/app/organicmaps/Map.cpp +++ b/android/jni/app/organicmaps/Map.cpp @@ -2,7 +2,7 @@ #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "storage/storage_defines.hpp" diff --git a/android/jni/app/organicmaps/MwmApplication.cpp b/android/jni/app/organicmaps/MwmApplication.cpp index 19bf1430ec..3643c5f5cf 100644 --- a/android/jni/app/organicmaps/MwmApplication.cpp +++ b/android/jni/app/organicmaps/MwmApplication.cpp @@ -1,7 +1,7 @@ #include "app/organicmaps/Framework.hpp" #include "app/organicmaps/platform/GuiThread.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "app/organicmaps/core/jni_helper.hpp" diff --git a/android/jni/app/organicmaps/SearchEngine.cpp b/android/jni/app/organicmaps/SearchEngine.cpp index 27e9bc64c6..1096a39e59 100644 --- a/android/jni/app/organicmaps/SearchEngine.cpp +++ b/android/jni/app/organicmaps/SearchEngine.cpp @@ -1,6 +1,6 @@ #include "app/organicmaps/Framework.hpp" #include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "map/bookmarks_search_params.hpp" #include "map/everywhere_search_params.hpp" diff --git a/android/jni/app/organicmaps/TrafficState.cpp b/android/jni/app/organicmaps/TrafficState.cpp index 76c55d5601..8f70c81419 100644 --- a/android/jni/app/organicmaps/TrafficState.cpp +++ b/android/jni/app/organicmaps/TrafficState.cpp @@ -2,7 +2,7 @@ #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" extern "C" { diff --git a/android/jni/app/organicmaps/editor/OpeningHours.cpp b/android/jni/app/organicmaps/editor/OpeningHours.cpp index a95c9e467d..80d6453998 100644 --- a/android/jni/app/organicmaps/editor/OpeningHours.cpp +++ b/android/jni/app/organicmaps/editor/OpeningHours.cpp @@ -1,7 +1,7 @@ #include #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "editor/opening_hours_ui.hpp" diff --git a/android/jni/app/organicmaps/isolines/IsolinesManager.cpp b/android/jni/app/organicmaps/isolines/IsolinesManager.cpp index 4139daa741..a55179922f 100644 --- a/android/jni/app/organicmaps/isolines/IsolinesManager.cpp +++ b/android/jni/app/organicmaps/isolines/IsolinesManager.cpp @@ -1,7 +1,7 @@ #include #include "app/organicmaps/Framework.hpp" #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" using namespace std::placeholders; diff --git a/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp b/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp index 5cf40f72eb..00f576dbe9 100644 --- a/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp +++ b/android/jni/app/organicmaps/opengl/androidoglcontextfactory.cpp @@ -1,7 +1,7 @@ #include "androidoglcontextfactory.hpp" #include "android_gl_utils.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "base/assert.hpp" #include "base/logging.hpp" diff --git a/android/jni/app/organicmaps/platform/PlatformNew.cpp b/android/jni/app/organicmaps/platform/AndroidPlatform.cpp similarity index 99% rename from android/jni/app/organicmaps/platform/PlatformNew.cpp rename to android/jni/app/organicmaps/platform/AndroidPlatform.cpp index c8276659a4..da83303253 100644 --- a/android/jni/app/organicmaps/platform/PlatformNew.cpp +++ b/android/jni/app/organicmaps/platform/AndroidPlatform.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "app/organicmaps/platform/GuiThread.hpp" #include "app/organicmaps/core/jni_helper.hpp" diff --git a/android/jni/app/organicmaps/platform/PlatformNew.hpp b/android/jni/app/organicmaps/platform/AndroidPlatform.hpp similarity index 100% rename from android/jni/app/organicmaps/platform/PlatformNew.hpp rename to android/jni/app/organicmaps/platform/AndroidPlatform.hpp diff --git a/android/jni/app/organicmaps/platform/HttpThread.cpp b/android/jni/app/organicmaps/platform/HttpThread.cpp index 2244494fd6..5069493451 100644 --- a/android/jni/app/organicmaps/platform/HttpThread.cpp +++ b/android/jni/app/organicmaps/platform/HttpThread.cpp @@ -1,4 +1,4 @@ -#include "PlatformNew.hpp" +#include "AndroidPlatform.hpp" #include "app/organicmaps/core/jni_helper.hpp" #include "base/logging.hpp" diff --git a/android/jni/app/organicmaps/platform/Localization.cpp b/android/jni/app/organicmaps/platform/Localization.cpp index 2bf77e0436..cc32e532ad 100644 --- a/android/jni/app/organicmaps/platform/Localization.cpp +++ b/android/jni/app/organicmaps/platform/Localization.cpp @@ -2,7 +2,7 @@ #include "app/organicmaps/core/jni_helper.hpp" #include "app/organicmaps/core/ScopedLocalRef.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "platform/localization.hpp" diff --git a/android/jni/app/organicmaps/platform/SecureStorage.cpp b/android/jni/app/organicmaps/platform/SecureStorage.cpp index 9547189c56..5e189c7223 100644 --- a/android/jni/app/organicmaps/platform/SecureStorage.cpp +++ b/android/jni/app/organicmaps/platform/SecureStorage.cpp @@ -1,6 +1,6 @@ #include "platform/secure_storage.hpp" -#include "PlatformNew.hpp" +#include "AndroidPlatform.hpp" namespace platform { diff --git a/android/jni/app/organicmaps/subway/SubwayManager.cpp b/android/jni/app/organicmaps/subway/SubwayManager.cpp index 06bc03ec0b..b217fa20c2 100644 --- a/android/jni/app/organicmaps/subway/SubwayManager.cpp +++ b/android/jni/app/organicmaps/subway/SubwayManager.cpp @@ -1,7 +1,7 @@ #include #include #include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" extern "C" { diff --git a/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp b/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp index f6ea91258e..7282ad3c3a 100644 --- a/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp +++ b/android/jni/app/organicmaps/vulkan/android_vulkan_context_factory.cpp @@ -1,6 +1,6 @@ #include "android_vulkan_context_factory.hpp" -#include "app/organicmaps/platform/PlatformNew.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "drape/drape_diagnostics.hpp" #include "drape/support_manager.hpp" -- 2.45.3