From 99dd32d0cf28beb7b2c0f674fb0a56d6dc1a26bc Mon Sep 17 00:00:00 2001 From: crueter Date: Sun, 23 Nov 2025 19:20:25 -0500 Subject: [PATCH] STOP USING STATIC_CAST Signed-off-by: crueter --- src/common/settings_setting.h | 2 +- src/frontend_common/config.cpp | 49 ++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h index 1d3aedab81..9af2cebde0 100644 --- a/src/common/settings_setting.h +++ b/src/common/settings_setting.h @@ -129,7 +129,7 @@ protected: } else if constexpr (std::is_floating_point_v) { return fmt::format("{:f}", value_); } else if constexpr (std::is_enum_v) { - return std::to_string(static_cast(value_)); + return std::to_string(u32(value_)); } else { return std::to_string(value_); } diff --git a/src/frontend_common/config.cpp b/src/frontend_common/config.cpp index b18cf6fa4a..35d5411131 100644 --- a/src/frontend_common/config.cpp +++ b/src/frontend_common/config.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -141,9 +144,9 @@ void Config::ReadPlayerValues(const std::size_t player_index) { } if (player_prefix.empty() && Settings::IsConfiguringGlobal()) { - const auto controller = static_cast( + const auto controller = Settings::ControllerType( ReadIntegerSetting(std::string(player_prefix).append("type"), - static_cast(Settings::ControllerType::ProController))); + u8(Settings::ControllerType::ProController))); if (controller == Settings::ControllerType::LeftJoycon || controller == Settings::ControllerType::RightJoycon) { @@ -158,24 +161,24 @@ void Config::ReadPlayerValues(const std::size_t player_index) { player.connected = ReadBooleanSetting(connected_key.append("connected"), std::make_optional(player_index == 0)); - player.controller_type = static_cast( + player.controller_type = Settings::ControllerType( ReadIntegerSetting(std::string(player_prefix).append("type"), - static_cast(Settings::ControllerType::ProController))); + u8(Settings::ControllerType::ProController))); player.vibration_enabled = ReadBooleanSetting( std::string(player_prefix).append("vibration_enabled"), std::make_optional(true)); - player.vibration_strength = static_cast( + player.vibration_strength = int( ReadIntegerSetting(std::string(player_prefix).append("vibration_strength"), 100)); - player.body_color_left = static_cast(ReadIntegerSetting( + player.body_color_left = u32(ReadIntegerSetting( std::string(player_prefix).append("body_color_left"), Settings::JOYCON_BODY_NEON_BLUE)); - player.body_color_right = static_cast(ReadIntegerSetting( + player.body_color_right = u32(ReadIntegerSetting( std::string(player_prefix).append("body_color_right"), Settings::JOYCON_BODY_NEON_RED)); - player.button_color_left = static_cast( + player.button_color_left = u32( ReadIntegerSetting(std::string(player_prefix).append("button_color_left"), Settings::JOYCON_BUTTONS_NEON_BLUE)); - player.button_color_right = static_cast( + player.button_color_right = u32( ReadIntegerSetting(std::string(player_prefix).append("button_color_right"), Settings::JOYCON_BUTTONS_NEON_RED)); } @@ -185,11 +188,11 @@ void Config::ReadTouchscreenValues() { Settings::values.touchscreen.enabled = ReadBooleanSetting(std::string("touchscreen_enabled"), std::make_optional(true)); Settings::values.touchscreen.rotation_angle = - static_cast(ReadIntegerSetting(std::string("touchscreen_angle"), 0)); + u32(ReadIntegerSetting(std::string("touchscreen_angle"), 0)); Settings::values.touchscreen.diameter_x = - static_cast(ReadIntegerSetting(std::string("touchscreen_diameter_x"), 90)); + u32(ReadIntegerSetting(std::string("touchscreen_diameter_x"), 90)); Settings::values.touchscreen.diameter_y = - static_cast(ReadIntegerSetting(std::string("touchscreen_diameter_y"), 90)); + u32(ReadIntegerSetting(std::string("touchscreen_diameter_y"), 90)); } void Config::ReadAudioValues() { @@ -446,8 +449,8 @@ void Config::SavePlayerValues(const std::size_t player_index) { } WriteIntegerSetting( - std::string(player_prefix).append("type"), static_cast(player.controller_type), - std::make_optional(static_cast(Settings::ControllerType::ProController))); + std::string(player_prefix).append("type"), u8(player.controller_type), + std::make_optional(u8(Settings::ControllerType::ProController))); if (!player_prefix.empty() || !Settings::IsConfiguringGlobal()) { if (global) { @@ -483,24 +486,24 @@ void Config::SaveTouchscreenValues() { std::make_optional(true)); WriteIntegerSetting(std::string("touchscreen_angle"), touchscreen.rotation_angle, - std::make_optional(static_cast(0))); + std::make_optional(u32(0))); WriteIntegerSetting(std::string("touchscreen_diameter_x"), touchscreen.diameter_x, - std::make_optional(static_cast(90))); + std::make_optional(u32(90))); WriteIntegerSetting(std::string("touchscreen_diameter_y"), touchscreen.diameter_y, - std::make_optional(static_cast(90))); + std::make_optional(u32(90))); } void Config::SaveMotionTouchValues() { BeginArray(std::string("touch_from_button_maps")); for (std::size_t p = 0; p < Settings::values.touch_from_button_maps.size(); ++p) { - SetArrayIndex(static_cast(p)); + SetArrayIndex(int(p)); WriteStringSetting(std::string("name"), Settings::values.touch_from_button_maps[p].name, std::make_optional(std::string("default"))); BeginArray(std::string("entries")); for (std::size_t q = 0; q < Settings::values.touch_from_button_maps[p].buttons.size(); ++q) { - SetArrayIndex(static_cast(q)); + SetArrayIndex(int(q)); WriteStringSetting(std::string("bind"), Settings::values.touch_from_button_maps[p].buttons[q]); } @@ -629,10 +632,10 @@ void Config::SaveDisabledAddOnValues() { for (const auto& elem : Settings::values.disabled_addons) { SetArrayIndex(i); WriteIntegerSetting(std::string("title_id"), elem.first, - std::make_optional(static_cast(0))); + std::make_optional(u64(0))); BeginArray(std::string("disabled")); for (std::size_t j = 0; j < elem.second.size(); ++j) { - SetArrayIndex(static_cast(j)); + SetArrayIndex(int(j)); WriteStringSetting(std::string("d"), elem.second[j], std::make_optional(std::string(""))); } @@ -716,10 +719,10 @@ bool Config::ReadBooleanSetting(const std::string& key, const std::optionalGetBoolValue(GetSection().c_str(), std::string(full_key).append("\\default").c_str(), false)) { - return static_cast(default_value.value()); + return bool(default_value.value()); } else { return config->GetBoolValue(GetSection().c_str(), full_key.c_str(), - static_cast(default_value.value())); + bool(default_value.value())); } }