From add3ab4e830437b85e90864bd8f9312314265856 Mon Sep 17 00:00:00 2001 From: Michael Richters Date: Mon, 4 Jan 2021 14:07:28 -0600 Subject: [PATCH] Move KeyAddrEventQueue class from Qukeys to Kaleidoscope core It's now being used by more than one plugin, and is likely to get used by at least a third, if not more. Signed-off-by: Michael Richters --- plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys.h | 2 +- .../Kaleidoscope-TapDance/src/kaleidoscope/plugin/TapDance.h | 2 +- .../plugin/Qukeys => src/kaleidoscope}/KeyAddrEventQueue.h | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) rename {plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys => src/kaleidoscope}/KeyAddrEventQueue.h (98%) diff --git a/plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys.h b/plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys.h index cdcf0081..80a89f4a 100644 --- a/plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys.h +++ b/plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys.h @@ -20,7 +20,7 @@ #include "kaleidoscope/Runtime.h" #include -#include "kaleidoscope/plugin/Qukeys/KeyAddrEventQueue.h" +#include "kaleidoscope/KeyAddrEventQueue.h" // DualUse Key definitions for Qukeys in the keymap #define MT(mod, key) Key( \ diff --git a/plugins/Kaleidoscope-TapDance/src/kaleidoscope/plugin/TapDance.h b/plugins/Kaleidoscope-TapDance/src/kaleidoscope/plugin/TapDance.h index baea0356..9eef4c25 100644 --- a/plugins/Kaleidoscope-TapDance/src/kaleidoscope/plugin/TapDance.h +++ b/plugins/Kaleidoscope-TapDance/src/kaleidoscope/plugin/TapDance.h @@ -20,7 +20,7 @@ #include "kaleidoscope/Runtime.h" #include "kaleidoscope/LiveKeys.h" #include -#include "kaleidoscope/plugin/Qukeys/KeyAddrEventQueue.h" +#include "kaleidoscope/KeyAddrEventQueue.h" #define TD(n) Key(kaleidoscope::ranges::TD_FIRST + n) diff --git a/plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys/KeyAddrEventQueue.h b/src/kaleidoscope/KeyAddrEventQueue.h similarity index 98% rename from plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys/KeyAddrEventQueue.h rename to src/kaleidoscope/KeyAddrEventQueue.h index 60f6d586..8a646394 100644 --- a/plugins/Kaleidoscope-Qukeys/src/kaleidoscope/plugin/Qukeys/KeyAddrEventQueue.h +++ b/src/kaleidoscope/KeyAddrEventQueue.h @@ -25,7 +25,6 @@ #include "kaleidoscope/keyswitch_state.h" namespace kaleidoscope { -namespace plugin { // This class defines a keyswitch event queue that stores both press and release // events, recording the key address, a timestamp, and the keyswitch state @@ -125,5 +124,4 @@ class KeyAddrEventQueue { } }; -} // namespace plugin } // namespace kaleidoscope