From 36f1315513e9e12f81dc219882c3b15bc421797f Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 1 Mar 2023 17:14:52 -0500 Subject: [PATCH] Android: Convert SkylanderSlot to Kotlin --- .../features/skylanders/ui/SkylanderSlot.java | 42 ------------------- .../features/skylanders/ui/SkylanderSlot.kt | 7 ++++ 2 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.java create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/ui/SkylanderSlot.kt 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 +}