From 53d1eefa1c8ebb4dab0d464c5544f7a25560b73e Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Sat, 25 Feb 2023 13:01:36 +0300 Subject: [PATCH] test: remove support for the deprecated button type field --- ratbagd/ratbagd-test.c | 3 +-- src/driver-test.c | 3 --- src/libratbag-test.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ratbagd/ratbagd-test.c b/ratbagd/ratbagd-test.c index 5a0db424..66d3e6a7 100644 --- a/ratbagd/ratbagd-test.c +++ b/ratbagd/ratbagd-test.c @@ -88,8 +88,7 @@ static const struct ratbag_test_device default_device_descr = { { .name = NULL, .buttons = { - { .button_type = RATBAG_BUTTON_TYPE_LEFT, - .action_type = RATBAG_BUTTON_ACTION_TYPE_BUTTON, + { .action_type = RATBAG_BUTTON_ACTION_TYPE_BUTTON, .button = 0 }, }, .resolutions = { diff --git a/src/driver-test.c b/src/driver-test.c index 440acc8b..65a3cfce 100644 --- a/src/driver-test.c +++ b/src/driver-test.c @@ -51,9 +51,6 @@ test_read_button(struct ratbag_button *button) struct ratbag_test_macro_event *e; int idx; - /* Only take the button types from the first profile */ - button->type = d->profiles[0].buttons[button->index].button_type; - switch (b->action_type) { case RATBAG_BUTTON_ACTION_TYPE_NONE: button->action.type = RATBAG_BUTTON_ACTION_TYPE_NONE; diff --git a/src/libratbag-test.h b/src/libratbag-test.h index 93c66841..cc730455 100644 --- a/src/libratbag-test.h +++ b/src/libratbag-test.h @@ -39,7 +39,6 @@ struct ratbag_test_macro_event { }; struct ratbag_test_button { - enum ratbag_button_type button_type; enum ratbag_button_action_type action_type; union { int button;