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_input_player.h | |
| parent | 3d1a221893127f2be317d9237d26c607a4b736e1 (diff) | |
hid: Use player-defined controller type as PREFERRED_CONTROLLER
Diffstat (limited to 'src/yuzu/configuration/configure_input_player.h')
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index 67cc6a8ca..8248cd7de 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h @@ -7,11 +7,11 @@ #include <array> #include <functional> #include <memory> +#include <optional> #include <string> #include <unordered_map> #include <QDialog> #include <QKeyEvent> -#include <boost/optional.hpp> #include "common/param_package.h" #include "core/settings.h" #include "input_common/main.h" @@ -44,7 +44,7 @@ private: std::unique_ptr<QTimer> poll_timer; /// This will be the the setting function when an input is awaiting configuration. - boost::optional<std::function<void(const Common::ParamPackage&)>> input_setter; + std::optional<std::function<void(const Common::ParamPackage&)>> input_setter; std::array<Common::ParamPackage, Settings::NativeButton::NumButtons> buttons_param; std::array<Common::ParamPackage, Settings::NativeAnalog::NumAnalogs> analogs_param; |