From bd67849c03a13b2a12d35fb068d30eb0f8ea3cc9 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 14 Aug 2017 16:03:05 +0200 Subject: Refactor out wlr_tablet_tool_state --- include/wlr/interfaces/wlr_tablet_tool.h | 6 +++--- include/wlr/types/wlr_tablet_tool.h | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/wlr/interfaces/wlr_tablet_tool.h b/include/wlr/interfaces/wlr_tablet_tool.h index cd326878..43a24fd0 100644 --- a/include/wlr/interfaces/wlr_tablet_tool.h +++ b/include/wlr/interfaces/wlr_tablet_tool.h @@ -3,11 +3,11 @@ #include struct wlr_tablet_tool_impl { - void (*destroy)(struct wlr_tablet_tool_state *tool); + void (*destroy)(struct wlr_tablet_tool *tool); }; -struct wlr_tablet_tool *wlr_tablet_tool_create(struct wlr_tablet_tool_impl *impl, - struct wlr_tablet_tool_state *state); +void wlr_tablet_tool_init(struct wlr_tablet_tool *tool, + struct wlr_tablet_tool_impl *impl); void wlr_tablet_tool_destroy(struct wlr_tablet_tool *tool); #endif diff --git a/include/wlr/types/wlr_tablet_tool.h b/include/wlr/types/wlr_tablet_tool.h index f99cd065..dcb9c191 100644 --- a/include/wlr/types/wlr_tablet_tool.h +++ b/include/wlr/types/wlr_tablet_tool.h @@ -5,11 +5,9 @@ #include struct wlr_tablet_tool_impl; -struct wlr_tablet_tool_state; struct wlr_tablet_tool { struct wlr_tablet_tool_impl *impl; - struct wlr_tablet_tool_state *state; struct { struct wl_signal axis; -- cgit v1.2.3