From e4f4ceaf3f2e3d25fb282273a81f9b58790fc427 Mon Sep 17 00:00:00 2001
From: lokher <lokher@gmail.com>
Date: Wed, 26 Apr 2023 16:32:15 +0800
Subject: merge upstream 713427c

---
 users/uqs/uqs.c | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

(limited to 'users/uqs/uqs.c')

diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c
index 82cf70c439..83733bbe2a 100644
--- a/users/uqs/uqs.c
+++ b/users/uqs/uqs.c
@@ -534,49 +534,42 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef LEADER_ENABLE
-LEADER_EXTERNS();
-
-void matrix_scan_user(void) {
-  LEADER_DICTIONARY() {
-    leading = false;
-    leader_end();
-
+void leader_end_user(void) {
 #ifdef UCIS_ENABLE
-    SEQ_ONE_KEY(KC_U) {
-      qk_ucis_start();
+    if (leader_sequence_one_key(KC_U)) {
+        ucis_start();
     }
 #endif
-    SEQ_ONE_KEY(KC_H) {
-      send_unicode_string("ᕕ( ᐛ )ᕗ");  // happy
+    if (leader_sequence_one_key(KC_H)) {
+        send_unicode_string("ᕕ( ᐛ )ᕗ");  // happy
     }
-    SEQ_ONE_KEY(KC_D) {
-      send_unicode_string("ಠ_ಠ");  // disapproval
+    if (leader_sequence_one_key(KC_D)) {
+        send_unicode_string("ಠ_ಠ");  // disapproval
     }
-    SEQ_ONE_KEY(KC_L) {
-      send_unicode_string("( ͡° ͜ʖ ͡°)");  // lenny
+    if (leader_sequence_one_key(KC_L)) {
+        send_unicode_string("( ͡° ͜ʖ ͡°)");  // lenny
     }
-    SEQ_ONE_KEY(KC_S) {
-      send_unicode_string("¯\\_(ツ)_/¯");  // shrug
+    if (leader_sequence_one_key(KC_S)) {
+        send_unicode_string("¯\\_(ツ)_/¯");  // shrug
     }
     // tableflip (LEADER - TF)
-    SEQ_TWO_KEYS(KC_T, KC_F) {
-      //set_unicode_input_mode(UNICODE_MODE_LINUX);
-      //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
-      send_unicode_string("(╯°□°）╯︵ ┻━┻");
+    if (leader_sequence_two_keys(KC_T, KC_F)) {
+        //set_unicode_input_mode(UNICODE_MODE_LINUX);
+        //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+        send_unicode_string("(╯°□°）╯︵ ┻━┻");
     }
     // untableflip
-    SEQ_THREE_KEYS(KC_U, KC_T, KC_F) {
-      //set_unicode_input_mode(UNICODE_MODE_LINUX);
-      //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
-      send_unicode_string("┬─┬ノ( º _ ºノ)");
+    if (leader_sequence_three_keys(KC_U, KC_T, KC_F)) {
+        //set_unicode_input_mode(UNICODE_MODE_LINUX);
+        //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+        send_unicode_string("┬─┬ノ( º _ ºノ)");
     }
-  }
 }
 #endif
 
 #ifdef UCIS_ENABLE
 // 3 codepoints at most, otherwise increase UCIS_MAX_CODE_POINTS
-const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE(
+const ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE(
     UCIS_SYM("poop", 0x1F4A9),                // 💩
     UCIS_SYM("rofl", 0x1F923),                // 🤣
     UCIS_SYM("look", 0x0CA0, 0x005F, 0x0CA0)  // ಠ_ಠ
-- 
cgit v1.2.3