merge upstream 713427c

1 files changed, 6 insertions, 6 deletions

diff --git a/users/losinggeneration/losinggeneration-keymap.h b/users/losinggeneration/losinggeneration-keymap.h
index bb1c6cf697..14e25adecc 100644
--- a/users/losinggeneration/losinggeneration-keymap.h
+++ b/users/losinggeneration/losinggeneration-keymap.h
@@ -17,7 +17,7 @@ enum tap_dance_keycodes {
   Used to indicate a CTRL should be pressed on one press, or CTRL+ALT on
   a double tap
 */
-void dance_ctl_ctlalt_each(qk_tap_dance_state_t *state, void *user_data) {
+void dance_ctl_ctlalt_each(tap_dance_state_t *state, void *user_data) {
   register_code(KC_LCTL);
   if(state->count > 1) {
     register_code(KC_LALT);
@@ -25,7 +25,7 @@ void dance_ctl_ctlalt_each(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 /* Used to release CTRL or the double tapped variant CTRL+ALT */
-void dance_ctl_ctlalt_reset(qk_tap_dance_state_t *state, void *user_data) {
+void dance_ctl_ctlalt_reset(tap_dance_state_t *state, void *user_data) {
   unregister_code(KC_LCTL);
   if(state->count > 1) {
     unregister_code(KC_LALT);
@@ -37,7 +37,7 @@ void dance_ctl_ctlalt_reset(qk_tap_dance_state_t *state, void *user_data) {
   Each is used to make sure ADJUST activates as soon as it's pressed the first
   time.
 */
-void dance_adj_each(qk_tap_dance_state_t *state, void *user_data) {
+void dance_adj_each(tap_dance_state_t *state, void *user_data) {
   if(state->count == 1) {
     layer_on(_ADJUST);
   } else {
@@ -46,7 +46,7 @@ void dance_adj_each(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 /* Set NUMPAD layer on second tap and MOUSE layer on 3rd */
-void dance_adj_finish(qk_tap_dance_state_t *state, void *user_data) {
+void dance_adj_finish(tap_dance_state_t *state, void *user_data) {
   switch(state->count) {
     case 1: break;
     case 2:
@@ -62,7 +62,7 @@ void dance_adj_finish(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 /* Turn off any layer that may have been tapped on */
-void dance_adj_reset(qk_tap_dance_state_t *state, void *user_data) {
+void dance_adj_reset(tap_dance_state_t *state, void *user_data) {
   switch(state->count) {
     case 1:
       layer_off(_ADJUST);
@@ -76,7 +76,7 @@ void dance_adj_reset(qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
   [TD_CTL_CTLALT] = ACTION_TAP_DANCE_FN_ADVANCED(dance_ctl_ctlalt_each, NULL, dance_ctl_ctlalt_reset),
   [TD_LGUI_RGUI]  = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, KC_RGUI),
   [TD_LALT_RALT]  = ACTION_TAP_DANCE_DOUBLE(KC_LALT, KC_RALT),