merge upstream 713427c

1 files changed, 11 insertions, 11 deletions

diff --git a/users/danielo515/tap_dance.h b/users/danielo515/tap_dance.h
index 880ad525ee..aaf3864841 100644
--- a/users/danielo515/tap_dance.h
+++ b/users/danielo515/tap_dance.h
@@ -4,8 +4,8 @@ extern bool onMac;
 
 
 #define ACTION_TAP_DANCE_DOUBLE_SAFE(kc1, kc2) { \
-    .fn = { NULL, qk_tap_dance_pair_finished_safe, qk_tap_dance_pair_reset_safe }, \
-    .user_data = (void *)&((qk_tap_dance_pair_t) { kc1, kc2 }),  \
+    .fn = { NULL, tap_dance_pair_finished_safe, tap_dance_pair_reset_safe }, \
+    .user_data = (void *)&((tap_dance_pair_t) { kc1, kc2 }),  \
   }
 
 #ifdef QUAD_DANCE
@@ -18,7 +18,7 @@ enum {
   DOUBLE_SINGLE_TAP = 5 //send SINGLE_TAP twice - NOT DOUBLE_TAP
   // Add more enums here if you want for triple, quadruple, etc.
 };
-int cur_dance (qk_tap_dance_state_t *state);
+int cur_dance (tap_dance_state_t *state);
 # endif
 
 enum tap_dance {
@@ -48,14 +48,14 @@ enum tap_dance {
   _TD_CUT,
   _TD_PASTE,
 };
-void qk_tap_dance_pair_finished_safe(qk_tap_dance_state_t *state, void *user_data);
-void qk_tap_dance_pair_reset_safe(qk_tap_dance_state_t *state, void *user_data);
-void td_copy_cut (qk_tap_dance_state_t *state, void *user_data);
-void td_paste(qk_tap_dance_state_t *state, void *user_data);
-int cur_dance (qk_tap_dance_state_t *state);
-void dance_cut (qk_tap_dance_state_t *state, void *user_data);
-void dance_copy (qk_tap_dance_state_t *state, void *user_data);
-void dance_paste (qk_tap_dance_state_t *state, void *user_data);
+void tap_dance_pair_finished_safe(tap_dance_state_t *state, void *user_data);
+void tap_dance_pair_reset_safe(tap_dance_state_t *state, void *user_data);
+void td_copy_cut (tap_dance_state_t *state, void *user_data);
+void td_paste(tap_dance_state_t *state, void *user_data);
+int cur_dance (tap_dance_state_t *state);
+void dance_cut (tap_dance_state_t *state, void *user_data);
+void dance_copy (tap_dance_state_t *state, void *user_data);
+void dance_paste (tap_dance_state_t *state, void *user_data);
 
 // Ready to use Tap dance definitions, just put them on your layout
 #define TD_COPY TD(_TD_COPY)