diff options
| author | 2023-01-29 13:54:13 -0700 | |
|---|---|---|
| committer | 2023-01-29 17:49:42 -0700 | |
| commit | d5fc56db4bdebcf4f45e39e9c9d0f40229de8cea (patch) | |
| tree | 4bbcaee76bde35ddc6eff9a1c639866cf278b353 /src/common/settings.h | |
| parent | Merge pull request #9699 from ameerj/texture-pass-desc (diff) | |
| download | yuzu-d5fc56db4bdebcf4f45e39e9c9d0f40229de8cea.tar.gz yuzu-d5fc56db4bdebcf4f45e39e9c9d0f40229de8cea.tar.xz yuzu-d5fc56db4bdebcf4f45e39e9c9d0f40229de8cea.zip | |
Move to Clang Format 15
Depends on https://github.com/yuzu-emu/build-environments/pull/69
clang-15 primary run
Diffstat (limited to 'src/common/settings.h')
| -rw-r--r-- | src/common/settings.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common/settings.h b/src/common/settings.h index 4b4da4da2..64db66f37 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -131,7 +131,8 @@ public: | |||
| 131 | * @param default_val Intial value of the setting, and default value of the setting | 131 | * @param default_val Intial value of the setting, and default value of the setting |
| 132 | * @param name Label for the setting | 132 | * @param name Label for the setting |
| 133 | */ | 133 | */ |
| 134 | explicit Setting(const Type& default_val, const std::string& name) requires(!ranged) | 134 | explicit Setting(const Type& default_val, const std::string& name) |
| 135 | requires(!ranged) | ||
| 135 | : value{default_val}, default_value{default_val}, label{name} {} | 136 | : value{default_val}, default_value{default_val}, label{name} {} |
| 136 | virtual ~Setting() = default; | 137 | virtual ~Setting() = default; |
| 137 | 138 | ||
| @@ -144,7 +145,8 @@ public: | |||
| 144 | * @param name Label for the setting | 145 | * @param name Label for the setting |
| 145 | */ | 146 | */ |
| 146 | explicit Setting(const Type& default_val, const Type& min_val, const Type& max_val, | 147 | explicit Setting(const Type& default_val, const Type& min_val, const Type& max_val, |
| 147 | const std::string& name) requires(ranged) | 148 | const std::string& name) |
| 149 | requires(ranged) | ||
| 148 | : value{default_val}, | 150 | : value{default_val}, |
| 149 | default_value{default_val}, maximum{max_val}, minimum{min_val}, label{name} {} | 151 | default_value{default_val}, maximum{max_val}, minimum{min_val}, label{name} {} |
| 150 | 152 | ||
| @@ -232,7 +234,8 @@ public: | |||
| 232 | * @param default_val Intial value of the setting, and default value of the setting | 234 | * @param default_val Intial value of the setting, and default value of the setting |
| 233 | * @param name Label for the setting | 235 | * @param name Label for the setting |
| 234 | */ | 236 | */ |
| 235 | explicit SwitchableSetting(const Type& default_val, const std::string& name) requires(!ranged) | 237 | explicit SwitchableSetting(const Type& default_val, const std::string& name) |
| 238 | requires(!ranged) | ||
| 236 | : Setting<Type>{default_val, name} {} | 239 | : Setting<Type>{default_val, name} {} |
| 237 | virtual ~SwitchableSetting() = default; | 240 | virtual ~SwitchableSetting() = default; |
| 238 | 241 | ||
| @@ -245,7 +248,8 @@ public: | |||
| 245 | * @param name Label for the setting | 248 | * @param name Label for the setting |
| 246 | */ | 249 | */ |
| 247 | explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val, | 250 | explicit SwitchableSetting(const Type& default_val, const Type& min_val, const Type& max_val, |
| 248 | const std::string& name) requires(ranged) | 251 | const std::string& name) |
| 252 | requires(ranged) | ||
| 249 | : Setting<Type, true>{default_val, min_val, max_val, name} {} | 253 | : Setting<Type, true>{default_val, min_val, max_val, name} {} |
| 250 | 254 | ||
| 251 | /** | 255 | /** |