summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-06-10 05:05:01 -0400
committerCharles Lombardo <clombardo169@gmail.com>2023-08-25 13:30:23 -0400
commitfafbb2199e24340822e7567bb913ed478b3a7949 (patch)
tree5f98355e01cad0ff25968bab527a9842640bfa32 /Source/Android/app/src/main/java
parent0454578f45e2c0a2ddc8bc60966103844341161b (diff)
Android: Convert Control to Kotlin
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.kt (renamed from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.java)21
1 files changed, 6 insertions, 15 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.kt
index 6033e17e37..fcc420c740 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/controlleremu/Control.kt
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later
-package org.dolphinemu.dolphinemu.features.input.model.controlleremu;
+package org.dolphinemu.dolphinemu.features.input.model.controlleremu
-import androidx.annotation.Keep;
+import androidx.annotation.Keep
/**
* Represents a C++ ControllerEmu::Control.
@@ -10,18 +10,9 @@ import androidx.annotation.Keep;
* The lifetime of this class is managed by C++ code. Calling methods on it after it's destroyed
* in C++ is undefined behavior!
*/
-public class Control
-{
- @Keep
- private final long mPointer;
+@Keep
+class Control private constructor(private val pointer: Long) {
+ external fun getUiName(): String
- @Keep
- private Control(long pointer)
- {
- mPointer = pointer;
- }
-
- public native String getUiName();
-
- public native ControlReference getControlReference();
+ external fun getControlReference(): ControlReference
}