summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2023-07-18 15:42:59 -0400
committerGravatar lat9nq2023-07-21 10:56:55 -0400
commit1e093767a85ee0fdce6f1619e967a6560963dcf3 (patch)
tree41908aa9f566a587fedc6053ebda9b5798ecee28
parentsettings: Cleanup (diff)
downloadyuzu-1e093767a85ee0fdce6f1619e967a6560963dcf3.tar.gz
yuzu-1e093767a85ee0fdce6f1619e967a6560963dcf3.tar.xz
yuzu-1e093767a85ee0fdce6f1619e967a6560963dcf3.zip
common,configure_system: Rename method to GetCategory
Fixes essentially a shadowing issue.
Diffstat (limited to '')
-rw-r--r--src/common/settings_common.cpp2
-rw-r--r--src/common/settings_common.h8
-rw-r--r--src/common/settings_setting.h4
-rw-r--r--src/yuzu/configuration/configure_system.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp
index 799942980..8b666f8b2 100644
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@@ -36,7 +36,7 @@ bool BasicSetting::RuntimeModfiable() const {
36 return runtime_modifiable; 36 return runtime_modifiable;
37} 37}
38 38
39Category BasicSetting::Category() const { 39Category BasicSetting::GetCategory() const {
40 return category; 40 return category;
41} 41}
42 42
diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index b355384a4..ca218e37b 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -196,7 +196,7 @@ public:
196 * 196 *
197 * @returns The setting's category 197 * @returns The setting's category
198 */ 198 */
199 [[nodiscard]] enum Category Category() const; 199 [[nodiscard]] Category GetCategory() const;
200 200
201 /** 201 /**
202 * @returns Extra metadata for data representation in frontend implementations. 202 * @returns Extra metadata for data representation in frontend implementations.
@@ -246,9 +246,9 @@ public:
246 [[nodiscard]] virtual bool UsingGlobal() const; 246 [[nodiscard]] virtual bool UsingGlobal() const;
247 247
248private: 248private:
249 const std::string label; ///< The setting's label 249 const std::string label; ///< The setting's label
250 const enum Category category; ///< The setting's category AKA INI group 250 const Category category; ///< The setting's category AKA INI group
251 const u32 id; ///< Unique integer for the setting 251 const u32 id; ///< Unique integer for the setting
252 const bool save; ///< Suggests if the setting should be saved and read to a frontend config 252 const bool save; ///< Suggests if the setting should be saved and read to a frontend config
253 const bool 253 const bool
254 runtime_modifiable; ///< Suggests if the setting can be modified while a guest is running 254 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 959b4f3f9..55280fec4 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -40,7 +40,7 @@ public:
40 * @param other_setting_ A second Setting to associate to this one in metadata 40 * @param other_setting_ A second Setting to associate to this one in metadata
41 */ 41 */
42 explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name, 42 explicit Setting(Linkage& linkage, const Type& default_val, const std::string& name,
43 enum Category category_, u32 specialization_ = Specialization::Default, 43 Category category_, u32 specialization_ = Specialization::Default,
44 bool save_ = true, bool runtime_modifiable_ = false, 44 bool save_ = true, bool runtime_modifiable_ = false,
45 BasicSetting* other_setting_ = nullptr) 45 BasicSetting* other_setting_ = nullptr)
46 requires(!ranged) 46 requires(!ranged)
@@ -64,7 +64,7 @@ public:
64 * @param other_setting_ A second Setting to associate to this one in metadata 64 * @param other_setting_ A second Setting to associate to this one in metadata
65 */ 65 */
66 explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val, 66 explicit Setting(Linkage& linkage, const Type& default_val, const Type& min_val,
67 const Type& max_val, const std::string& name, enum Category category_, 67 const Type& max_val, const std::string& name, Category category_,
68 u32 specialization_ = Specialization::Default, bool save_ = true, 68 u32 specialization_ = Specialization::Default, bool save_ = true,
69 bool runtime_modifiable_ = false, BasicSetting* other_setting_ = nullptr) 69 bool runtime_modifiable_ = false, BasicSetting* other_setting_ = nullptr)
70 requires(ranged) 70 requires(ranged)
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 05706c4de..d76630bcb 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) {
124 combo_language = widget->combobox; 124 combo_language = widget->combobox;
125 } 125 }
126 126
127 switch (setting->Category()) { 127 switch (setting->GetCategory()) {
128 case Settings::Category::Core: 128 case Settings::Category::Core:
129 core_hold.emplace(setting->Id(), widget); 129 core_hold.emplace(setting->Id(), widget);
130 break; 130 break;