Merge branch 'yuzu-emu:master' into convert_legacy

1 files changed, 7 insertions, 5 deletions

diff --git a/src/yuzu/applets/qt_software_keyboard.h b/src/yuzu/applets/qt_software_keyboard.h
index 592d9c085..b030cdcf7 100644
--- a/src/yuzu/applets/qt_software_keyboard.h
+++ b/src/yuzu/applets/qt_software_keyboard.h
@@ -14,14 +14,16 @@
 
 #include "core/frontend/applets/software_keyboard.h"
 
-enum class HIDButton : u8;
-
 class InputInterpreter;
 
 namespace Core {
 class System;
 }
 
+namespace Core::HID {
+enum class NpadButton : u64;
+}
+
 namespace Ui {
 class QtSoftwareKeyboardDialog;
 }
@@ -146,7 +148,7 @@ private:
      *
      * @tparam HIDButton The list of buttons that can be converted into keyboard input.
      */
-    template <HIDButton... T>
+    template <Core::HID::NpadButton... T>
     void HandleButtonPressedOnce();
 
     /**
@@ -154,7 +156,7 @@ private:
      *
      * @tparam HIDButton The list of buttons that can be converted into keyboard input.
      */
-    template <HIDButton... T>
+    template <Core::HID::NpadButton... T>
     void HandleButtonHold();
 
     /**
@@ -162,7 +164,7 @@ private:
      *
      * @param button The button press to process.
      */
-    void TranslateButtonPress(HIDButton button);
+    void TranslateButtonPress(Core::HID::NpadButton button);
 
     /**
      * Moves the focus of a button in a certain direction.