diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2021-09-30 06:41:23 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2021-09-30 06:41:23 (GMT) |
commit | da3da13a32a2f98c16a591a389e274a7803fc48a (patch) | |
tree | b2a9b5976982781b732114c9daa3ac2f7285f337 /src/analysis/loaded.h | |
parent | 0b5e9a3c7bcd3eb15be0e888ebfe46d14497b101 (diff) |
Move loaded contents from interface to object structures.
Diffstat (limited to 'src/analysis/loaded.h')
-rw-r--r-- | src/analysis/loaded.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/analysis/loaded.h b/src/analysis/loaded.h index 46404e1..9a88f8c 100644 --- a/src/analysis/loaded.h +++ b/src/analysis/loaded.h @@ -33,7 +33,6 @@ #include "content.h" #include "../common/xml.h" #include "../glibext/gdisplayoptions.h" -#include "../glibext/named.h" #include "../gtkext/gtkdockstation.h" @@ -41,27 +40,24 @@ /* ---------------------- GESTION SOUS FORME DE CONTENU CHARGE ---------------------- */ -#define G_TYPE_LOADED_CONTENT (g_loaded_content_get_type()) -#define G_LOADED_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_LOADED_CONTENT, GLoadedContent)) -#define G_LOADED_CONTENT_CLASS(vtable) (G_TYPE_CHECK_CLASS_CAST((vtable), G_TYPE_LOADED_CONTENT, GLoadedContentIface)) -#define G_IS_LOADED_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_LOADED_CONTENT)) -#define G_IS_LOADED_CONTENT_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE((vtable), G_TYPE_LOADED_CONTENT)) -#define G_LOADED_CONTENT_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE((inst), G_TYPE_LOADED_CONTENT, GLoadedContentIface)) +#define G_TYPE_LOADED_CONTENT g_loaded_content_get_type() +#define G_LOADED_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_LOADED_CONTENT, GLoadedContent)) +#define G_IS_LOADED_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_LOADED_CONTENT)) +#define G_LOADED_CONTENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_LOADED_CONTENT, GLoadedContentClass)) +#define G_IS_LOADED_CONTENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_LOADED_CONTENT)) +#define G_LOADED_CONTENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_LOADED_CONTENT, GLoadedContentClass)) -/* Accès à un contenu binaire quelconque (coquille vide) */ +/* Accès à un contenu binaire quelconque (instance) */ typedef struct _GLoadedContent GLoadedContent; -/* Accès à un contenu binaire quelconque (interface) */ -typedef struct _GLoadedContentIface GLoadedContentIface; +/* Accès à un contenu binaire quelconque (instance) */ +typedef struct _GLoadedContentClass GLoadedContentClass; /* Détermine le type d'une interface pour l'intégration de contenu chargé. */ GType g_loaded_content_get_type(void) G_GNUC_CONST; -/* Procède à l'initialisation de l'interface de composant nommé. */ -void g_loaded_content_named_interface_init(GNamedWidgetIface *); - /* Interprète un contenu chargé avec un appui XML. */ bool g_loaded_content_restore(GLoadedContent *, xmlDoc *, xmlXPathContext *, const char *); |