diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-03-15 03:23:34 -0400 |
|---|---|---|
| committer | Charles Lombardo <clombardo169@gmail.com> | 2023-03-15 15:49:37 -0400 |
| commit | 32f9e48257bc4c650afb38763645fe77296a4117 (patch) | |
| tree | 5884783ee942dc1673e5f380b619ddfbc6a960b5 /Source/Android/app/src/main/java | |
| parent | baeeaa2a43a7ff8f00acdd81c50cf18baec97e49 (diff) | |
Android: Convert AbstractIntSetting to Kotlin
Diffstat (limited to 'Source/Android/app/src/main/java')
3 files changed, 11 insertions, 15 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.java deleted file mode 100644 index dc868d55d9..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.java +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -package org.dolphinemu.dolphinemu.features.settings.model; - -import androidx.annotation.NonNull; - -public interface AbstractIntSetting extends AbstractSetting -{ - int getInt(); - - void setInt(@NonNull Settings settings, int newValue); -} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.kt new file mode 100644 index 0000000000..f22077dd6a --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AbstractIntSetting.kt @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +package org.dolphinemu.dolphinemu.features.settings.model + +interface AbstractIntSetting : AbstractSetting { + val int: Int + + fun setInt(settings: Settings, newValue: Int) +} diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/ScaledIntSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/ScaledIntSetting.kt index faa551e0ab..4eef9ed6cf 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/ScaledIntSetting.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/ScaledIntSetting.kt @@ -16,9 +16,8 @@ class ScaledIntSetting( return setting.delete(settings) } - override fun getInt(): Int { - return setting.getInt() / scale - } + override val int: Int + get() = setting.int / scale override fun setInt(settings: Settings, newValue: Int) { return setting.setInt(settings, newValue * scale) |