Skip to content

Commit 170c176

Browse files
committed
Migrate keyboard to new controller input API. Cleanup.
1 parent e9ad4dd commit 170c176

File tree

13 files changed

+26
-490
lines changed

13 files changed

+26
-490
lines changed

SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ KeyboardHidTracker::KeyboardHidTracker()
3737
, m_stopping(false)
3838
, m_thread([this]{
3939
run_with_catch(
40-
"KeyboardInputController::thread_loop()",
40+
"KeyboardHidTracker::thread_loop()",
4141
[this]{ thread_loop(); }
4242
);
4343
})

SerialPrograms/Source/Controllers/Controller.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
#include "Controllers/KeyboardInput/KeyboardEventHandler.h"
1414
#include "Common/Cpp/CancellableScope.h"
1515

16-
class QKeyEvent;
17-
1816
namespace PokemonAutomation{
1917

2018
class RecursiveThrottler;
@@ -198,10 +196,6 @@ class AbstractController{
198196

199197
virtual void controller_input_state(const ControllerInputState& state){}
200198

201-
virtual void keyboard_release_all(){}
202-
virtual void keyboard_press(const QKeyEvent& event){}
203-
virtual void keyboard_release(const QKeyEvent& event){}
204-
205199
virtual void add_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){};
206200
virtual void remove_keyboard_listener(KeyboardEventHandler::KeyboardListener& keyboard_listener){};
207201
};

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardEventHandler.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
*/
44
#include "Common/Cpp/ListenerSet.h"
55
#include "Common/Cpp/Containers/Pimpl.tpp"
6-
#include "Controllers/KeyboardInput/KeyboardInput.h"
76
#include "KeyboardEventHandler.h"
87

98
namespace PokemonAutomation{
@@ -44,4 +43,4 @@ void KeyboardEventHandler::report_keyboard_command_stopped(WallClock time_stamp)
4443
}
4544

4645

47-
}
46+
}

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.cpp

Lines changed: 0 additions & 192 deletions
This file was deleted.

SerialPrograms/Source/Controllers/KeyboardInput/KeyboardInput.h

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)