summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Morph2022-06-13 20:06:00 -0400
committerGravatar Morph2022-06-14 08:30:09 -0400
commite37196121948e98b7512e5111da515b29591beec (patch)
tree22ed1b3b6f56ac9d06a784e4ff4a7b1591ceecd7
parentconfigure_per_game: Eliminate variable shadowing (diff)
downloadyuzu-e37196121948e98b7512e5111da515b29591beec.tar.gz
yuzu-e37196121948e98b7512e5111da515b29591beec.tar.xz
yuzu-e37196121948e98b7512e5111da515b29591beec.zip
configure_touch_from_button: Eliminate variable shadowing
-rw-r--r--src/yuzu/configuration/configure_touch_from_button.cpp4
-rw-r--r--src/yuzu/configuration/configure_touch_from_button.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_touch_from_button.cpp b/src/yuzu/configuration/configure_touch_from_button.cpp
index c17da6fd1..06cc452c3 100644
--- a/src/yuzu/configuration/configure_touch_from_button.cpp
+++ b/src/yuzu/configuration/configure_touch_from_button.cpp
@@ -68,10 +68,10 @@ static QString ButtonToText(const Common::ParamPackage& param) {
68} 68}
69 69
70ConfigureTouchFromButton::ConfigureTouchFromButton( 70ConfigureTouchFromButton::ConfigureTouchFromButton(
71 QWidget* parent, const std::vector<Settings::TouchFromButtonMap>& touch_maps, 71 QWidget* parent, const std::vector<Settings::TouchFromButtonMap>& touch_maps_,
72 InputCommon::InputSubsystem* input_subsystem_, const int default_index) 72 InputCommon::InputSubsystem* input_subsystem_, const int default_index)
73 : QDialog(parent), ui(std::make_unique<Ui::ConfigureTouchFromButton>()), 73 : QDialog(parent), ui(std::make_unique<Ui::ConfigureTouchFromButton>()),
74 touch_maps(touch_maps), input_subsystem{input_subsystem_}, selected_index(default_index), 74 touch_maps{touch_maps_}, input_subsystem{input_subsystem_}, selected_index{default_index},
75 timeout_timer(std::make_unique<QTimer>()), poll_timer(std::make_unique<QTimer>()) { 75 timeout_timer(std::make_unique<QTimer>()), poll_timer(std::make_unique<QTimer>()) {
76 ui->setupUi(this); 76 ui->setupUi(this);
77 binding_list_model = new QStandardItemModel(0, 3, this); 77 binding_list_model = new QStandardItemModel(0, 3, this);
diff --git a/src/yuzu/configuration/configure_touch_from_button.h b/src/yuzu/configuration/configure_touch_from_button.h
index e1400481a..b8c55db66 100644
--- a/src/yuzu/configuration/configure_touch_from_button.h
+++ b/src/yuzu/configuration/configure_touch_from_button.h
@@ -37,7 +37,7 @@ class ConfigureTouchFromButton : public QDialog {
37 37
38public: 38public:
39 explicit ConfigureTouchFromButton(QWidget* parent, 39 explicit ConfigureTouchFromButton(QWidget* parent,
40 const std::vector<Settings::TouchFromButtonMap>& touch_maps, 40 const std::vector<Settings::TouchFromButtonMap>& touch_maps_,
41 InputCommon::InputSubsystem* input_subsystem_, 41 InputCommon::InputSubsystem* input_subsystem_,
42 int default_index = 0); 42 int default_index = 0);
43 ~ConfigureTouchFromButton() override; 43 ~ConfigureTouchFromButton() override;