[gimp/wip/nielsdg/g-declare-interface: 129/131] libgimpcolor: colormanaged: Use G_DECLARE_INTERFACE()
- From: Michael Schumacher <schumaml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/wip/nielsdg/g-declare-interface: 129/131] libgimpcolor: colormanaged: Use G_DECLARE_INTERFACE()
- Date: Fri, 2 Aug 2019 20:56:13 +0000 (UTC)
commit f87ac45affd83915eeb3a8c95e4668184f0a7f94
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/libgimpcolor3-sections.txt | 2 +-
libgimpcolor/gimpcolormanaged.c | 4 ++--
libgimpcolor/gimpcolormanaged.h | 11 ++---------
3 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
b/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
index 863259fe2a..2b896d942f 100644
--- a/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
+++ b/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
@@ -110,7 +110,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_get_type
gimp_color_managed_interface_get_type
</SECTION>
diff --git a/libgimpcolor/gimpcolormanaged.c b/libgimpcolor/gimpcolormanaged.c
index bddf312ca0..8f6eabab81 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 2137142185..8b45f46eb2 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)
/**
* GimpColorManagedInterface:
@@ -65,8 +60,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]