From 0c8beb6b9c767ddad3cf5a5171bf546b986d4f93 Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Sat, 25 Feb 2023 13:14:56 +0300 Subject: [PATCH] libratbag: remove support for the deprecated button type field --- src/libratbag-enums.h | 45 ----------------------------------------- src/libratbag-private.h | 1 - src/libratbag.c | 1 - 3 files changed, 47 deletions(-) diff --git a/src/libratbag-enums.h b/src/libratbag-enums.h index 2d492d38..33282f1e 100644 --- a/src/libratbag-enums.h +++ b/src/libratbag-enums.h @@ -145,51 +145,6 @@ enum ratbag_resolution_capability { RATBAG_RESOLUTION_CAP_DISABLE, }; -/** - * @ingroup enums - * - * Button types describing the physical button. - * - * This enum is deprecated and should not be used. - * - * @deprecated - */ -enum ratbag_button_type { - RATBAG_BUTTON_TYPE_UNKNOWN = 0, - - /* mouse buttons */ - RATBAG_BUTTON_TYPE_LEFT, - RATBAG_BUTTON_TYPE_MIDDLE, - RATBAG_BUTTON_TYPE_RIGHT, - RATBAG_BUTTON_TYPE_THUMB, - RATBAG_BUTTON_TYPE_THUMB2, - RATBAG_BUTTON_TYPE_THUMB3, - RATBAG_BUTTON_TYPE_THUMB4, - RATBAG_BUTTON_TYPE_WHEEL_LEFT, - RATBAG_BUTTON_TYPE_WHEEL_RIGHT, - RATBAG_BUTTON_TYPE_WHEEL_CLICK, - RATBAG_BUTTON_TYPE_WHEEL_UP, - RATBAG_BUTTON_TYPE_WHEEL_DOWN, - /** - * A button to toggle the wheel from free-spinning to click-based. - */ - RATBAG_BUTTON_TYPE_WHEEL_RATCHET_MODE_SHIFT, - RATBAG_BUTTON_TYPE_EXTRA, - RATBAG_BUTTON_TYPE_SIDE, - RATBAG_BUTTON_TYPE_PINKIE, - RATBAG_BUTTON_TYPE_PINKIE2, - - /* DPI switch */ - RATBAG_BUTTON_TYPE_RESOLUTION_CYCLE_UP, - RATBAG_BUTTON_TYPE_RESOLUTION_UP, - RATBAG_BUTTON_TYPE_RESOLUTION_DOWN, - - /* Profile */ - RATBAG_BUTTON_TYPE_PROFILE_CYCLE_UP, - RATBAG_BUTTON_TYPE_PROFILE_UP, - RATBAG_BUTTON_TYPE_PROFILE_DOWN, -}; - /** * @ingroup enums * diff --git a/src/libratbag-private.h b/src/libratbag-private.h index 57684805..80ce773d 100644 --- a/src/libratbag-private.h +++ b/src/libratbag-private.h @@ -353,7 +353,6 @@ struct ratbag_button { struct list link; struct ratbag_profile *profile; unsigned index; - enum ratbag_button_type type; struct ratbag_button_action action; uint32_t action_caps; bool dirty; /* changed since last commit to device */ diff --git a/src/libratbag.c b/src/libratbag.c index dbc7d006..647f1c75 100644 --- a/src/libratbag.c +++ b/src/libratbag.c @@ -655,7 +655,6 @@ ratbag_create_button(struct ratbag_profile *profile, unsigned int index) button->refcount = 0; button->profile = profile; button->index = index; - button->type = RATBAG_BUTTON_TYPE_UNKNOWN; list_append(&profile->buttons, &button->link);