Skip to content

Commit e0af2bf

Browse files
MysticialMysticial
committed
Move keyboard stuff into Controllers folder.
1 parent a0f6018 commit e0af2bf

10 files changed

+253
-253
lines changed

‎SerialPrograms/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -812,8 +812,14 @@ file(GLOB MAIN_SOURCES
812812
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h
813813
Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.cpp
814814
Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.h
815+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardInput.cpp
816+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardInput.h
817+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp
818+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h
815819
Source/NintendoSwitch/Controllers/NintendoSwitch_SerialPABotBase.cpp
816820
Source/NintendoSwitch/Controllers/NintendoSwitch_SerialPABotBase.h
821+
Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp
822+
Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h
817823
Source/NintendoSwitch/DevPrograms/BoxDraw.cpp
818824
Source/NintendoSwitch/DevPrograms/BoxDraw.h
819825
Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
@@ -836,10 +842,6 @@ file(GLOB MAIN_SOURCES
836842
Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h
837843
Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.cpp
838844
Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h
839-
Source/NintendoSwitch/Framework/NintendoSwitch_KeyboardInput.cpp
840-
Source/NintendoSwitch/Framework/NintendoSwitch_KeyboardInput.h
841-
Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.cpp
842-
Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.h
843845
Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp
844846
Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h
845847
Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.cpp
@@ -856,8 +858,6 @@ file(GLOB MAIN_SOURCES
856858
Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h
857859
Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
858860
Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
859-
Source/NintendoSwitch/NintendoSwitch_KeyboardMapping.cpp
860-
Source/NintendoSwitch/NintendoSwitch_KeyboardMapping.h
861861
Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
862862
Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
863863
Source/NintendoSwitch/NintendoSwitch_Panels.cpp

‎SerialPrograms/SerialPrograms.pro‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,13 @@ SOURCES += \
403403
Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp \
404404
Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp \
405405
Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.cpp \
406+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardInput.cpp \
407+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp \
406408
Source/NintendoSwitch/Controllers/NintendoSwitch_SerialPABotBase.cpp \
409+
Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp \
407410
Source/NintendoSwitch/DevPrograms/BoxDraw.cpp \
408411
Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp \
409412
Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp \
410-
Source/NintendoSwitch/Framework/NintendoSwitch_KeyboardInput.cpp \
411413
Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.cpp \
412414
Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp \
413415
Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.cpp \
@@ -416,7 +418,6 @@ SOURCES += \
416418
Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp \
417419
Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp \
418420
Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.cpp \
419-
Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.cpp \
420421
Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp \
421422
Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.cpp \
422423
Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.cpp \
@@ -425,7 +426,6 @@ SOURCES += \
425426
Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp \
426427
Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp \
427428
Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp \
428-
Source/NintendoSwitch/NintendoSwitch_KeyboardMapping.cpp \
429429
Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp \
430430
Source/NintendoSwitch/NintendoSwitch_Panels.cpp \
431431
Source/NintendoSwitch/NintendoSwitch_Settings.cpp \
@@ -1548,12 +1548,14 @@ HEADERS += \
15481548
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h \
15491549
Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Superscalar.h \
15501550
Source/NintendoSwitch/Controllers/NintendoSwitch_Controller.h \
1551+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardInput.h \
1552+
Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h \
15511553
Source/NintendoSwitch/Controllers/NintendoSwitch_SerialPABotBase.h \
1554+
Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h \
15521555
Source/NintendoSwitch/DevPrograms/BoxDraw.h \
15531556
Source/NintendoSwitch/DevPrograms/TestProgramComputer.h \
15541557
Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h \
15551558
Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h \
1556-
Source/NintendoSwitch/Framework/NintendoSwitch_KeyboardInput.h \
15571559
Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h \
15581560
Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h \
15591561
Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h \
@@ -1562,15 +1564,13 @@ HEADERS += \
15621564
Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h \
15631565
Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h \
15641566
Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h \
1565-
Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.h \
15661567
Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h \
15671568
Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.h \
15681569
Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.h \
15691570
Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h \
15701571
Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h \
15711572
Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h \
15721573
Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h \
1573-
Source/NintendoSwitch/NintendoSwitch_KeyboardMapping.h \
15741574
Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h \
15751575
Source/NintendoSwitch/NintendoSwitch_Panels.h \
15761576
Source/NintendoSwitch/NintendoSwitch_Settings.h \

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_KeyboardInput.cpp renamed to SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardInput.cpp

File renamed without changes.

SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_KeyboardInput.h renamed to SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardInput.h

File renamed without changes.

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_KeyboardMapping.cpp renamed to SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#include <QKeySequence>
8-
#include "Framework/NintendoSwitch_VirtualControllerState.h"
8+
#include "NintendoSwitch_VirtualControllerState.h"
99
#include "NintendoSwitch_KeyboardMapping.h"
1010

1111
//#include <iostream>

SerialPrograms/Source/NintendoSwitch/NintendoSwitch_KeyboardMapping.h renamed to SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h

File renamed without changes.

0 commit comments

Comments
 (0)