diff options
| author | 2020-08-28 11:44:36 -0400 | |
|---|---|---|
| committer | 2020-09-04 12:23:25 -0400 | |
| commit | 1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab (patch) | |
| tree | b48aa74103657a94882a658c750a6613f1e816da /src | |
| parent | applets/controller: Set min_players to have a minimum value of 1. (diff) | |
| download | yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar.gz yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar.xz yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.zip | |
clang-format
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/applets/controller.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_input.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp index 4920d2df6..f2690b8dc 100644 --- a/src/yuzu/applets/controller.cpp +++ b/src/yuzu/applets/controller.cpp | |||
| @@ -102,7 +102,8 @@ constexpr int GetIndexFromControllerType(Settings::ControllerType type) { | |||
| 102 | } // namespace | 102 | } // namespace |
| 103 | 103 | ||
| 104 | QtControllerSelectorDialog::QtControllerSelectorDialog( | 104 | QtControllerSelectorDialog::QtControllerSelectorDialog( |
| 105 | QWidget* parent, Core::Frontend::ControllerParameters parameters_, InputCommon::InputSubsystem* input_subsystem_) | 105 | QWidget* parent, Core::Frontend::ControllerParameters parameters_, |
| 106 | InputCommon::InputSubsystem* input_subsystem_) | ||
| 106 | : QDialog(parent), ui(std::make_unique<Ui::QtControllerSelectorDialog>()), | 107 | : QDialog(parent), ui(std::make_unique<Ui::QtControllerSelectorDialog>()), |
| 107 | parameters(std::move(parameters_)), input_subsystem(input_subsystem_) { | 108 | parameters(std::move(parameters_)), input_subsystem(input_subsystem_) { |
| 108 | ui->setupUi(this); | 109 | ui->setupUi(this); |
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 3befcc739..7ea17a4db 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp | |||
| @@ -70,7 +70,8 @@ ConfigureInput::ConfigureInput(QWidget* parent) | |||
| 70 | 70 | ||
| 71 | ConfigureInput::~ConfigureInput() = default; | 71 | ConfigureInput::~ConfigureInput() = default; |
| 72 | 72 | ||
| 73 | void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, std::size_t max_players) { | 73 | void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, |
| 74 | std::size_t max_players) { | ||
| 74 | player_controllers = { | 75 | player_controllers = { |
| 75 | new ConfigureInputPlayer(this, 0, ui->consoleInputSettings, input_subsystem), | 76 | new ConfigureInputPlayer(this, 0, ui->consoleInputSettings, input_subsystem), |
| 76 | new ConfigureInputPlayer(this, 1, ui->consoleInputSettings, input_subsystem), | 77 | new ConfigureInputPlayer(this, 1, ui->consoleInputSettings, input_subsystem), |