From 853712eec162844cd49dcd3511bce66a531f7b53 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Mon, 5 Jun 2017 10:42:49 +0200 Subject: [PATCH] Use the newest Ranges APIs Signed-off-by: Gergely Nagy --- src/Kaleidoscope/Leader.cpp | 4 +--- src/Kaleidoscope/Leader.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Kaleidoscope/Leader.cpp b/src/Kaleidoscope/Leader.cpp index 1014c9c1..1b72ba92 100644 --- a/src/Kaleidoscope/Leader.cpp +++ b/src/Kaleidoscope/Leader.cpp @@ -20,8 +20,6 @@ namespace kaleidoscope { -namespace Ranges = KaleidoscopePlugins::Ranges; - // --- state --- Key Leader::sequence_[LEADER_MAX_SEQUENCE_LENGTH + 1]; uint8_t Leader::sequence_pos_; @@ -34,7 +32,7 @@ const Leader::dictionary_t *Leader::dictionary; #define PARTIAL_MATCH -1 #define NO_MATCH -2 -#define isLeader(k) (k.raw >= Ranges::LEAD_FIRST && k.raw <= Ranges::LEAD_LAST) +#define isLeader(k) (k.raw >= ranges::LEAD_FIRST && k.raw <= ranges::LEAD_LAST) #define isActive() (sequence_[0].raw != Key_NoKey.raw) // --- actions --- diff --git a/src/Kaleidoscope/Leader.h b/src/Kaleidoscope/Leader.h index 8ca96c21..16fd7117 100644 --- a/src/Kaleidoscope/Leader.h +++ b/src/Kaleidoscope/Leader.h @@ -23,7 +23,7 @@ #define LEADER_MAX_SEQUENCE_LENGTH 4 -#define LEAD(n) (Key) { .raw = KaleidoscopePlugins::Ranges::LEAD_FIRST + n } +#define LEAD(n) (Key) { .raw = kaleidoscope::ranges::LEAD_FIRST + n } #define LEADER_SEQ(...) { __VA_ARGS__, Key_NoKey } #define LEADER_DICT(...) { __VA_ARGS__, {{Key_NoKey}, NULL} }