GdkDevice: Remove duplicate private function

_gdk_device_get_axis_use() dates back to pre-sealing, when the
xi2 work began, this remaining can be gone with a public
gdk_device_get_axis_use() function already in place.

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 227c75c9d28d4c23e1a918b7d1a57aee7eb0812f..0d3c04054d2dc760c795d550e86eb7ad3402c702 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -1400,16 +1400,6 @@ find_axis_info (GArray     *array,
   return NULL;
 }
 
-GdkAxisUse
-_gdk_device_get_axis_use (GdkDevice *device,
-                          guint      index_)
-{
-  GdkAxisInfo info;
-
-  info = g_array_index (device->axes, GdkAxisInfo, index_);
-  return info.use;
-}
-
 gboolean
 _gdk_device_translate_window_coord (GdkDevice *device,
                                     GdkWindow *window,

diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 8816576b536235421bce8004616045711ea3590a..e317b16c1e7e3e43c95f4e3290a27c0fdbc7789c 100644 (file)
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -127,9 +127,6 @@ guint _gdk_device_add_axis   (GdkDevice   *device,
 void _gdk_device_set_keys    (GdkDevice   *device,
                               guint        num_keys);
 
-GdkAxisUse _gdk_device_get_axis_use (GdkDevice *device,
-                                     guint      index);
-
 gboolean   _gdk_device_translate_window_coord (GdkDevice *device,
                                                GdkWindow *window,
                                                guint      index,

diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c
index 351105fe0c631a4ddc35ecdbd8fe7bd208037416..def7945d25425bbe45a6b5d561e1bf5e66a31841 100644 (file)
--- a/gdk/win32/gdkdevice-wintab.c
+++ b/gdk/win32/gdkdevice-wintab.c
@@ -326,7 +326,7 @@ _gdk_device_wintab_translate_axes (GdkDeviceWintab *device_wintab,
     {
       GdkAxisUse use;
 
-      use = _gdk_device_get_axis_use (device, i);
+      use = gdk_device_get_axis_use (device, i);
 
       switch (use)
         {

diff --git a/gdk/x11/gdkdevice-xi.c b/gdk/x11/gdkdevice-xi.c
index ae0f7270c812298f0fdef092a9de88c16bc3cb1b..16ef3bd116c287d9cf292200ebc69b3f814e170a 100644 (file)
--- a/gdk/x11/gdkdevice-xi.c
+++ b/gdk/x11/gdkdevice-xi.c
@@ -613,7 +613,7 @@ _gdk_x11_device_xi_translate_axes (GdkDevice *device,
     {
       GdkAxisUse use;
 
-      use = _gdk_device_get_axis_use (device, i);
+      use = gdk_device_get_axis_use (device, i);
 
       switch (use)
         {

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 96715df874c39eb9eaff3c31a7f7874b4a6f506a..d56f8fa4b9387182f511b3dbfdfd5f282564be6d 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -205,7 +205,7 @@ gdk_x11_device_xi2_get_state (GdkDevice       *device,
             continue;
 
           value = ((XIValuatorClassInfo *) class_info)->value;
-          use = _gdk_device_get_axis_use (device, j);
+          use = gdk_device_get_axis_use (device, j);
 
           switch (use)
             {

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 13fd401a8078b6728f5624f17277ac81caf90d69..8b0ceb4e424df5dc61226fc904619a4ba48f3727 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -823,7 +823,7 @@ translate_axes (GdkDevice       *device,
       if (!XIMaskIsSet (valuators->mask, i))
         continue;
 
-      use = _gdk_device_get_axis_use (device, i);
+      use = gdk_device_get_axis_use (device, i);
       val = *vals++;
 
       switch (use)