summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-03-01 17:14:52 -0500
committerCharles Lombardo <clombardo169@gmail.com>2023-03-01 17:32:07 -0500
commit36f1315513e9e12f81dc219882c3b15bc421797f (patch)
tree6571cb1325244c31dfb0457806fb9013afceceac /Source/Android/app/src/main/java
parentbbc1951afbc3f6be875a1ab8fcccd246207a3740 (diff)
Android: Convert SkylanderSlot to Kotlin
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.java42
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.kt7
2 files changed, 7 insertions, 42 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.java
deleted file mode 100644
index 857c077106..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.features.skylanders.ui;
-
-public class SkylanderSlot
-{
- private String mLabel;
- private final int mSlotNum;
- private int mPortalSlot;
-
- public SkylanderSlot(String label, int slot)
- {
- mLabel = label;
- mSlotNum = slot;
- mPortalSlot = -1;
- }
-
- public String getLabel()
- {
- return mLabel;
- }
-
- public void setLabel(String label)
- {
- mLabel = label;
- }
-
- public int getSlotNum()
- {
- return mSlotNum;
- }
-
- public int getPortalSlot()
- {
- return mPortalSlot;
- }
-
- public void setPortalSlot(int mPortalSlot)
- {
- this.mPortalSlot = mPortalSlot;
- }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.kt
new file mode 100644
index 0000000000..968ecd082e
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.kt
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders.ui
+
+class SkylanderSlot(var label: String, val slotNum: Int) {
+ var portalSlot: Int = -1
+}