diff options
| author |  lat9nq | 2023-07-18 15:42:59 -0400 |
|---|---|---|
| committer | lat9nq | 2023-07-21 10:56:55 -0400 |
| commit | 1e093767a85ee0fdce6f1619e967a6560963dcf3 (patch) | |
| tree | 41908aa9f566a587fedc6053ebda9b5798ecee28 /src/common/settings_setting.h | |
| parent | settings: Cleanup (diff) | |
| download | yuzu-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 'src/common/settings_setting.h')
| -rw-r--r-- | src/common/settings_setting.h | 4 |
1 files changed, 2 insertions, 2 deletions
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) |