diff --git a/clutter/clutter/clutter-deprecated.h b/clutter/clutter/clutter-deprecated.h index db41951dd..c26c68175 100644 --- a/clutter/clutter/clutter-deprecated.h +++ b/clutter/clutter/clutter-deprecated.h @@ -16,7 +16,6 @@ #include "deprecated/clutter-cairo-texture.h" #include "deprecated/clutter-container.h" #include "deprecated/clutter-group.h" -#include "deprecated/clutter-input-device.h" #include "deprecated/clutter-keysyms.h" #include "deprecated/clutter-main.h" #include "deprecated/clutter-rectangle.h" diff --git a/clutter/clutter/deprecated/clutter-input-device-deprecated.c b/clutter/clutter/deprecated/clutter-input-device-deprecated.c deleted file mode 100644 index 8df5cf598..000000000 --- a/clutter/clutter/deprecated/clutter-input-device-deprecated.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "clutter-build-config.h" - -#include - -#define CLUTTER_DISABLE_DEPRECATION_WARNINGS - -#include "clutter-device-manager-private.h" -#include "deprecated/clutter-input-device.h" - -/** - * clutter_input_device_get_device_coords: - * @device: a #ClutterInputDevice of type %CLUTTER_POINTER_DEVICE - * @x: (out): return location for the X coordinate - * @y: (out): return location for the Y coordinate - * - * Retrieves the latest coordinates of the pointer of @device - * - * Since: 1.2 - * - * Deprecated: 1.12: Use clutter_input_device_get_coords() instead. - */ -void -clutter_input_device_get_device_coords (ClutterInputDevice *device, - gint *x, - gint *y) -{ - ClutterPoint point; - - clutter_input_device_get_coords (device, NULL, &point); - - if (x) - *x = point.x; - - if (y) - *y = point.y; -} diff --git a/clutter/clutter/deprecated/clutter-input-device.h b/clutter/clutter/deprecated/clutter-input-device.h deleted file mode 100644 index 447e1a7f2..000000000 --- a/clutter/clutter/deprecated/clutter-input-device.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Clutter. - * - * An OpenGL based 'interactive canvas' library. - * - * Copyright © 2009, 2010, 2011 Intel Corp. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Author: Emmanuele Bassi - */ -#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __CLUTTER_INPUT_DEVICE_DEPRECATED_H__ -#define __CLUTTER_INPUT_DEVICE_DEPRECATED_H__ - -#include - -G_BEGIN_DECLS - -CLUTTER_DEPRECATED_FOR(clutter_input_device_get_coords) -void clutter_input_device_get_device_coords (ClutterInputDevice *device, - gint *x, - gint *y); - -G_END_DECLS - -#endif /* __CLUTTER_INPUT_DEVICE_DEPRECATED_H__ */ diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build index 63540ec31..05de6f21d 100644 --- a/clutter/clutter/meson.build +++ b/clutter/clutter/meson.build @@ -229,7 +229,6 @@ clutter_deprecated_headers = [ 'deprecated/clutter-cairo-texture.h', 'deprecated/clutter-container.h', 'deprecated/clutter-group.h', - 'deprecated/clutter-input-device.h', 'deprecated/clutter-keysyms.h', 'deprecated/clutter-main.h', 'deprecated/clutter-rectangle.h', @@ -252,7 +251,6 @@ clutter_deprecated_sources = [ 'deprecated/clutter-box.c', 'deprecated/clutter-cairo-texture.c', 'deprecated/clutter-group.c', - 'deprecated/clutter-input-device-deprecated.c', 'deprecated/clutter-layout-manager-deprecated.c', 'deprecated/clutter-rectangle.c', 'deprecated/clutter-state.c',