From 9786185cc0fe7c2de64a5fbc25ec29879ab3f3ff Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 13 Aug 2020 21:00:36 -0400
Subject: [PATCH] gdk: Clean up gdkdevice.h

This header looked just too disorderly.
Same for gdkdevicetool.h.
---
 gdk/gdkdevice.h     | 70 +++++++++++++++++++--------------------------
 gdk/gdkdevicetool.h | 10 +++----
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index 9501041aa7..16508c27a3 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -78,57 +78,45 @@ struct _GdkTimeCoord
 };
 
 GDK_AVAILABLE_IN_ALL
-GType                 gdk_device_get_type       (void) G_GNUC_CONST;
+GType               gdk_device_get_type                 (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-const char *         gdk_device_get_name       (GdkDevice *device);
+const char *        gdk_device_get_name                 (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL
-gboolean              gdk_device_get_has_cursor (GdkDevice *device);
-
-/* Functions to configure a device */
+const char *        gdk_device_get_vendor_id            (GdkDevice *device);
 GDK_AVAILABLE_IN_ALL
-GdkInputSource gdk_device_get_source (GdkDevice    *device);
+const char *        gdk_device_get_product_id           (GdkDevice *device);
 
 GDK_AVAILABLE_IN_ALL
-GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device,
-                                                 double    *win_x,
-                                                 double    *win_y);
+GdkDisplay *        gdk_device_get_display              (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+GdkSeat *           gdk_device_get_seat                 (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+GdkDeviceTool *     gdk_device_get_device_tool          (GdkDevice *device);
 
 GDK_AVAILABLE_IN_ALL
-GdkDisplay * gdk_device_get_display (GdkDevice      *device);
+GdkInputSource      gdk_device_get_source               (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+gboolean            gdk_device_get_has_cursor           (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+guint               gdk_device_get_num_touches          (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+GdkModifierType     gdk_device_get_modifier_state       (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+PangoDirection      gdk_device_get_direction            (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+gboolean            gdk_device_has_bidi_layouts         (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+gboolean            gdk_device_get_caps_lock_state      (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+gboolean            gdk_device_get_num_lock_state       (GdkDevice *device);
+GDK_AVAILABLE_IN_ALL
+gboolean            gdk_device_get_scroll_lock_state    (GdkDevice *device);
 
 GDK_AVAILABLE_IN_ALL
-const char *gdk_device_get_vendor_id       (GdkDevice *device);
-GDK_AVAILABLE_IN_ALL
-const char *gdk_device_get_product_id      (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-GdkSeat     *gdk_device_get_seat            (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-guint           gdk_device_get_num_touches  (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-GdkDeviceTool * gdk_device_get_device_tool  (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-gboolean        gdk_device_get_caps_lock_state (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-gboolean        gdk_device_get_num_lock_state (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-gboolean        gdk_device_get_scroll_lock_state (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-GdkModifierType gdk_device_get_modifier_state (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-PangoDirection  gdk_device_get_direction (GdkDevice *device);
-
-GDK_AVAILABLE_IN_ALL
-gboolean        gdk_device_has_bidi_layouts (GdkDevice *device);
-
+GdkSurface *        gdk_device_get_surface_at_position  (GdkDevice *device,
+                                                         double    *win_x,
+                                                         double    *win_y);
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_H__ */
diff --git a/gdk/gdkdevicetool.h b/gdk/gdkdevicetool.h
index d1e5b28e21..1a6a90d756 100644
--- a/gdk/gdkdevicetool.h
+++ b/gdk/gdkdevicetool.h
@@ -60,19 +60,19 @@ typedef enum {
 } GdkDeviceToolType;
 
 GDK_AVAILABLE_IN_ALL
-GType gdk_device_tool_get_type (void) G_GNUC_CONST;
+GType               gdk_device_tool_get_type        (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
-guint64 gdk_device_tool_get_serial (GdkDeviceTool *tool);
+guint64             gdk_device_tool_get_serial      (GdkDeviceTool *tool);
 
 GDK_AVAILABLE_IN_ALL
-guint64 gdk_device_tool_get_hardware_id (GdkDeviceTool *tool);
+guint64             gdk_device_tool_get_hardware_id (GdkDeviceTool *tool);
 
 GDK_AVAILABLE_IN_ALL
-GdkDeviceToolType gdk_device_tool_get_tool_type (GdkDeviceTool *tool);
+GdkDeviceToolType   gdk_device_tool_get_tool_type   (GdkDeviceTool *tool);
 
 GDK_AVAILABLE_IN_ALL
-GdkAxisFlags gdk_device_tool_get_axes (GdkDeviceTool *tool);
+GdkAxisFlags        gdk_device_tool_get_axes        (GdkDeviceTool *tool);
 
 G_END_DECLS