Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common,yuzu-qt: GCC warning silences

Browse source 
Fixes -Wshadow, -Wdeprecated, and catch by copy rather than by ref.
This commit is contained in:
lat9nq 2023-06-18 03:52:41 -04:00
parent 916c6cd1a0
commit ee32b17782
9 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/settings_common.h
View file

@ -178,7 +178,7 @@ public:
*
* @returns The setting's category
*/
[[nodiscard]] Category Category() const;
[[nodiscard]] enum Category Category() const;
/**
* Returns the label this setting was created with.

14
src/common/settings_setting.h
View file

@ -5,6 +5,7 @@
#include <map>
#include <optional>
#include <stdexcept>
#include <string>
#include <typeindex>
#include <typeinfo>
@ -169,7 +170,7 @@ public:
} else {
this->SetValue(static_cast<Type>(std::stoll(input)));
}
} catch (std::invalid_argument) {
} catch (std::invalid_argument& e) {
this->SetValue(this->GetDefault());
}
}
@ -229,9 +230,10 @@ public:
* @param category_ Category of the setting AKA INI group
*/
explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const std::string& name,
Category category, bool save = true, bool runtime_modifiable = false)
Category category_, bool save_ = true,
bool runtime_modifiable_ = false)
requires(!ranged)
: Setting<Type, false>{linkage, default_val, name, category, save, runtime_modifiable} {
: Setting<Type, false>{linkage, default_val, name, category_, save_, runtime_modifiable_} {
linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
}
virtual ~SwitchableSetting() = default;
@ -247,11 +249,11 @@ public:
* @param category_ Category of the setting AKA INI group
*/
explicit SwitchableSetting(Linkage& linkage, const Type& default_val, const Type& min_val,
const Type& max_val, const std::string& name, Category category,
bool save = true, bool runtime_modifiable = false)
const Type& max_val, const std::string& name, Category category_,
bool save_ = true, bool runtime_modifiable_ = false)
requires(ranged)
: Setting<Type, true>{linkage, default_val, min_val, max_val,
name, category, save, runtime_modifiable} {
name, category_, save_, runtime_modifiable_} {
linkage.restore_functions.emplace_back([this]() { this->SetGlobal(true); });
}