Merge pull request #11919 from t895/kotlin-controls

Android: Convert "features.input" package to Kotlin

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/Android/jni/AndroidCommon/IDCache.cpp b/Source/Android/jni/AndroidCommon/IDCache.cpp
index f83707cebe..968d1b7e82 100644
--- a/Source/Android/jni/AndroidCommon/IDCache.cpp
+++ b/Source/Android/jni/AndroidCommon/IDCache.cpp
@@ -703,21 +703,21 @@ 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<jclass>(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, "<init>", "(J)V");
   env->DeleteLocalRef(control_class);
 
   const jclass control_group_class =
       env->FindClass("org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroup");
   s_control_group_class = reinterpret_cast<jclass>(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, "<init>", "(J)V");
   env->DeleteLocalRef(control_group_class);
 
   const jclass control_reference_class = env->FindClass(
       "org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlReference");
   s_control_reference_class = reinterpret_cast<jclass>(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, "<init>", "(J)V");
   env->DeleteLocalRef(control_reference_class);
 
@@ -725,21 +725,21 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
       "org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController");
   s_emulated_controller_class =
       reinterpret_cast<jclass>(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, "<init>", "(J)V");
   env->DeleteLocalRef(emulated_controller_class);
 
   const jclass numeric_setting_class =
       env->FindClass("org/dolphinemu/dolphinemu/features/input/model/controlleremu/NumericSetting");
   s_numeric_setting_class = reinterpret_cast<jclass>(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, "<init>", "(J)V");
   env->DeleteLocalRef(numeric_setting_class);
 
   const jclass core_device_class =
       env->FindClass("org/dolphinemu/dolphinemu/features/input/model/CoreDevice");
   s_core_device_class = reinterpret_cast<jclass>(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, "<init>", "(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<jclass>(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, "<init>",
                        "(Lorg/dolphinemu/dolphinemu/features/input/model/CoreDevice;J)V");