From 7c49b8caa989b34886847689d992827eeaa9c895 Mon Sep 17 00:00:00 2001
From: Joshua Diamond <josh@windowoffire.com>
Date: Mon, 12 Sep 2022 16:32:52 -0400
Subject: Adapt to unicode refactoring (#18345)

---
 users/spidey3/rules.mk          |  2 +-
 users/spidey3/spidey3.h         |  2 +-
 users/spidey3/spidey3_unicode.c | 28 ++++++++++++++++++++++++++++
 users/spidey3/spidey3_unicode.h | 31 +++++++++++++++++++++++++++++++
 users/spidey3/unicode.c         | 28 ----------------------------
 users/spidey3/unicode.h         | 31 -------------------------------
 6 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 users/spidey3/spidey3_unicode.c
 create mode 100644 users/spidey3/spidey3_unicode.h
 delete mode 100644 users/spidey3/unicode.c
 delete mode 100644 users/spidey3/unicode.h

(limited to 'users')

diff --git a/users/spidey3/rules.mk b/users/spidey3/rules.mk
index c95582e176..35cfdb4187 100644
--- a/users/spidey3/rules.mk
+++ b/users/spidey3/rules.mk
@@ -11,5 +11,5 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
   SRC += layer_rgb.c
 endif
 ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
-  SRC += unicode.c
+  SRC += spidey3_unicode.c
 endif
diff --git a/users/spidey3/spidey3.h b/users/spidey3/spidey3.h
index 7a9407969e..e344b08895 100644
--- a/users/spidey3/spidey3.h
+++ b/users/spidey3/spidey3.h
@@ -6,7 +6,7 @@
 #include QMK_KEYBOARD_H
 
 #ifdef UNICODEMAP_ENABLE
-#    include "unicode.h"
+#    include "spidey3_unicode.h"
 #endif
 
 enum userspace_layers {
diff --git a/users/spidey3/spidey3_unicode.c b/users/spidey3/spidey3_unicode.c
new file mode 100644
index 0000000000..c2804d8805
--- /dev/null
+++ b/users/spidey3/spidey3_unicode.c
@@ -0,0 +1,28 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include "spidey3_unicode.h"
+
+const uint32_t PROGMEM unicode_map[] = {
+    [BUL1]     = 0x2022,   // •
+    [BUL2]     = 0x25E6,   // ◦
+    [LARR]     = 0x2190,   // ←
+    [RARR]     = 0x2192,   // →
+    [ENDASH]   = 0x2013,   // –
+    [EMDASH]   = 0x2014,   // —
+    [SPIDER]   = 0x1F577,  // 🕷
+    [SAD]      = 0x2639,   // ☹
+    [MEH]      = 0x1F611,  // 😑
+    [HAPPY]    = 0x1F600,  // 😀
+    [ANGRY]    = 0x1F620,  // 😠
+    [THUMBUP]  = 0x1F44D,  // 👍
+    [THUMBDN]  = 0x1F44E,  // 👎
+    [LOL]      = 0x1F602,  // 😂
+    [SURPRISE] = 0x1F62E,  // 😮
+};
+
+void eeconfig_init_user_unicode(void) {
+    // Default to Linux style
+    set_unicode_input_mode(UC_LNX);
+}
diff --git a/users/spidey3/spidey3_unicode.h b/users/spidey3/spidey3_unicode.h
new file mode 100644
index 0000000000..ee8e00056c
--- /dev/null
+++ b/users/spidey3/spidey3_unicode.h
@@ -0,0 +1,31 @@
+// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+#ifdef UNICODEMAP_ENABLE
+
+enum unicode_names {
+    BUL1,
+    BUL2,
+    LARR,
+    RARR,
+    ENDASH,
+    EMDASH,
+    SPIDER,
+    SAD,
+    MEH,
+    HAPPY,
+    ANGRY,
+    THUMBUP,
+    THUMBDN,
+    LOL,
+    SURPRISE,
+};
+
+#    define X_BUL (XP(BUL1, BUL2))
+#    define X_DASH (XP(EMDASH, ENDASH))
+
+#endif
diff --git a/users/spidey3/unicode.c b/users/spidey3/unicode.c
deleted file mode 100644
index 5292b0809b..0000000000
--- a/users/spidey3/unicode.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-
-#include "unicode.h"
-
-const uint32_t PROGMEM unicode_map[] = {
-    [BUL1]     = 0x2022,   // •
-    [BUL2]     = 0x25E6,   // ◦
-    [LARR]     = 0x2190,   // ←
-    [RARR]     = 0x2192,   // →
-    [ENDASH]   = 0x2013,   // –
-    [EMDASH]   = 0x2014,   // —
-    [SPIDER]   = 0x1F577,  // 🕷
-    [SAD]      = 0x2639,   // ☹
-    [MEH]      = 0x1F611,  // 😑
-    [HAPPY]    = 0x1F600,  // 😀
-    [ANGRY]    = 0x1F620,  // 😠
-    [THUMBUP]  = 0x1F44D,  // 👍
-    [THUMBDN]  = 0x1F44E,  // 👎
-    [LOL]      = 0x1F602,  // 😂
-    [SURPRISE] = 0x1F62E,  // 😮
-};
-
-void eeconfig_init_user_unicode(void) {
-    // Default to Linux style
-    set_unicode_input_mode(UC_LNX);
-}
diff --git a/users/spidey3/unicode.h b/users/spidey3/unicode.h
deleted file mode 100644
index ee8e00056c..0000000000
--- a/users/spidey3/unicode.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2022 Joshua Diamond josh@windowoffire.com (@spidey3)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include QMK_KEYBOARD_H
-
-#ifdef UNICODEMAP_ENABLE
-
-enum unicode_names {
-    BUL1,
-    BUL2,
-    LARR,
-    RARR,
-    ENDASH,
-    EMDASH,
-    SPIDER,
-    SAD,
-    MEH,
-    HAPPY,
-    ANGRY,
-    THUMBUP,
-    THUMBDN,
-    LOL,
-    SURPRISE,
-};
-
-#    define X_BUL (XP(BUL1, BUL2))
-#    define X_DASH (XP(EMDASH, ENDASH))
-
-#endif
-- 
cgit v1.2.3