KeyboardManager inherits KeyboardEventHandler

Author: jw098

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardEventHandler.h

@@ -11,10 +11,13 @@
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "Common/Cpp/Time.h"
 #include "Common/Cpp/LifetimeSanitizer.h"
-#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
 
 namespace PokemonAutomation{
 
+namespace NintendoSwitch{
+    class ProControllerState;  // forward declaration to avoid circular dependency
+}
+
 class KeyboardEventHandler{
 public:
     KeyboardEventHandler();

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.h

@@ -14,6 +14,7 @@
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Controllers/Controller.h"
 #include "Controllers/KeyboardInput/GlobalQtKeyMap.h"
+#include "KeyboardEventHandler.h"
 #include "KeyboardStateTracker.h"
 
 class QKeyEvent;
@@ -86,7 +87,7 @@ class KeyboardInputController{
 
 
 template <typename StateType, typename DeltaType>
-class KeyboardManager : public KeyboardInputController{
+class KeyboardManager : public KeyboardInputController, public KeyboardEventHandler{
 public:
     KeyboardManager(Logger& logger, AbstractController& controller)
         : KeyboardInputController(logger, true)