Remove UNICODE_KEY_OSX and UC_OSX (#18290)

qmk · Sep 6, 2022 · 8833b28 · 8833b28
1 parent c6ab11b
commit 8833b28
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 34 deletions.
diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
@@ -119,8 +119,6 @@ The following input modes are available:
 
   !> Using the _Unicode Hex Input_ input source may disable some Option-based shortcuts, such as Option+Left and Option+Right.
 
-  !> `UC_OSX` is a deprecated alias of `UC_MAC` that will be removed in future versions of QMK. All new keymaps should use `UC_MAC`.
-
 * **`UC_LNX`**: Linux built-in IBus Unicode input. Supports code points up to `0x10FFFF` (all possible code points).
 
   Enabled by default and works almost anywhere on IBus-enabled distros. Without IBus, this mode works under GTK apps, but rarely anywhere else.

diff --git a/keyboards/atreus/keymaps/xk/keymap.c b/keyboards/atreus/keymaps/xk/keymap.c
@@ -302,7 +302,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
         return false;
         break;
       case OSX:
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
         return false;
         break;
     }

diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c
@@ -154,7 +154,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Runs just one time when the keyboard initializes. */
 void eeconfig_init_keymap( void ) {
-  set_unicode_input_mode( UC_OSX );
+  set_unicode_input_mode( UC_MAC );
 };
 
 bool process_record_keymap( uint16_t keycode, keyrecord_t *record ) {

diff --git a/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c b/keyboards/converter/ibm_terminal/keymaps/priyadi/keymap.c
@@ -289,7 +289,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
     case OS_MAC:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
       return false;
       break;
 

diff --git a/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h b/keyboards/dztech/dz65rgb/keymaps/catrielmuller/config.h
@@ -1,3 +1,3 @@
 #define LEADER_TIMEOUT 300
 #define FORCE_NKRO
-#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -606,7 +606,7 @@ void led_set_unicode_input_mode(void) {
     case UC_LNX:
       rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
       break;
-    case UC_OSX:
+    case UC_MAC:
       rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
       break;
     case UC_WIN:
@@ -1213,7 +1213,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
     case OSX:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif

diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -609,7 +609,7 @@ void led_set_unicode_input_mode(void) {
     case UC_LNX:
       rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
       break;
-    case UC_OSX:
+    case UC_MAC:
       rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
       break;
     case UC_WIN:
@@ -1216,7 +1216,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       return false;
       break;
     case OSX:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
 #ifdef RGBSPS_ENABLE
       led_set_unicode_input_mode();
 #endif

diff --git a/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c b/keyboards/kbdfans/kbd67/hotswap/keymaps/zunger/keymap.c
@@ -161,7 +161,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void eeconfig_init_user(void) {
-  set_unicode_input_mode(UC_OSX);
+  set_unicode_input_mode(UC_MAC);
 }
 
 void matrix_init_user(void) {

diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/config.h
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX, UC_OSX
+#define UNICODE_SELECTED_MODES UC_WINC, UC_WIN, UC_LNX, UC_MAC
 #define UNICODE_CYCLE_PERSIST false
 
 #ifdef RGB_DI_PIN

diff --git a/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md b/keyboards/kprepublic/bm43hsrgb/keymaps/bitstarr/readme.md
@@ -88,7 +88,7 @@ UNI Layer
 * Umlauts
 * Punctuation
 * Special Characters
-* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UC_WINC, UC_WIN, UC_LNX, UC_OSX)
+* Switching [Input Modes](https://beta.docs.qmk.fm/using-qmk/software-features/feature_unicode#2-input-modes-id-input-modes) (UC_WINC, UC_WIN, UC_LNX, UC_MAC)
 
 ## 5 UNI2 Layer
 ```

diff --git a/keyboards/lets_split/keymaps/xk/keymap.c b/keyboards/lets_split/keymaps/xk/keymap.c
@@ -358,7 +358,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
     return false;
     break;
   case OSX:
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
     return false;
     break;
    }

diff --git a/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
@@ -65,7 +65,7 @@ void matrix_scan_user(void) {
     }
     //tableflip (LEADER - TF)
     SEQ_TWO_KEYS(KC_T, KC_F) {
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
         send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
     }
     //screencap (LEADER - SC)
@@ -74,7 +74,7 @@ void matrix_scan_user(void) {
     }
     //screencap (LEADER - TM)
     SEQ_TWO_KEYS(KC_T, KC_M) {
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
         register_unicode(0x2122); // ™
     }
     /*

diff --git a/keyboards/planck/keymaps/buhearns/config.h b/keyboards/planck/keymaps/buhearns/config.h
@@ -2,7 +2,7 @@
 
 #ifdef AUDIO_ENABLE
   #define STARTUP_SONG      SONG(MARIO_MUSHROOM)
-  #define UNICODE_SONG_OSX  SONG(COIN_SOUND)
+  #define UNICODE_SONG_MAC  SONG(COIN_SOUND)
   #define UNICODE_SONG_LNX  SONG(UNICODE_LINUX)
   #define UNICODE_SONG_WIN  SONG(UNICODE_WINDOWS)
   #define UNICODE_SONG_WINC SONG(UNICODE_WINDOWS)

diff --git a/keyboards/planck/keymaps/luke/keymap.c b/keyboards/planck/keymaps/luke/keymap.c
@@ -325,7 +325,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
       set_unicode_input_mode(UC_LNX);
       break;
     case M_OSX:
-      set_unicode_input_mode(UC_OSX);
+      set_unicode_input_mode(UC_MAC);
       break;
     case M_FUNCTION:
       if (record->event.pressed) {

diff --git a/keyboards/planck/keymaps/snowkuma/keymap.c b/keyboards/planck/keymaps/snowkuma/keymap.c
@@ -369,5 +369,5 @@ void matrix_scan_user(void) {
 }
 
 void matrix_init_user(void) {
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
 }
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/config.h b/keyboards/spaceman/2_milk/keymaps/emoji/config.h
@@ -1,2 +1,2 @@
-#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
 #define TAPPING_TERM 300
diff --git a/keyboards/spaceman/2_milk/keymaps/emoji/readme.md b/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
@@ -16,7 +16,7 @@ You can change it permanently tapping 2 times the KeyOne to select the next mode
 
 ## Unicode Mode List
 - UC_LNX
-- UC_OSX
+- UC_MAC
 - UC_WIN
 - UC_WINC
 

diff --git a/keyboards/yatara/drink_me/keymaps/queen/config.h b/keyboards/yatara/drink_me/keymaps/queen/config.h
@@ -1 +1 @@
-#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC
diff --git a/keyboards/yatara/drink_me/keymaps/queen/keymap.c b/keyboards/yatara/drink_me/keymaps/queen/keymap.c
@@ -23,7 +23,7 @@ void td_diamond_osx (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_unicode(0x2666); // ♦
     } else {
-        set_unicode_input_mode(UC_OSX);
+        set_unicode_input_mode(UC_MAC);
     }
     reset_tap_dance(state);
 }

diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
@@ -49,15 +49,6 @@
 #    define UNICODE_TYPE_DELAY 10
 #endif
 
-// Deprecated aliases
-#if !defined(UNICODE_KEY_MAC) && defined(UNICODE_KEY_OSX)
-#    define UNICODE_KEY_MAC UNICODE_KEY_OSX
-#endif
-#if !defined(UNICODE_SONG_MAC) && defined(UNICODE_SONG_OSX)
-#    define UNICODE_SONG_MAC UNICODE_SONG_OSX
-#endif
-#define UC_OSX UC_MAC
-
 enum unicode_input_modes {
     UC_MAC,   // macOS using Unicode Hex Input
     UC_LNX,   // Linux using IBus

diff --git a/users/arkag/arkag.c b/users/arkag/arkag.c
@@ -190,7 +190,7 @@ void set_os (uint8_t os, bool update) {
   }
   switch (os) {
   case OS_MAC:
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
     underglow = (Color){ 213, 255, 255 };
     break;
   case OS_WIN:

diff --git a/users/sigma/sigma.c b/users/sigma/sigma.c
@@ -67,7 +67,7 @@ void set_os(uint8_t os) {
 #if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
   switch (os) {
   case _OS_MACOS:
-    set_unicode_input_mode(UC_OSX);
+    set_unicode_input_mode(UC_MAC);
     break;
   case _OS_LINUX:
     set_unicode_input_mode(UC_LNX);
-Original file line number
+Diff line change
@@ Expand Up @@
     ## Unicode Mode List
     - UC_LNX
-    - UC_OSX
+    - UC_MAC
     - UC_WIN
     - UC_WINC
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
		#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WIN, UC_WINC