From fafbb2199e24340822e7567bb913ed478b3a7949 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 10 Jun 2023 05:05:01 -0400 Subject: Android: Convert Control to Kotlin --- Source/Android/jni/AndroidCommon/IDCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Android/jni/AndroidCommon/IDCache.cpp') diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp index e4cacaa462..5e9a1692d5 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.cpp +++ b/Source/Android/jni/AndroidCommon/IDCache.cpp @@ -703,7 +703,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) const jclass control_class = env->FindClass("org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control"); s_control_class = reinterpret_cast(env->NewGlobalRef(control_class)); - s_control_pointer = env->GetFieldID(control_class, "mPointer", "J"); + s_control_pointer = env->GetFieldID(control_class, "pointer", "J"); s_control_constructor = env->GetMethodID(control_class, "", "(J)V"); env->DeleteLocalRef(control_class); -- cgit v1.2.3 From 7c79ff01002e7743fe47026b30d6131786c2f492 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 10 Jun 2023 05:05:18 -0400 Subject: Android: Convert ControlGroup to Kotlin --- Source/Android/jni/AndroidCommon/IDCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Android/jni/AndroidCommon/IDCache.cpp') diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp index 5e9a1692d5..a9bcf93b9c 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.cpp +++ b/Source/Android/jni/AndroidCommon/IDCache.cpp @@ -710,7 +710,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) const jclass control_group_class = env->FindClass("org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroup"); s_control_group_class = reinterpret_cast(env->NewGlobalRef(control_group_class)); - s_control_group_pointer = env->GetFieldID(control_group_class, "mPointer", "J"); + s_control_group_pointer = env->GetFieldID(control_group_class, "pointer", "J"); s_control_group_constructor = env->GetMethodID(control_group_class, "", "(J)V"); env->DeleteLocalRef(control_group_class); -- cgit v1.2.3 From 4ce069cf4fabdb5ea2b36c027227e9936a07b32d Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 10 Jun 2023 05:05:42 -0400 Subject: Android: Convert ControlReference to Kotlin --- Source/Android/jni/AndroidCommon/IDCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Android/jni/AndroidCommon/IDCache.cpp') diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp index a9bcf93b9c..60c3933dc4 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.cpp +++ b/Source/Android/jni/AndroidCommon/IDCache.cpp @@ -717,7 +717,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) const jclass control_reference_class = env->FindClass( "org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlReference"); s_control_reference_class = reinterpret_cast(env->NewGlobalRef(control_reference_class)); - s_control_reference_pointer = env->GetFieldID(control_reference_class, "mPointer", "J"); + s_control_reference_pointer = env->GetFieldID(control_reference_class, "pointer", "J"); s_control_reference_constructor = env->GetMethodID(control_reference_class, "", "(J)V"); env->DeleteLocalRef(control_reference_class); -- cgit v1.2.3 From 3011c0dc64d3de8bc56b8bb73fb2addae2e6c484 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 10 Jun 2023 05:06:00 -0400 Subject: Android: Convert EmulatedController to Kotlin --- Source/Android/jni/AndroidCommon/IDCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Android/jni/AndroidCommon/IDCache.cpp') diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp index 60c3933dc4..b5c91be10c 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.cpp +++ b/Source/Android/jni/AndroidCommon/IDCache.cpp @@ -725,7 +725,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) "org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController"); s_emulated_controller_class = reinterpret_cast(env->NewGlobalRef(emulated_controller_class)); - s_emulated_controller_pointer = env->GetFieldID(emulated_controller_class, "mPointer", "J"); + s_emulated_controller_pointer = env->GetFieldID(emulated_controller_class, "pointer", "J"); s_emulated_controller_constructor = env->GetMethodID(emulated_controller_class, "", "(J)V"); env->DeleteLocalRef(emulated_controller_class); -- cgit v1.2.3 From 82298dc408b315467ac3e035e158895e64465fa1 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 10 Jun 2023 05:06:17 -0400 Subject: Android: Convert CoreDevice to Kotlin --- Source/Android/jni/AndroidCommon/IDCache.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Android/jni/AndroidCommon/IDCache.cpp') diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp index b5c91be10c..67b6af4d71 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.cpp +++ b/Source/Android/jni/AndroidCommon/IDCache.cpp @@ -739,7 +739,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) const jclass core_device_class = env->FindClass("org/dolphinemu/dolphinemu/features/input/model/CoreDevice"); s_core_device_class = reinterpret_cast(env->NewGlobalRef(core_device_class)); - s_core_device_pointer = env->GetFieldID(core_device_class, "mPointer", "J"); + s_core_device_pointer = env->GetFieldID(core_device_class, "pointer", "J"); s_core_device_constructor = env->GetMethodID(core_device_class, "", "(J)V"); env->DeleteLocalRef(core_device_class); @@ -747,7 +747,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) env->FindClass("org/dolphinemu/dolphinemu/features/input/model/CoreDevice$Control"); s_core_device_control_class = reinterpret_cast(env->NewGlobalRef(core_device_control_class)); - s_core_device_control_pointer = env->GetFieldID(core_device_control_class, "mPointer", "J"); + s_core_device_control_pointer = env->GetFieldID(core_device_control_class, "pointer", "J"); s_core_device_control_constructor = env->GetMethodID(core_device_control_class, "", "(Lorg/dolphinemu/dolphinemu/features/input/model/CoreDevice;J)V"); -- cgit v1.2.3 From 9ac1847cbd08024b2da8e201b2d5c03cc94595c6 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 10 Jun 2023 05:08:08 -0400 Subject: Android: Convert NumericSetting to Kotlin --- Source/Android/jni/AndroidCommon/IDCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Android/jni/AndroidCommon/IDCache.cpp') diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp index 67b6af4d71..2b437c10c0 100644 --- a/Source/Android/jni/AndroidCommon/IDCache.cpp +++ b/Source/Android/jni/AndroidCommon/IDCache.cpp @@ -732,7 +732,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) const jclass numeric_setting_class = env->FindClass("org/dolphinemu/dolphinemu/features/input/model/controlleremu/NumericSetting"); s_numeric_setting_class = reinterpret_cast(env->NewGlobalRef(numeric_setting_class)); - s_numeric_setting_pointer = env->GetFieldID(numeric_setting_class, "mPointer", "J"); + s_numeric_setting_pointer = env->GetFieldID(numeric_setting_class, "pointer", "J"); s_numeric_setting_constructor = env->GetMethodID(numeric_setting_class, "", "(J)V"); env->DeleteLocalRef(numeric_setting_class); -- cgit v1.2.3