From 6f80f9d5b0f2559508783bbdc239bee27deb2568 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Tue, 7 Mar 2023 17:20:06 -0500 Subject: [PATCH] android: Convert Setting to Kotlin --- .../model/{Setting.java => Setting.kt} | 30 ++++--------------- 1 file changed, 6 insertions(+), 24 deletions(-) rename src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/{Setting.java => Setting.kt} (50%) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Setting.java b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Setting.kt similarity index 50% rename from src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Setting.java rename to src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Setting.kt index 28003078ab..11cd10a1e1 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Setting.java +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Setting.kt @@ -1,4 +1,4 @@ -package org.yuzu.yuzu_emu.features.settings.model; +package org.yuzu.yuzu_emu.features.settings.model /** * Abstraction for a setting item as read from / written to yuzu's configuration ini files. @@ -6,37 +6,19 @@ package org.yuzu.yuzu_emu.features.settings.model; * must be inferred at read-time. The type of value determines which child of this class is used * to represent the Setting. */ -public abstract class Setting { - private String mKey; - private String mSection; - - /** - * Base constructor. - * - * @param key Everything to the left of the = in a line from the ini file. - * @param section The corresponding recent section header; e.g. [Core] or [Enhancements] without the brackets. - */ - public Setting(String key, String section) { - mKey = key; - mSection = section; - } - +abstract class Setting( /** * @return The identifier used to write this setting to the ini file. */ - public String getKey() { - return mKey; - } - + val key: String, /** * @return The name of the header under which this Setting should be written in the ini file. */ - public String getSection() { - return mSection; - } + val section: String +) { /** * @return A representation of this Setting's backing value converted to a String (e.g. for serialization). */ - public abstract String getValueAsString(); + abstract val valueAsString: String }