From 1b7be3c70417467c424d024dd569d07d441b5362 Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Sun, 4 Jul 2021 08:28:17 +0200 Subject: All: Use new GObject type macros Bump ABI version since I canont guarantee ABI compatibility --- libgupnp-dlna/gupnp-dlna-profile.h | 54 +++++++++++--------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) (limited to 'libgupnp-dlna/gupnp-dlna-profile.h') diff --git a/libgupnp-dlna/gupnp-dlna-profile.h b/libgupnp-dlna/gupnp-dlna-profile.h index 7f400ed..5a649cf 100644 --- a/libgupnp-dlna/gupnp-dlna-profile.h +++ b/libgupnp-dlna/gupnp-dlna-profile.h @@ -29,55 +29,31 @@ G_BEGIN_DECLS -#define GUPNP_TYPE_DLNA_PROFILE gupnp_dlna_profile_get_type() - -#define GUPNP_DLNA_PROFILE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - GUPNP_TYPE_DLNA_PROFILE, \ - GUPnPDLNAProfile)) - -#define GUPNP_DLNA_PROFILE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - GUPNP_TYPE_DLNA_PROFILE, \ - GUPnPDLNAProfileClass)) - -#define GUPNP_IS_DLNA_PROFILE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - GUPNP_TYPE_DLNA_PROFILE)) - -#define GUPNP_IS_DLNA_PROFILE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - GUPNP_TYPE_DLNA_PROFILE)) - -#define GUPNP_DLNA_PROFILE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - GUPNP_TYPE_DLNA_PROFILE, \ - GUPnPDLNAProfileClass)) +G_DECLARE_DERIVABLE_TYPE (GUPnPDLNAProfile, + gupnp_dlna_profile, + GUPNP_DLNA, + PROFILE, + GObject) -typedef struct _GUPnPDLNAProfilePrivate GUPnPDLNAProfilePrivate; +#define GUPNP_TYPE_DLNA_PROFILE gupnp_dlna_profile_get_type() +// Backwards-compatible defines /** - * GUPnPDLNAProfile: - * - * The top-level object used for the in-memory representation of the - * DLNA Profiles. + * GUPNP_IS_DLNA_PROFILE: (skip) */ -typedef struct { - GObject parent; - - GUPnPDLNAProfilePrivate *priv; -} GUPnPDLNAProfile; +#define GUPNP_IS_DLNA_PROFILE GUPNP_DLNA_IS_PROFILE +/** + * GUPNP_IS_DLNA_PROFILE_CLASS: (skip) + */ +#define GUPNP_IS_DLNA_PROFILE_CLASS GUPNP_DLNA_IS_PROFILE_CLASS /** * GUPnPDLNAProfileClass: * @parent_class: A #GObjectClass - parent of this class. */ -typedef struct { +struct _GUPnPDLNAProfileClass { GObjectClass parent_class; -} GUPnPDLNAProfileClass; - -GType -gupnp_dlna_profile_get_type (void); +}; const gchar * gupnp_dlna_profile_get_name (GUPnPDLNAProfile *profile); -- cgit v1.2.1