Android: Convert SkylanderPair to Kotlin

2 files changed, 15 insertions, 54 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.java
deleted file mode 100644
index e4fca37afd..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.features.skylanders.model;
-
-import androidx.annotation.Nullable;
-
-public class SkylanderPair
-{
-  private int mId;
-  private int mVar;
-
-  public SkylanderPair(int id, int var)
-  {
-    mId = id;
-    mVar = var;
-  }
-
-  public int getId()
-  {
-    return mId;
-  }
-
-  public void setId(int mId)
-  {
-    this.mId = mId;
-  }
-
-  public int getVar()
-  {
-    return mVar;
-  }
-
-  public void setVar(int mVar)
-  {
-    this.mVar = mVar;
-  }
-
-  @Override public int hashCode()
-  {
-    return (mId << 16) + mVar;
-  }
-
-  @Override public boolean equals(@Nullable Object obj)
-  {
-    if (!(obj instanceof SkylanderPair))
-      return false;
-    SkylanderPair pairObj = (SkylanderPair) obj;
-    if (pairObj.getId() != mId)
-      return false;
-    if (pairObj.getVar() != mVar)
-      return false;
-    return true;
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.kt
new file mode 100644
index 0000000000..6b20567bbb
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/skylanders/model/SkylanderPair.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.features.skylanders.model
+
+class SkylanderPair(var id: Int, var variant: Int) {
+    override fun hashCode(): Int {
+        return (id shl 16) + variant
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other !is SkylanderPair) return false
+        if (other.id != id) return false
+        return other.variant == variant
+    }
+}