Drop deprecated symbols

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>

diff --git a/src/evdev.c b/src/evdev.c
index dce035ac42ec671dee15cc727733ffc2f44a06fc..06dd1df1eb617d836d6d76272173a28e84f93e50 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1605,13 +1605,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 279cce0f8d337226232b997dcab3cac372b4b22a..fbefbb38765e5df64e1183d89b1b3ba9417e356b 100644 (file)
--- a/src/libinput.c
+++ b/src/libinput.c
@@ -1271,22 +1271,6 @@ libinput_device_led_update(struct libinput_device *device,
        evdev_device_led_update((struct evdev_device *) device, leds);
 }
 
-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 57d9ded758935a2f1da3a7591dabb2d15bf68f86..e2a3eef025a3a7d94a47ecdee34e2bcd3bb3404a 100644 (file)
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1551,33 +1551,6 @@ void
 libinput_device_led_update(struct libinput_device *device,
                           enum libinput_led leds);
 
-/**
- * @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
  *