From 7c691d82bf21f8bdbc98d4193d2ad3956528c25a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 9 Aug 2021 19:46:03 +0100
Subject: [PATCH] Remove ONEHAND_ENABLE (#13920)

---
 keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk | 2 +-
 keyboards/redox_w/redox_w.c                           | 2 +-
 keyboards/vitamins_included/vitamins_included.c       | 2 +-
 show_options.mk                                       | 1 -
 tmk_core/common.mk                                    | 3 ---
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
index 5036ed7fe22..a7f524fa430 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/rules.mk
@@ -2,7 +2,7 @@ MOUSEKEY_ENABLE  = yes # Mouse keys
 EXTRAKEY_ENABLE  = yes # Audio control and System control
 COMMAND_ENABLE   = yes # Commands for debug and configuration
 NKRO_ENABLE      = yes # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-ONEHAND_ENABLE   = yes # Allow swapping hands of keyboard
+SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard
 KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key
 TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
 CONSOLE_ENABLE   = yes  # Console for debug
diff --git a/keyboards/redox_w/redox_w.c b/keyboards/redox_w/redox_w.c
index a94e731b390..5b863445362 100644
--- a/keyboards/redox_w/redox_w.c
+++ b/keyboards/redox_w/redox_w.c
@@ -15,7 +15,7 @@ void matrix_init_kb(void) {
 	led_init();
 }
 
-#ifdef ONEHAND_ENABLE
+#ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 {{13, 0}, {12, 0}, {11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
diff --git a/keyboards/vitamins_included/vitamins_included.c b/keyboards/vitamins_included/vitamins_included.c
index 078f93e0e6e..e83c81633c8 100644
--- a/keyboards/vitamins_included/vitamins_included.c
+++ b/keyboards/vitamins_included/vitamins_included.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
 
-#ifdef ONEHAND_ENABLE
+#ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
 
diff --git a/show_options.mk b/show_options.mk
index 31375d112f7..8aed634dae4 100644
--- a/show_options.mk
+++ b/show_options.mk
@@ -69,7 +69,6 @@ OTHER_OPTION_NAMES = \
   KEYLOGGER_ENABLE \
   LCD_BACKLIGHT_ENABLE \
   MACROS_ENABLED \
-  ONEHAND_ENABLE \
   PS2_MOUSE_ENABLE \
   RAW_ENABLE \
   SWAP_HANDS_ENABLE \
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index bd4142364c5..6c8cf693563 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -98,9 +98,6 @@ ifeq ($(strip $(BLUETOOTH)), RN42)
 	TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
-ifeq ($(strip $(ONEHAND_ENABLE)), yes)
-  SWAP_HANDS_ENABLE = yes # backwards compatibility
-endif
 ifeq ($(strip $(SWAP_HANDS_ENABLE)), yes)
     TMK_COMMON_DEFS += -DSWAP_HANDS_ENABLE
 endif