diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2024-05-20 15:15:25 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2024-05-20 15:15:25 (GMT) |
commit | 6decc8c40dfaf7cb04156f1ab233cd856ed06b37 (patch) | |
tree | 7a326fc66d2465bdedc978146faef55e53531652 /src/analysis/contents/encapsulated.h | |
parent | 79662ede83b35ad9d91b942218cf09e856e48b4c (diff) |
Improve the DECLARE_GTYPE() macro and use it everywhere.
Diffstat (limited to 'src/analysis/contents/encapsulated.h')
-rw-r--r-- | src/analysis/contents/encapsulated.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/analysis/contents/encapsulated.h b/src/analysis/contents/encapsulated.h index 9b74eac..bfd17e7 100644 --- a/src/analysis/contents/encapsulated.h +++ b/src/analysis/contents/encapsulated.h @@ -29,26 +29,14 @@ #include "../content.h" +#include "../../glibext/helpers.h" -#define G_TYPE_ENCAPS_CONTENT (g_encaps_content_get_type()) -#define G_ENCAPS_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_ENCAPS_CONTENT, GEncapsContent)) -#define G_IS_ENCAPS_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_ENCAPS_CONTENT)) -#define G_ENCAPS_CONTENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_ENCAPS_CONTENT, GEncapsContentClass)) -#define G_IS_ENCAPS_CONTENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_ENCAPS_CONTENT)) -#define G_ENCAPS_CONTENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_ENCAPS_CONTENT, GEncapsContentClass)) +#define G_TYPE_ENCAPS_CONTENT (g_encaps_content_get_type()) +DECLARE_GTYPE(GEncapsContent, g_encaps_content, G, ENCAPS_CONTENT); -/* Contenu de issu d'un contenu plus global (instance) */ -typedef struct _GEncapsContent GEncapsContent; - -/* Contenu de issu d'un contenu plus global (classe) */ -typedef struct _GEncapsContentClass GEncapsContentClass; - - -/* Indique le type défini par la GLib pour les contenus encapsulés. */ -GType g_encaps_content_get_type(void); /* Charge en mémoire un contenu binaire encapsulé. */ GBinContent *g_encaps_content_new(GBinContent *, const char *, GBinContent *); |