diff options
| author | bunnei <bunneidev@gmail.com> | 2018-12-26 18:10:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-26 18:10:56 -0500 |
| commit | c9269a4a4b1e7fc007a8e12c638150e3b9e7cdd2 (patch) | |
| tree | 7893dd9688d1712343fe479f2d00bbf0fc999cdd /src/yuzu/configuration/configure_input_simple.cpp | |
| parent | 8047873a66146ae25e9707796b16062ed00e60b7 (diff) | |
| parent | faa9110541fb38a3edb67eed418982785923044f (diff) | |
Merge pull request #1947 from lioncash/init
configure_input_simple: Make input profile array constexpr
Diffstat (limited to 'src/yuzu/configuration/configure_input_simple.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_input_simple.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/yuzu/configuration/configure_input_simple.cpp b/src/yuzu/configuration/configure_input_simple.cpp index b4f3724bd..07d71e9d1 100644 --- a/src/yuzu/configuration/configure_input_simple.cpp +++ b/src/yuzu/configuration/configure_input_simple.cpp @@ -3,12 +3,8 @@ // Refer to the license.txt file included. #include <array> -#include <cstring> -#include <functional> #include <tuple> -#include <QDialog> - #include "ui_configure_input_simple.h" #include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input_player.h" @@ -73,20 +69,18 @@ void DualJoyconsDockedOnProfileSelect() { // Name, OnProfileSelect (called when selected in drop down), OnConfigure (called when configure // is clicked) -using InputProfile = - std::tuple<QString, std::function<void()>, std::function<void(ConfigureInputSimple*)>>; +using InputProfile = std::tuple<const char*, void (*)(), void (*)(ConfigureInputSimple*)>; -const std::array<InputProfile, 3> INPUT_PROFILES{{ - {ConfigureInputSimple::tr("Single Player - Handheld - Undocked"), HandheldOnProfileSelect, +constexpr std::array<InputProfile, 3> INPUT_PROFILES{{ + {QT_TR_NOOP("Single Player - Handheld - Undocked"), HandheldOnProfileSelect, [](ConfigureInputSimple* caller) { CallConfigureDialog<ConfigureInputPlayer>(caller, HANDHELD_INDEX, false); }}, - {ConfigureInputSimple::tr("Single Player - Dual Joycons - Docked"), - DualJoyconsDockedOnProfileSelect, + {QT_TR_NOOP("Single Player - Dual Joycons - Docked"), DualJoyconsDockedOnProfileSelect, [](ConfigureInputSimple* caller) { CallConfigureDialog<ConfigureInputPlayer>(caller, 1, false); }}, - {ConfigureInputSimple::tr("Custom"), [] {}, CallConfigureDialog<ConfigureInput>}, + {QT_TR_NOOP("Custom"), [] {}, CallConfigureDialog<ConfigureInput>}, }}; } // namespace @@ -101,7 +95,8 @@ ConfigureInputSimple::ConfigureInputSimple(QWidget* parent) ui->setupUi(this); for (const auto& profile : INPUT_PROFILES) { - ui->profile_combobox->addItem(std::get<0>(profile), std::get<0>(profile)); + const QString label = tr(std::get<0>(profile)); + ui->profile_combobox->addItem(label, label); } connect(ui->profile_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, |