From d90a938c171e7b94ecdddfe377db94a7e02243c8 Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Mon, 8 Jan 2024 13:53:16 +0100 Subject: [PATCH] core: Use subclassing macros for GestureTracker Part-of: --- src/core/meta-gesture-tracker-private.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/core/meta-gesture-tracker-private.h b/src/core/meta-gesture-tracker-private.h index 88b59d409..0458b9534 100644 --- a/src/core/meta-gesture-tracker-private.h +++ b/src/core/meta-gesture-tracker-private.h @@ -28,19 +28,14 @@ #include "meta/window.h" #define META_TYPE_GESTURE_TRACKER (meta_gesture_tracker_get_type ()) -#define META_GESTURE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_GESTURE_TRACKER, MetaGestureTracker)) -#define META_GESTURE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_GESTURE_TRACKER, MetaGestureTrackerClass)) -#define META_IS_GESTURE_TRACKER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_GESTURE_TRACKER)) -#define META_IS_GESTURE_TRACKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_GESTURE_TRACKER)) -#define META_GESTURE_TRACKER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_GESTURE_TRACKER, MetaGestureTrackerClass)) typedef struct _MetaGestureTracker MetaGestureTracker; typedef struct _MetaGestureTrackerClass MetaGestureTrackerClass; -struct _MetaGestureTracker -{ - GObject parent_instance; -}; +G_DECLARE_DERIVABLE_TYPE (MetaGestureTracker, + meta_gesture_tracker, + META, GESTURE_TRACKER, + GObject) struct _MetaGestureTrackerClass { @@ -51,8 +46,6 @@ struct _MetaGestureTrackerClass MetaSequenceState state); }; -GType meta_gesture_tracker_get_type (void) G_GNUC_CONST; - MetaGestureTracker * meta_gesture_tracker_new (void); gboolean meta_gesture_tracker_handle_event (MetaGestureTracker *tracker,