[gimp/wip/nielsdg/g-declare-interface: 1/3] libgimpcolor: colormanaged: Use G_DECLARE_INTERFACE()



commit ffc663f29c3b8c8bcf80aecafd697426e4cd9505
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Thu Jul 18 19:14:52 2019 +0200

    libgimpcolor: colormanaged: Use G_DECLARE_INTERFACE()
    
    This cuts aways a little of the GObject boilerplate.

 devel-docs/libgimpcolor/libgimpcolor-sections.txt |  2 +-
 libgimpcolor/gimpcolormanaged.c                   |  4 ++--
 libgimpcolor/gimpcolormanaged.h                   | 11 ++---------
 3 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/devel-docs/libgimpcolor/libgimpcolor-sections.txt 
b/devel-docs/libgimpcolor/libgimpcolor-sections.txt
index 8dc350d32b..d04066446b 100644
--- a/devel-docs/libgimpcolor/libgimpcolor-sections.txt
+++ b/devel-docs/libgimpcolor/libgimpcolor-sections.txt
@@ -130,7 +130,7 @@ gimp_color_managed_profile_changed
 GIMP_COLOR_MANAGED
 GIMP_IS_COLOR_MANAGED
 GIMP_TYPE_COLOR_MANAGED
-GIMP_COLOR_MANAGED_GET_INTERFACE
+GIMP_COLOR_MANAGED_GET_IFACE
 gimp_color_managed_interface_get_type
 </SECTION>
 
diff --git a/libgimpcolor/gimpcolormanaged.c b/libgimpcolor/gimpcolormanaged.c
index 91fdee8807..f4b178592a 100644
--- a/libgimpcolor/gimpcolormanaged.c
+++ b/libgimpcolor/gimpcolormanaged.c
@@ -94,7 +94,7 @@ gimp_color_managed_get_icc_profile (GimpColorManaged *managed,
 
   *len = 0;
 
-  iface = GIMP_COLOR_MANAGED_GET_INTERFACE (managed);
+  iface = GIMP_COLOR_MANAGED_GET_IFACE (managed);
 
   if (iface->get_icc_profile)
     return iface->get_icc_profile (managed, len);
@@ -120,7 +120,7 @@ gimp_color_managed_get_color_profile (GimpColorManaged *managed)
 
   g_return_val_if_fail (GIMP_IS_COLOR_MANAGED (managed), NULL);
 
-  iface = GIMP_COLOR_MANAGED_GET_INTERFACE (managed);
+  iface = GIMP_COLOR_MANAGED_GET_IFACE (managed);
 
   if (iface->get_color_profile)
     return iface->get_color_profile (managed);
diff --git a/libgimpcolor/gimpcolormanaged.h b/libgimpcolor/gimpcolormanaged.h
index 83eaf78f27..177a4f7ca8 100644
--- a/libgimpcolor/gimpcolormanaged.h
+++ b/libgimpcolor/gimpcolormanaged.h
@@ -31,13 +31,8 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-#define GIMP_TYPE_COLOR_MANAGED               (gimp_color_managed_get_type ())
-#define GIMP_IS_COLOR_MANAGED(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_MANAGED))
-#define GIMP_COLOR_MANAGED(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_MANAGED, 
GimpColorManaged))
-#define GIMP_COLOR_MANAGED_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), 
GIMP_TYPE_COLOR_MANAGED, GimpColorManagedInterface))
-
-
-typedef struct _GimpColorManagedInterface GimpColorManagedInterface;
+#define GIMP_TYPE_COLOR_MANAGED (gimp_color_managed_get_type ())
+G_DECLARE_INTERFACE (GimpColorManaged, gimp_color_managed, GIMP, COLOR_MANAGED, GObject)
 
 struct _GimpColorManagedInterface
 {
@@ -55,8 +50,6 @@ struct _GimpColorManagedInterface
 };
 
 
-GType              gimp_color_managed_get_type          (void) G_GNUC_CONST;
-
 const guint8     * gimp_color_managed_get_icc_profile   (GimpColorManaged *managed,
                                                          gsize            *len);
 GimpColorProfile * gimp_color_managed_get_color_profile (GimpColorManaged *managed);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]