From 0f27253f905a84882932979e02d8770b94d83a0b Mon Sep 17 00:00:00 2001 From: Michael Richters Date: Sun, 29 May 2022 14:06:38 -0500 Subject: [PATCH] Run IWYU on Macros, DynamicMacros, and MacroSupport code Signed-off-by: Michael Richters --- .../src/kaleidoscope/plugin/DynamicMacros.cpp | 2 +- .../src/kaleidoscope/plugin/DynamicMacros.h | 6 +++--- .../src/kaleidoscope/plugin/MacroSupport.cpp | 6 +++--- .../Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.cpp | 2 +- .../Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.h | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.cpp b/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.cpp index 6fee6637..6efc813a 100644 --- a/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.cpp +++ b/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.cpp @@ -23,7 +23,7 @@ #include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ #include "kaleidoscope/device/device.h" // for VirtualProps::Storage, Base<>::Storage -#include "kaleidoscope/keyswitch_state.h" // for INJECTED, IS_PRESSED, WAS_PRESSED +#include "kaleidoscope/keyswitch_state.h" // for keyToggledOn #include "kaleidoscope/plugin/EEPROM-Settings.h" // for EEPROMSettings // This is a special exception to the rule of only including a plugin's // top-level header file, because DynamicMacros doesn't depend on the Macros diff --git a/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.h b/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.h index e4767761..93ff7600 100644 --- a/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.h +++ b/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.h @@ -16,9 +16,9 @@ #pragma once -#include -#include // for DYNAMIC_MACRO_FIRST -#include // for uint16_t, uint8_t +#include // for MacroSupport +#include // for DYNAMIC_MACRO_FIRST +#include // for uint16_t, uint8_t #include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult diff --git a/plugins/Kaleidoscope-MacroSupport/src/kaleidoscope/plugin/MacroSupport.cpp b/plugins/Kaleidoscope-MacroSupport/src/kaleidoscope/plugin/MacroSupport.cpp index bd453804..27b1722d 100644 --- a/plugins/Kaleidoscope-MacroSupport/src/kaleidoscope/plugin/MacroSupport.cpp +++ b/plugins/Kaleidoscope-MacroSupport/src/kaleidoscope/plugin/MacroSupport.cpp @@ -16,15 +16,15 @@ #include "kaleidoscope/plugin/MacroSupport.h" -#include // for pgm_read_byte, delay, F, PROGMEM, __F... +#include // for F, __FlashStringHelper #include // for Focus, FocusSerial #include // for uint8_t #include "kaleidoscope/KeyAddr.h" // for KeyAddr #include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ -#include "kaleidoscope/event_handler_result.h" // for EventHandlerResult, EventHandlerResul... -#include "kaleidoscope/key_defs.h" // for Key, LSHIFT, Key_NoKey, Key_0, Key_1 +#include "kaleidoscope/event_handler_result.h" // for EventHandlerResult, EventHandlerResult::OK +#include "kaleidoscope/key_defs.h" // for Key, Key_NoKey #include "kaleidoscope/keyswitch_state.h" // for INJECTED, IS_PRESSED, WAS_PRESSED // ============================================================================= diff --git a/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.cpp b/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.cpp index 8f63a29a..8101a85a 100644 --- a/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.cpp +++ b/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.cpp @@ -24,7 +24,7 @@ #include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult, EventHandlerResul... #include "kaleidoscope/key_defs.h" // for Key, LSHIFT, Key_NoKey, Key_0, Key_1 -#include "kaleidoscope/keyswitch_state.h" // for INJECTED, IS_PRESSED, WAS_PRESSED +#include "kaleidoscope/keyswitch_state.h" // for keyToggledOff #include "kaleidoscope/plugin/Macros/MacroSteps.h" // for macro_t, MACRO_NONE, MACRO_ACTION_END // ============================================================================= diff --git a/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.h b/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.h index 0de51309..5ccc0c21 100644 --- a/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.h +++ b/plugins/Kaleidoscope-Macros/src/kaleidoscope/plugin/Macros.h @@ -16,10 +16,10 @@ #pragma once -#include // for uint8_t +#include // for MacroSupport +#include // for MACRO_FIRST, MACRO_LAST +#include // for uint8_t -#include -#include // for MACRO_FIRST, MACRO_LAST #include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult #include "kaleidoscope/key_defs.h" // for Key