common,yuzu-qt: GCC warning silences

Fixes -Wshadow, -Wdeprecated, and catch by copy rather than by ref.

2 files changed, 9 insertions, 7 deletions

diff --git a/src/common/settings_common.h b/src/common/settings_common.h
index 4d6d3021e..2b5c72f41 100644
--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -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.
diff --git a/src/common/settings_setting.h b/src/common/settings_setting.h
index 658b6328d..f803e4e6e 100644
--- a/src/common/settings_setting.h
+++ b/src/common/settings_setting.h
@@ -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); });
     }