Expand Up @@ -9,8 +9,8 @@ import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter

open class HeaderViewHolder(
private val binding: ListItemHeaderBinding,
adapter: SettingsAdapter?
) : SettingViewHolder(binding.root, adapter!!) {
adapter: SettingsAdapter
) : SettingViewHolder(binding.root, adapter) {
override val item: SettingsItem? = null

init {
Expand Down
Expand Up @@ -14,9 +14,10 @@ import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem
import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter

class RunRunnableViewHolder(
private val mBinding: ListItemSettingBinding, adapter: SettingsAdapter?,
private val mBinding: ListItemSettingBinding,
adapter: SettingsAdapter,
private val mContext: Context
) : SettingViewHolder(mBinding.getRoot(), adapter!!) {
) : SettingViewHolder(mBinding.getRoot(), adapter) {
private lateinit var setting: RunRunnable

override val item: SettingsItem
Expand Down
Expand Up @@ -73,7 +73,7 @@ class SingleChoiceViewHolder(
}

override fun onClick(clicked: View) {
if (!item?.isEditable!!) {
if (!item!!.isEditable) {
showNotRuntimeEditableError()
return
}
Expand Down
Expand Up @@ -14,9 +14,10 @@ import org.dolphinemu.dolphinemu.features.settings.model.view.SliderSetting
import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter

class SliderViewHolder(
private val binding: ListItemSettingBinding, adapter: SettingsAdapter?,
private val binding: ListItemSettingBinding,
adapter: SettingsAdapter,
private val context: Context
) : SettingViewHolder(binding.root, adapter!!) {
) : SettingViewHolder(binding.root, adapter) {
private lateinit var setting: SliderSetting

override val item: SettingsItem
Expand Down