diff options
| author | Feng Chen <VonChenPlus@gmail.com> | 2021-12-18 13:57:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 13:57:14 +0800 |
| commit | e49184e6069a9d791d2df3c1958f5c4b1187e124 (patch) | |
| tree | b776caf722e0be0e680f67b0ad0842628162ef1c /src/yuzu/applets/qt_web_browser.h | |
| parent | 4dd85f86a89338ff84d05a3981c14f6de1be4606 (diff) | |
| parent | 77d06d5df02d18da381bcd572ce11fee790d9edf (diff) | |
Merge branch 'yuzu-emu:master' into convert_legacy
Diffstat (limited to 'src/yuzu/applets/qt_web_browser.h')
| -rw-r--r-- | src/yuzu/applets/qt_web_browser.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/yuzu/applets/qt_web_browser.h b/src/yuzu/applets/qt_web_browser.h index 7e9f703fc..fa18aecac 100644 --- a/src/yuzu/applets/qt_web_browser.h +++ b/src/yuzu/applets/qt_web_browser.h @@ -16,8 +16,6 @@ #include "core/frontend/applets/web_browser.h" -enum class HIDButton : u8; - class GMainWindow; class InputInterpreter; class UrlRequestInterceptor; @@ -26,6 +24,10 @@ namespace Core { class System; } +namespace Core::HID { +enum class NpadButton : u64; +} + namespace InputCommon { class InputSubsystem; } @@ -114,7 +116,7 @@ private: * * @tparam HIDButton The list of buttons contained in yuzu_key_callbacks */ - template <HIDButton... T> + template <Core::HID::NpadButton... T> void HandleWindowFooterButtonPressedOnce(); /** @@ -123,7 +125,7 @@ private: * * @tparam HIDButton The list of buttons that can be converted into keyboard input. */ - template <HIDButton... T> + template <Core::HID::NpadButton... T> void HandleWindowKeyButtonPressedOnce(); /** @@ -132,7 +134,7 @@ private: * * @tparam HIDButton The list of buttons that can be converted into keyboard input. */ - template <HIDButton... T> + template <Core::HID::NpadButton... T> void HandleWindowKeyButtonHold(); /** |