From acb2c4b6beda7b5501e99f6b54495cd13e24f572 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Sat, 11 Nov 2023 13:25:12 +0100
Subject: [PATCH] flatten-effect: Use macros for subclassing boilerplate

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3387>
---
 clutter/clutter/clutter-flatten-effect.c |  5 +++
 clutter/clutter/clutter-flatten-effect.h | 41 ++++--------------------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/clutter/clutter/clutter-flatten-effect.c b/clutter/clutter/clutter-flatten-effect.c
index 552bdd584..4d24b0917 100644
--- a/clutter/clutter/clutter-flatten-effect.c
+++ b/clutter/clutter/clutter-flatten-effect.c
@@ -33,6 +33,11 @@
 #include "clutter/clutter-private.h"
 #include "clutter/clutter-actor-private.h"
 
+struct _ClutterFlattenEffect
+{
+  ClutterOffscreenEffect parent;
+};
+
 G_DEFINE_TYPE (ClutterFlattenEffect,
                _clutter_flatten_effect,
                CLUTTER_TYPE_OFFSCREEN_EFFECT);
diff --git a/clutter/clutter/clutter-flatten-effect.h b/clutter/clutter/clutter-flatten-effect.h
index 8e667dea0..2f63cdf04 100644
--- a/clutter/clutter/clutter-flatten-effect.h
+++ b/clutter/clutter/clutter-flatten-effect.h
@@ -28,42 +28,15 @@
 
 G_BEGIN_DECLS
 
-#define CLUTTER_TYPE_FLATTEN_EFFECT                                     \
-  (_clutter_flatten_effect_get_type())
-#define CLUTTER_FLATTEN_EFFECT(obj)                                     \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                   \
-                               CLUTTER_TYPE_FLATTEN_EFFECT,             \
-                               ClutterFlattenEffect))
-#define CLUTTER_FLATTEN_EFFECT_CLASS(klass)                             \
-  (G_TYPE_CHECK_CLASS_CAST ((klass),                                    \
-                            CLUTTER_TYPE_FLATTEN_EFFECT,                \
-                            ClutterFlattenEffectClass))
-#define CLUTTER_IS_FLATTEN_EFFECT(obj)                                  \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                                   \
-                               CLUTTER_TYPE_FLATTEN_EFFECT))
-#define CLUTTER_IS_FLATTEN_EFFECT_CLASS(klass)                          \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass),                                    \
-                            CLUTTER_TYPE_FLATTEN_EFFECT))
-#define CLUTTER_FLATTEN_EFFECT_GET_CLASS(obj)                           \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                                    \
-                              CLUTTER_FLATTEN_EFFECT,                   \
-                              ClutterFlattenEffectClass))
+#define CLUTTER_TYPE_FLATTEN_EFFECT (_clutter_flatten_effect_get_type ())
 
-typedef struct _ClutterFlattenEffect        ClutterFlattenEffect;
-typedef struct _ClutterFlattenEffectClass   ClutterFlattenEffectClass;
-typedef struct _ClutterFlattenEffectPrivate ClutterFlattenEffectPrivate;
+CLUTTER_EXPORT
+G_DECLARE_FINAL_TYPE (ClutterFlattenEffect,
+                      _clutter_flatten_effect,
+                      CLUTTER,
+                      FLATTEN_EFFECT,
+                      ClutterOffscreenEffect)
 
-struct _ClutterFlattenEffectClass
-{
-  ClutterOffscreenEffectClass parent_class;
-};
-
-struct _ClutterFlattenEffect
-{
-  ClutterOffscreenEffect parent;
-};
-
-GType _clutter_flatten_effect_get_type (void) G_GNUC_CONST;
 
 ClutterEffect *_clutter_flatten_effect_new (void);