diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-06-14 02:06:00 +0200 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-06-14 14:30:09 +0200 |
| commit | e37196121948e98b7512e5111da515b29591beec (patch) | |
| tree | 22ed1b3b6f56ac9d06a784e4ff4a7b1591ceecd7 | |
| parent | configure_per_game: Eliminate variable shadowing (diff) | |
| download | yuzu-e37196121948e98b7512e5111da515b29591beec.tar yuzu-e37196121948e98b7512e5111da515b29591beec.tar.gz yuzu-e37196121948e98b7512e5111da515b29591beec.tar.bz2 yuzu-e37196121948e98b7512e5111da515b29591beec.tar.lz yuzu-e37196121948e98b7512e5111da515b29591beec.tar.xz yuzu-e37196121948e98b7512e5111da515b29591beec.tar.zst yuzu-e37196121948e98b7512e5111da515b29591beec.zip | |
| -rw-r--r-- | src/yuzu/configuration/configure_touch_from_button.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_touch_from_button.h | 2 |
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) { } ConfigureTouchFromButton::ConfigureTouchFromButton( - QWidget* parent, const std::vector<Settings::TouchFromButtonMap>& touch_maps, + QWidget* parent, const std::vector<Settings::TouchFromButtonMap>& touch_maps_, InputCommon::InputSubsystem* input_subsystem_, const int default_index) : QDialog(parent), ui(std::make_unique<Ui::ConfigureTouchFromButton>()), - touch_maps(touch_maps), input_subsystem{input_subsystem_}, selected_index(default_index), + touch_maps{touch_maps_}, input_subsystem{input_subsystem_}, selected_index{default_index}, timeout_timer(std::make_unique<QTimer>()), poll_timer(std::make_unique<QTimer>()) { ui->setupUi(this); 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 { public: explicit ConfigureTouchFromButton(QWidget* parent, - const std::vector<Settings::TouchFromButtonMap>& touch_maps, + const std::vector<Settings::TouchFromButtonMap>& touch_maps_, InputCommon::InputSubsystem* input_subsystem_, int default_index = 0); ~ConfigureTouchFromButton() override; |