diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2018-11-03 12:55:39 -0400 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2018-11-18 23:22:36 -0500 |
| commit | 3a6cd5b3c8dec11cc88c6aebdc4773233f615c91 (patch) | |
| tree | 980ef0304b375ddea0ef83c8786253e1a3548be7 /src/yuzu/configuration/configure_mouse_advanced.cpp | |
| parent | 3d1a221893127f2be317d9237d26c607a4b736e1 (diff) | |
hid: Use player-defined controller type as PREFERRED_CONTROLLER
Diffstat (limited to 'src/yuzu/configuration/configure_mouse_advanced.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_mouse_advanced.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_mouse_advanced.cpp b/src/yuzu/configuration/configure_mouse_advanced.cpp index 8cfcd16794..ac9c840961 100644 --- a/src/yuzu/configuration/configure_mouse_advanced.cpp +++ b/src/yuzu/configuration/configure_mouse_advanced.cpp @@ -16,7 +16,7 @@ #include "yuzu/configuration/config.h" #include "yuzu/configuration/configure_mouse_advanced.h" -static QString getKeyName(int key_code) { +static QString GetKeyName(int key_code) { switch (key_code) { case Qt::Key_Shift: return QObject::tr("Shift"); @@ -35,7 +35,7 @@ static QString ButtonToText(const Common::ParamPackage& param) { if (!param.Has("engine")) { return QObject::tr("[not set]"); } else if (param.Get("engine", "") == "keyboard") { - return getKeyName(param.Get("code", 0)); + return GetKeyName(param.Get("code", 0)); } else if (param.Get("engine", "") == "sdl") { if (param.Has("hat")) { return QString(QObject::tr("Hat %1 %2")) @@ -191,7 +191,7 @@ void ConfigureMouseAdvanced::setPollingResult(const Common::ParamPackage& params } updateButtonLabels(); - input_setter = boost::none; + input_setter = std::nullopt; } void ConfigureMouseAdvanced::keyPressEvent(QKeyEvent* event) { |