[PATCH libinput 1/6] Drop deprecated symbols

Peter Hutterer peter.hutterer at who-t.net
Tue Dec 9 16:33:59 PST 2014


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/evdev.c    |  7 -------
 src/libinput.c | 16 ----------------
 src/libinput.h | 27 ---------------------------
 3 files changed, 50 deletions(-)

diff --git a/src/evdev.c b/src/evdev.c
index 0873c99..ad167b2 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1604,13 +1604,6 @@ err:
 	return unhandled_device ? EVDEV_UNHANDLED_DEVICE :  NULL;
 }
 
-int
-evdev_device_get_keys(struct evdev_device *device, char *keys, size_t size)
-{
-	memset(keys, 0, size);
-	return 0;
-}
-
 const char *
 evdev_device_get_output(struct evdev_device *device)
 {
diff --git a/src/libinput.c b/src/libinput.c
index 279cce0..fbefbb3 100644
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1272,22 +1272,6 @@ libinput_device_led_update(struct libinput_device *device,
 }
 
 LIBINPUT_EXPORT int
-libinput_device_get_keys(struct libinput_device *device,
-			 char *keys, size_t size)
-{
-	return evdev_device_get_keys((struct evdev_device *) device,
-				     keys,
-				     size);
-}
-
-LIBINPUT_EXPORT void
-libinput_device_calibrate(struct libinput_device *device,
-			  float calibration[6])
-{
-	evdev_device_calibrate((struct evdev_device *) device, calibration);
-}
-
-LIBINPUT_EXPORT int
 libinput_device_has_capability(struct libinput_device *device,
 			       enum libinput_device_capability capability)
 {
diff --git a/src/libinput.h b/src/libinput.h
index 57d9ded..e2a3eef 100644
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1554,33 +1554,6 @@ libinput_device_led_update(struct libinput_device *device,
 /**
  * @ingroup device
  *
- * Set the bitmask in keys to the bitmask of the keys present on the device
- * (see linux/input.h), up to size characters.
- *
- * @param device A current input device
- * @param keys An array filled with the bitmask for the keys
- * @param size Size of the keys array
- *
- * @return The number of valid bytes in keys, or a negative errno on failure
- */
-int
-libinput_device_get_keys(struct libinput_device *device,
-			 char *keys, size_t size)
-	LIBINPUT_ATTRIBUTE_DEPRECATED;
-
-/**
- * @ingroup device
- *
- * @deprecated Use libinput_device_config_calibration_set_matrix() instead.
- */
-void
-libinput_device_calibrate(struct libinput_device *device,
-			  float calibration[6])
-	LIBINPUT_ATTRIBUTE_DEPRECATED;
-
-/**
- * @ingroup device
- *
  * Check if the given device has the specified capability
  *
  * @return 1 if the given device has the capability or 0 if not
-- 
2.1.0



More information about the wayland-devel mailing list