Просмотр исходного кода

common,configure_system: Rename method to GetCategory

Fixes essentially a shadowing issue.
lat9nq 3 лет назад
Родитель
Сommit
1e093767a8

+ 1 - 1
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;
 }
 

+ 4 - 4
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

+ 2 - 2
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)

+ 1 - 1
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;