diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index c76db68887..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/Platform.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/Platform.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 209e0b1608..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/Platform.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 d48a05e89b..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/Platform.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 616b5dbb5b..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/Platform.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 bddbc37af0..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/Platform.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 67c5bc7c65..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/Platform.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 94ec80fcfc..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/Platform.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 6b82e5b065..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/Platform.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 ee4bebe7c7..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/Platform.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 9bb15f2606..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/Platform.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "base/assert.hpp" #include "base/logging.hpp" diff --git a/android/jni/app/organicmaps/platform/Platform.cpp b/android/jni/app/organicmaps/platform/AndroidPlatform.cpp similarity index 99% rename from android/jni/app/organicmaps/platform/Platform.cpp rename to android/jni/app/organicmaps/platform/AndroidPlatform.cpp index 5c0529ce57..da83303253 100644 --- a/android/jni/app/organicmaps/platform/Platform.cpp +++ b/android/jni/app/organicmaps/platform/AndroidPlatform.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/platform/Platform.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/Platform.hpp b/android/jni/app/organicmaps/platform/AndroidPlatform.hpp similarity index 100% rename from android/jni/app/organicmaps/platform/Platform.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 f065ff3f46..5069493451 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 "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 b0802d28de..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/Platform.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 f066654c90..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 "Platform.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 c495bf572f..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/Platform.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 4c49071cab..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/Platform.hpp" +#include "app/organicmaps/platform/AndroidPlatform.hpp" #include "drape/drape_diagnostics.hpp" #include "drape/support_manager.hpp"