From 1e093767a85ee0fdce6f1619e967a6560963dcf3 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:42:59 -0400
Subject: [PATCH] common,configure_system: Rename method to GetCategory
Fixes essentially a shadowing issue.
---
src/common/settings_common.cpp | 2 +-
src/common/settings_common.h | 8 ++++----
src/common/settings_setting.h | 4 ++--
src/yuzu/configuration/configure_system.cpp | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 7999429808..8b666f8b28 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -36,7 +36,7 @@ bool BasicSetting::RuntimeModfiable() const {
return runtime_modifiable;
}
-Category BasicSetting::Category() const {
+Category BasicSetting::GetCategory() const {
return category;
}
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index b355384a49..ca218e37b8 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -196,7 +196,7 @@ public:
*
* @returns The setting's category
*/
- [[nodiscard]] enum Category Category() const;
+ [[nodiscard]] Category GetCategory() const;
/**
* @returns Extra metadata for data representation in frontend implementations.
@@ -246,9 +246,9 @@ public:
[[nodiscard]] virtual bool UsingGlobal() const;
private:
- const std::string label; ///< The setting's label
- const enum Category category; ///< The setting's category AKA INI group
- const u32 id; ///< Unique integer for the setting
+ const std::string label; ///< The setting's label
+ const Category category; ///< The setting's category AKA INI group
+ const u32 id; ///< Unique integer for the setting
const bool save; ///< Suggests if the setting should be saved and read to a frontend config
const bool
runtime_modifiable; ///< Suggests if the setting can be modified while a guest is running
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 959b4f3f9e..55280fec4f 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -40,7 +40,7 @@ public:
* @param other_setting_ A second Setting to associate to this one in metadata
*/
explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
- enum Category category_, u32 specialization_ = Specialization::Default,
+ Category category_, u32 specialization_ = Specialization::Default,
bool save_ = true, bool runtime_modifiable_ = false,
BasicSetting* other_setting_ = nullptr)
requires(!ranged)
@@ -64,7 +64,7 @@ public:
* @param other_setting_ A second Setting to associate to this one in metadata
*/
explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
- const Type& max_val, const std::string& name, enum Category category_,
+ const Type& max_val, const std::string& name, Category category_,
u32 specialization_ = Specialization::Default, bool save_ = true,
bool runtime_modifiable_ = false, BasicSetting* other_setting_ = nullptr)
requires(ranged)
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 05706c4de0..d76630bcba 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -124,7 +124,7 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) {
combo_language = widget->combobox;
}
- switch (setting->Category()) {
+ switch (setting->GetCategory()) {
case Settings::Category::Core:
core_hold.emplace(setting->Id(), widget);
break;
--
GitLab