diff options
| author | bunnei <bunneidev@gmail.com> | 2019-06-05 18:03:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-05 18:03:05 -0400 |
| commit | 02f5a7327cf2e2fa6f435c1b4259dfa6dec899a8 (patch) | |
| tree | b6fa2198c4656ad70a3e916e56a7ee3ec4fc61d4 /src/yuzu/configuration/configure_input_simple.cpp | |
| parent | 94cf5f427af85b8c1d287f3b22882abac6fa9756 (diff) | |
| parent | 5bcab18c774ce4c19f67449dbeb1f383febdacca (diff) | |
Merge pull request #2521 from lioncash/naming
yuzu/configuration: Make function naming consistent
Diffstat (limited to 'src/yuzu/configuration/configure_input_simple.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_input_simple.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/yuzu/configuration/configure_input_simple.cpp b/src/yuzu/configuration/configure_input_simple.cpp index 07d71e9d18..6140a55731 100644 --- a/src/yuzu/configuration/configure_input_simple.cpp +++ b/src/yuzu/configuration/configure_input_simple.cpp @@ -15,12 +15,12 @@ namespace { template <typename Dialog, typename... Args> void CallConfigureDialog(ConfigureInputSimple* caller, Args&&... args) { - caller->applyConfiguration(); + caller->ApplyConfiguration(); Dialog dialog(caller, std::forward<Args>(args)...); const auto res = dialog.exec(); if (res == QDialog::Accepted) { - dialog.applyConfiguration(); + dialog.ApplyConfiguration(); } } @@ -103,27 +103,29 @@ ConfigureInputSimple::ConfigureInputSimple(QWidget* parent) &ConfigureInputSimple::OnSelectProfile); connect(ui->profile_configure, &QPushButton::pressed, this, &ConfigureInputSimple::OnConfigure); - this->loadConfiguration(); + LoadConfiguration(); } ConfigureInputSimple::~ConfigureInputSimple() = default; -void ConfigureInputSimple::applyConfiguration() { +void ConfigureInputSimple::ApplyConfiguration() { auto index = ui->profile_combobox->currentIndex(); // Make the stored index for "Custom" very large so that if new profiles are added it // doesn't change. - if (index >= static_cast<int>(INPUT_PROFILES.size() - 1)) + if (index >= static_cast<int>(INPUT_PROFILES.size() - 1)) { index = std::numeric_limits<int>::max(); + } UISettings::values.profile_index = index; } -void ConfigureInputSimple::loadConfiguration() { +void ConfigureInputSimple::LoadConfiguration() { const auto index = UISettings::values.profile_index; - if (index >= static_cast<int>(INPUT_PROFILES.size()) || index < 0) + if (index >= static_cast<int>(INPUT_PROFILES.size()) || index < 0) { ui->profile_combobox->setCurrentIndex(static_cast<int>(INPUT_PROFILES.size() - 1)); - else + } else { ui->profile_combobox->setCurrentIndex(index); + } } void ConfigureInputSimple::OnSelectProfile(int index) { |
