From e47ffefab2c81123cf536de3b60cd18253473e7f Mon Sep 17 00:00:00 2001 From: Ell Date: Sun, 27 May 2018 05:59:39 -0400 Subject: [PATCH] libgimpcolor, libgimpconfig: remove deprecated interface functions Remove the deprectaed foo_interface_get_type() functions, as per the last two commits. --- libgimpcolor/gimpcolor.def | 1 - libgimpcolor/gimpcolormanaged.c | 6 ------ libgimpcolor/gimpcolormanaged.h | 13 +++++-------- libgimpconfig/gimpconfig-iface.c | 6 ------ libgimpconfig/gimpconfig-iface.h | 3 --- libgimpconfig/gimpconfig.def | 1 - 6 files changed, 5 insertions(+), 25 deletions(-) diff --git a/libgimpcolor/gimpcolor.def b/libgimpcolor/gimpcolor.def index bd6c977597..eac2408bc0 100644 --- a/libgimpcolor/gimpcolor.def +++ b/libgimpcolor/gimpcolor.def @@ -22,7 +22,6 @@ EXPORTS gimp_color_managed_get_color_profile gimp_color_managed_get_icc_profile gimp_color_managed_get_type - gimp_color_managed_interface_get_type gimp_color_managed_profile_changed gimp_color_profile_get_copyright gimp_color_profile_get_description diff --git a/libgimpcolor/gimpcolormanaged.c b/libgimpcolor/gimpcolormanaged.c index f9727c4276..904658bdc4 100644 --- a/libgimpcolor/gimpcolormanaged.c +++ b/libgimpcolor/gimpcolormanaged.c @@ -55,12 +55,6 @@ static guint gimp_color_managed_signals[LAST_SIGNAL] = { 0 }; /* private functions */ -GType -gimp_color_managed_interface_get_type (void) -{ - return gimp_color_managed_get_type (); -} - static void gimp_color_managed_default_init (GimpColorManagedInterface *iface) { diff --git a/libgimpcolor/gimpcolormanaged.h b/libgimpcolor/gimpcolormanaged.h index c34ac93bab..bf6839d583 100644 --- a/libgimpcolor/gimpcolormanaged.h +++ b/libgimpcolor/gimpcolormanaged.h @@ -55,16 +55,13 @@ struct _GimpColorManagedInterface }; -GType gimp_color_managed_get_type (void) G_GNUC_CONST; +GType gimp_color_managed_get_type (void) G_GNUC_CONST; -GIMP_DEPRECATED_FOR (gimp_color_managed_get_type) -GType gimp_color_managed_interface_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); -const guint8 * gimp_color_managed_get_icc_profile (GimpColorManaged *managed, - gsize *len); -GimpColorProfile * gimp_color_managed_get_color_profile (GimpColorManaged *managed); - -void gimp_color_managed_profile_changed (GimpColorManaged *managed); +void gimp_color_managed_profile_changed (GimpColorManaged *managed); G_END_DECLS diff --git a/libgimpconfig/gimpconfig-iface.c b/libgimpconfig/gimpconfig-iface.c index 0531e786fa..d2caa02d07 100644 --- a/libgimpconfig/gimpconfig-iface.c +++ b/libgimpconfig/gimpconfig-iface.c @@ -105,12 +105,6 @@ gimp_config_get_type (void) return config_iface_type; } -GType -gimp_config_interface_get_type (void) -{ - return gimp_config_get_type (); -} - static void gimp_config_iface_default_init (GimpConfigInterface *iface) { diff --git a/libgimpconfig/gimpconfig-iface.h b/libgimpconfig/gimpconfig-iface.h index bf3f484a03..0343e239f0 100644 --- a/libgimpconfig/gimpconfig-iface.h +++ b/libgimpconfig/gimpconfig-iface.h @@ -73,9 +73,6 @@ struct _GimpConfigInterface GType gimp_config_get_type (void) G_GNUC_CONST; -GIMP_DEPRECATED_FOR (gimp_config_get_type) -GType gimp_config_interface_get_type (void) G_GNUC_CONST; - gboolean gimp_config_serialize_to_file (GimpConfig *config, const gchar *filename, const gchar *header, diff --git a/libgimpconfig/gimpconfig.def b/libgimpconfig/gimpconfig.def index d2a28e04c7..e8a098a712 100644 --- a/libgimpconfig/gimpconfig.def +++ b/libgimpconfig/gimpconfig.def @@ -33,7 +33,6 @@ EXPORTS gimp_config_duplicate gimp_config_error_quark gimp_config_get_type - gimp_config_interface_get_type gimp_config_is_equal_to gimp_config_path_expand gimp_config_path_expand_to_files