From 7230923b051bdb32bea19c3d732fa1fbc4883a68 Mon Sep 17 00:00:00 2001
From: Joe Wasson <jwasson+github@gmail.com>
Date: Sun, 11 Mar 2018 14:07:02 -0700
Subject: Rename ONEHAND_ENABLE to SWAP_HANDS_ENABLE for consistency

---
 tmk_core/common.mk       | 7 +++++--
 tmk_core/common/action.c | 6 +++---
 tmk_core/common/action.h | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'tmk_core')

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 75b810d98..f12073525 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -25,7 +25,7 @@ TMK_COMMON_SRC +=	$(COMMON_DIR)/host.c \
 
 ifeq ($(PLATFORM),AVR)
 	TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
-endif 
+endif
 
 ifeq ($(PLATFORM),CHIBIOS)
 	TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
@@ -124,7 +124,10 @@ ifeq ($(strip $(BLUETOOTH)), RN42)
 endif
 
 ifeq ($(strip $(ONEHAND_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DONEHAND_ENABLE
+  SWAP_HANDS_ENABLE = yes # backwards compatibility
+endif
+ifeq ($(strip $(SWAP_HANDS_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DSWAP_HANDS_ENABLE
 endif
 
 ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c
index dd3a5b3ee..947e5118f 100644
--- a/tmk_core/common/action.c
+++ b/tmk_core/common/action.c
@@ -64,7 +64,7 @@ void action_exec(keyevent_t event)
     fauxclicky_check();
 #endif
 
-#ifdef ONEHAND_ENABLE
+#ifdef SWAP_HANDS_ENABLE
     if (!IS_NOEVENT(event)) {
         process_hand_swap(&event);
     }
@@ -91,7 +91,7 @@ void action_exec(keyevent_t event)
 #endif
 }
 
-#ifdef ONEHAND_ENABLE
+#ifdef SWAP_HANDS_ENABLE
 bool swap_hands = false;
 
 void process_hand_swap(keyevent_t *event) {
@@ -524,7 +524,7 @@ void process_action(keyrecord_t *record, action_t action)
 #endif
         case ACT_COMMAND:
             break;
-#ifdef ONEHAND_ENABLE
+#ifdef SWAP_HANDS_ENABLE
         case ACT_SWAP_HANDS:
             switch (action.swap.code) {
                 case OP_SH_TOGGLE:
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h
index b9bdfe642..87027dede 100644
--- a/tmk_core/common/action.h
+++ b/tmk_core/common/action.h
@@ -67,7 +67,7 @@ extern bool disable_action_cache;
 #endif
 
 /* Code for handling one-handed key modifiers. */
-#ifdef ONEHAND_ENABLE
+#ifdef SWAP_HANDS_ENABLE
 extern bool swap_hands;
 extern const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS];
 #if (MATRIX_COLS <= 8)
-- 
cgit v1.2.3-24-g4f1b