[PATCH libinput 06/14] tablet: rename tool_proximity_state to tablet_tool_proximity state

[Peter Hutterer]

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/libinput-private.h | 2 +-
 src/libinput.c         | 6 +++---
 src/libinput.h         | 4 ++--
 tools/event-debug.c    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libinput-private.h b/src/libinput-private.h
index 394fd9b..a1f66b1 100644
--- a/src/libinput-private.h
+++ b/src/libinput-private.h
@@ -473,7 +473,7 @@ void
 tablet_notify_proximity(struct libinput_device *device,
 			uint64_t time,
 			struct libinput_tablet_tool *tool,
-			enum libinput_tool_proximity_state state,
+			enum libinput_tablet_tool_proximity_state state,
 			unsigned char *changed_axes,
 			double *axes);
 
diff --git a/src/libinput.c b/src/libinput.c
index bef02bb..ab98d63 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -136,7 +136,7 @@ struct libinput_event_tablet {
 	double deltas_discrete[LIBINPUT_TABLET_TOOL_AXIS_MAX + 1];
 	unsigned char changed_axes[NCHARS(LIBINPUT_TABLET_TOOL_AXIS_MAX + 1)];
 	struct libinput_tablet_tool *tool;
-	enum libinput_tool_proximity_state proximity_state;
+	enum libinput_tablet_tool_proximity_state proximity_state;
 	enum libinput_tool_tip_state tip_state;
 };
 
@@ -1075,7 +1075,7 @@ libinput_event_tablet_get_tool(struct libinput_event_tablet *event)
 	return event->tool;
 }
 
-LIBINPUT_EXPORT enum libinput_tool_proximity_state
+LIBINPUT_EXPORT enum libinput_tablet_tool_proximity_state
 libinput_event_tablet_get_proximity_state(struct libinput_event_tablet *event)
 {
 	require_event_type(libinput_event_get_context(&event->base),
@@ -2011,7 +2011,7 @@ void
 tablet_notify_proximity(struct libinput_device *device,
 			uint64_t time,
 			struct libinput_tablet_tool *tool,
-			enum libinput_tool_proximity_state proximity_state,
+			enum libinput_tablet_tool_proximity_state proximity_state,
 			unsigned char *changed_axes,
 			double *axes)
 {
diff --git a/src/libinput.h b/src/libinput.h
index b83a6fc..ae3006b 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -211,7 +211,7 @@ enum libinput_tablet_tool_type {
  * surface. On other hardware, the tool is still detectable within a short
  * distance (a few cm) off the surface.
  */
-enum libinput_tool_proximity_state {
+enum libinput_tablet_tool_proximity_state {
 	LIBINPUT_TOOL_PROXIMITY_OUT = 0,
 	LIBINPUT_TOOL_PROXIMITY_IN = 1,
 };
@@ -1523,7 +1523,7 @@ libinput_event_tablet_get_tool(struct libinput_event_tablet *event);
  * @param event The libinput tablet event
  * @return The new proximity state of the tool from the event.
  */
-enum libinput_tool_proximity_state
+enum libinput_tablet_tool_proximity_state
 libinput_event_tablet_get_proximity_state(struct libinput_event_tablet *event);
 
 /**
diff --git a/tools/event-debug.c b/tools/event-debug.c
index e4fe9ab..af67f61 100644
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -458,7 +458,7 @@ print_proximity_event(struct libinput_event *ev)
 {
 	struct libinput_event_tablet *t = libinput_event_get_tablet_event(ev);
 	struct libinput_tablet_tool *tool = libinput_event_tablet_get_tool(t);
-	enum libinput_tool_proximity_state state;
+	enum libinput_tablet_tool_proximity_state state;
 	const char *tool_str,
 	           *state_str;
 
-- 
2.5.0