1 files changed, 5 insertions, 28 deletions
diff --git a/src/format/known.h b/src/format/known.h
index dcc8669..41236df 100644
--- a/src/format/known.h
+++ b/src/format/known.h
@@ -2,7 +2,7 @@
 /* Chrysalide - Outil d'analyse de fichiers binaires
  * format.h - prototypes pour le support des différents formats binaires reconnus
  *
- * Copyright (C) 2019 Cyrille Bagard
+ * Copyright (C) 2019-2024 Cyrille Bagard
  *
  *  This file is part of Chrysalide.
  *
@@ -25,37 +25,17 @@
 #define _FORMAT_KNOWN_H
 
 
-#include <glib-object.h>
-#include <stdbool.h>
-
-
 #include "../analysis/content.h"
-#include "../glibext/delayed.h"
-#include "../glibext/notifier.h"
-
+#include "../glibext/helpers.h"
 
 
-#define G_TYPE_KNOWN_FORMAT            g_known_format_get_type()
-#define G_KNOWN_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_KNOWN_FORMAT, GKnownFormat))
-#define G_IS_KNOWN_FORMAT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_KNOWN_FORMAT))
-#define G_KNOWN_FORMAT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_KNOWN_FORMAT, GKnownFormatClass))
-#define G_IS_KNOWN_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_KNOWN_FORMAT))
-#define G_KNOWN_FORMAT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_KNOWN_FORMAT, GKnownFormatClass))
 
+#define G_TYPE_KNOWN_FORMAT (g_known_format_get_type())
 
-/* Format binaire générique (instance) */
-typedef struct _GKnownFormat GKnownFormat;
+DECLARE_GTYPE(GKnownFormat, g_known_format, G, KNOWN_FORMAT);
 
-/* Format binaire générique (classe) */
-typedef struct _GKnownFormatClass GKnownFormatClass;
 
 
-/* Indique le type défini pour un format binaire générique. */
-GType g_known_format_get_type(void);
-
-/* Définit le contenu binaire à analyser. */
-void g_known_format_set_content(GKnownFormat *, GBinContent *);
-
 /* Fournit une référence vers le contenu binaire analysé. */
 GBinContent *g_known_format_get_content(const GKnownFormat *);
 
@@ -66,10 +46,7 @@ char *g_known_format_get_key(const GKnownFormat *);
 char *g_known_format_get_description(const GKnownFormat *);
 
 /* Assure l'interprétation d'un format en différé. */
-bool g_known_format_analyze(GKnownFormat *, wgroup_id_t, GtkStatusStack *);
-
-/* Réalise un traitement post-désassemblage. */
-void g_known_format_complete_analysis(GKnownFormat *, wgroup_id_t, GtkStatusStack *);
+bool g_known_format_analyze(GKnownFormat *);