Fixed and updated GType macros dealing with non-existent interfaces.

19 files changed, 114 insertions, 90 deletions

diff --git a/plugins/dalvik/instruction.h b/plugins/dalvik/instruction.h
index 54d73a5..14d87a6 100644
--- a/plugins/dalvik/instruction.h
+++ b/plugins/dalvik/instruction.h
@@ -29,10 +29,12 @@
 
 
 
-#define G_TYPE_DALVIK_INSTRUCTION                 g_dalvik_instruction_get_type()
-#define G_DALVIK_INSTRUCTION(obj)                 (G_TYPE_CHECK_INSTANCE_CAST((obj), g_dalvik_instruction_get_type(), GDalvikInstruction))
-#define G_IS_DALVIK_INSTRUCTION(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_dalvik_instruction_get_type()))
-#define G_DALVIK_INSTRUCTION_GET_IFACE(inst)      (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_dalvik_instruction_get_type(), GDalvikInstructionIface))
+#define G_TYPE_DALVIK_INSTRUCTION            g_dalvik_instruction_get_type()
+#define G_DALVIK_INSTRUCTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_DALVIK_INSTRUCTION, GDalvikInstruction))
+#define G_IS_DALVIK_INSTRUCTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_DALVIK_INSTRUCTION))
+#define G_DALVIK_INSTRUCTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_DALVIK_INSTRUCTION, GDalvikInstructionClass))
+#define G_IS_DALVIK_INSTRUCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_DALVIK_INSTRUCTION))
+#define G_DALVIK_INSTRUCTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DALVIK_INSTRUCTION, GDalvikInstructionClass))
 
 
 /* Définition générique d'une instruction d'architecture Dalvik (instance) */
diff --git a/plugins/dalvik/processor.h b/plugins/dalvik/processor.h
index 2295adf..eff5975 100644
--- a/plugins/dalvik/processor.h
+++ b/plugins/dalvik/processor.h
@@ -29,10 +29,12 @@
 
 
 
-#define G_TYPE_DALVIK_PROCESSOR                g_dalvik_processor_get_type()
-#define G_DALVIK_PROCESSOR(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj), g_dalvik_processor_get_type(), GDalvikProcessor))
-#define G_IS_DALVIK_PROCESSOR(obj)             (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_dalvik_processor_get_type()))
-#define G_DALVIK_PROCESSOR_GET_IFACE(inst)     (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_dalvik_processor_get_type(), GDalvikProcessorIface))
+#define G_TYPE_DALVIK_PROCESSOR            g_dalvik_processor_get_type()
+#define G_DALVIK_PROCESSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_DALVIK_PROCESSOR, GDalvikProcessor))
+#define G_IS_DALVIK_PROCESSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_DALVIK_PROCESSOR))
+#define G_DALVIK_PROCESSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_DALVIK_PROCESSOR, GDalvikProcessorClass))
+#define G_IS_DALVIK_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_DALVIK_PROCESSOR))
+#define G_DALVIK_PROCESSOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DALVIK_PROCESSOR, GDalvikProcessorClass))
 
 
 /* Définition du processeur de la VM Dalvik (instance) */
diff --git a/plugins/dex/format.h b/plugins/dex/format.h
index d8fdd6b..81a4b0f 100755
--- a/plugins/dex/format.h
+++ b/plugins/dex/format.h
@@ -37,11 +37,12 @@
 
 
 
-#define G_TYPE_DEX_FORMAT               g_dex_format_get_type()
-#define G_DEX_FORMAT(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_dex_format_get_type(), GDexFormat))
-#define G_IS_DEX_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_dex_format_get_type()))
-#define G_DEX_FORMAT_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_dex_format_get_type(), GDexFormatIface))
-#define G_DEX_FORMAT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DEX_FORMAT, GDexFormatClass))
+#define G_TYPE_DEX_FORMAT            g_dex_format_get_type()
+#define G_DEX_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_DEX_FORMAT, GDexFormat))
+#define G_IS_DEX_FORMAT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_DEX_FORMAT))
+#define G_DEX_FORMAT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_DEX_FORMAT, GDexFormatClass))
+#define G_IS_DEX_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_DEX_FORMAT))
+#define G_DEX_FORMAT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DEX_FORMAT, GDexFormatClass))
 
 
 /* Format d'exécutable DEX (instance) */
diff --git a/plugins/elf/format.h b/plugins/elf/format.h
index 1ba61c5..a822105 100644
--- a/plugins/elf/format.h
+++ b/plugins/elf/format.h
@@ -37,11 +37,12 @@
 
 
 
-#define G_TYPE_ELF_FORMAT               g_elf_format_get_type()
-#define G_ELF_FORMAT(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_elf_format_get_type(), GElfFormat))
-#define G_IS_ELF_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_elf_format_get_type()))
-#define G_ELF_FORMAT_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_elf_format_get_type(), GElfFormatIface))
-#define G_ELF_FORMAT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_ELF_FORMAT, GElfFormatClass))
+#define G_TYPE_ELF_FORMAT            g_elf_format_get_type()
+#define G_ELF_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_ELF_FORMAT, GElfFormat))
+#define G_IS_ELF_FORMAT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_ELF_FORMAT))
+#define G_ELF_FORMAT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_ELF_FORMAT, GElfFormatClass))
+#define G_IS_ELF_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_ELF_FORMAT))
+#define G_ELF_FORMAT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_ELF_FORMAT, GElfFormatClass))
 
 
 /* Format d'exécutable ELF (instance) */
diff --git a/plugins/stackvars/operand.h b/plugins/stackvars/operand.h
index eb6b737..d1820d5 100644
--- a/plugins/stackvars/operand.h
+++ b/plugins/stackvars/operand.h
@@ -34,10 +34,12 @@
 
 
 
-#define G_TYPE_STACK_VAR_OPERAND                  g_stack_var_operand_get_type()
-#define G_STACK_VAR_OPERAND(obj)                  (G_TYPE_CHECK_INSTANCE_CAST((obj), g_stack_var_operand_get_type(), GStackVarOperand))
-#define G_IS_STACK_VAR_OPERAND(obj)               (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_stack_var_operand_get_type()))
-#define G_STACK_VAR_OPERAND_GET_IFACE(inst)       (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_stack_var_operand_get_type(), GStackVarOperandIface))
+#define G_TYPE_STACK_VAR_OPERAND            g_stack_var_operand_get_type()
+#define G_STACK_VAR_OPERAND(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_STACK_VAR_OPERAND, GStackVarOperand))
+#define G_IS_STACK_VAR_OPERAND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_STACK_VAR_OPERAND))
+#define G_STACK_VAR_OPERAND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_STACK_VAR_OPERAND, GStackVarOperandClass))
+#define G_IS_STACK_VAR_OPERAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_STACK_VAR_OPERAND))
+#define G_STACK_VAR_OPERAND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_STACK_VAR_OPERAND, GStackVarOperandClass))
 
 
 /* Définition d'un opérande de substitution pour variable de pile (instance) */
diff --git a/src/analysis/binary.h b/src/analysis/binary.h
index 43cbaa2..ca62084 100644
--- a/src/analysis/binary.h
+++ b/src/analysis/binary.h
@@ -48,12 +48,12 @@ typedef struct _GStudyProject GStudyProject;
 /* ------------------------ ENCADREMENTS D'UN BINAIRE CHARGE ------------------------ */
 
 
-#define G_TYPE_LOADED_BINARY               g_loaded_binary_get_type()
-#define G_LOADED_BINARY(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_loaded_binary_get_type(), GLoadedBinary))
-#define G_IS_LOADED_BINARY(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_loaded_binary_get_type()))
-#define G_LOADED_BINARY_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_LOADED_BINARY, GLoadedBinaryClass))
-#define G_IS_LOADED_BINARY_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_LOADED_BINARY))
-#define G_LOADED_BINARY_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_LOADED_BINARY, GLoadedBinaryClass))
+#define G_TYPE_LOADED_BINARY            g_loaded_binary_get_type()
+#define G_LOADED_BINARY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_LOADED_BINARY, GLoadedBinary))
+#define G_IS_LOADED_BINARY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_LOADED_BINARY))
+#define G_LOADED_BINARY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_LOADED_BINARY, GLoadedBinaryClass))
+#define G_IS_LOADED_BINARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_LOADED_BINARY))
+#define G_LOADED_BINARY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_LOADED_BINARY, GLoadedBinaryClass))
 
 
 /* Description de fichier binaire (instance) */
diff --git a/src/analysis/db/cdb.h b/src/analysis/db/cdb.h
index 9490f4b..15f425c 100644
--- a/src/analysis/db/cdb.h
+++ b/src/analysis/db/cdb.h
@@ -34,11 +34,12 @@
 
 
 
-#define G_TYPE_CDB_ARCHIVE               g_cdb_archive_get_type()
-#define G_CDB_ARCHIVE(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_cdb_archive_get_type(), GCdbArchive))
-#define G_IS_CDB_ARCHIVE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_cdb_archive_get_type()))
-#define G_CDB_ARCHIVE_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_cdb_archive_get_type(), GCdbArchiveIface))
-#define G_CDB_ARCHIVE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_CDB_ARCHIVE, GCdbArchiveClass))
+#define G_TYPE_CDB_ARCHIVE            g_cdb_archive_get_type()
+#define G_CDB_ARCHIVE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_CDB_ARCHIVE, GCdbArchive))
+#define G_IS_CDB_ARCHIVE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_CDB_ARCHIVE))
+#define G_CDB_ARCHIVE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_CDB_ARCHIVE, GCdbArchiveClass))
+#define G_IS_CDB_ARCHIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_CDB_ARCHIVE))
+#define G_CDB_ARCHIVE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_CDB_ARCHIVE, GCdbArchiveClass))
 
 
 /* Description d'une archive d'éléments utilisateur (instance) */
diff --git a/src/analysis/db/client.h b/src/analysis/db/client.h
index 821acfe..23b85f8 100644
--- a/src/analysis/db/client.h
+++ b/src/analysis/db/client.h
@@ -33,11 +33,12 @@
 
 
 
-#define G_TYPE_DB_CLIENT               g_db_client_get_type()
-#define G_DB_CLIENT(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_db_client_get_type(), GDbClient))
-#define G_IS_DB_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_db_client_get_type()))
-#define G_DB_CLIENT_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_db_client_get_type(), GDbClientIface))
-#define G_DB_CLIENT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DB_CLIENT, GDbClientClass))
+#define G_TYPE_DB_CLIENT            g_db_client_get_type()
+#define G_DB_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_DB_CLIENT, GDbClient))
+#define G_IS_DB_CLIENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_DB_CLIENT))
+#define G_DB_CLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_DB_CLIENT, GDbClientClass))
+#define G_IS_DB_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_DB_CLIENT))
+#define G_DB_CLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DB_CLIENT, GDbClientClass))
 
 
 /* Description de client à l'écoute (instance) */
diff --git a/src/analysis/db/server.h b/src/analysis/db/server.h
index 9b7a7a7..5be7886 100644
--- a/src/analysis/db/server.h
+++ b/src/analysis/db/server.h
@@ -30,11 +30,12 @@
 
 
 
-#define G_TYPE_DB_SERVER               g_db_server_get_type()
-#define G_DB_SERVER(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_db_server_get_type(), GDbServer))
-#define G_IS_DB_SERVER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_db_server_get_type()))
-#define G_DB_SERVER_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_db_server_get_type(), GDbServerIface))
-#define G_DB_SERVER_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DB_SERVER, GDbServerClass))
+#define G_TYPE_DB_SERVER            g_db_server_get_type()
+#define G_DB_SERVER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_DB_SERVER, GDbServer))
+#define G_IS_DB_SERVER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_DB_SERVER))
+#define G_DB_SERVER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_DB_SERVER, GDbServerClass))
+#define G_IS_DB_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_DB_SERVER))
+#define G_DB_SERVER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DB_SERVER, GDbServerClass))
 
 
 /* Description de serveur à l'écoute (instance) */
diff --git a/src/analysis/roptions.h b/src/analysis/roptions.h
index 2f54a60..727ee76 100644
--- a/src/analysis/roptions.h
+++ b/src/analysis/roptions.h
@@ -57,11 +57,12 @@ typedef enum _ShowingArea
 } ShowingArea;
 
 
-#define G_TYPE_RENDERING_OPTIONS               g_rendering_options_get_type()
-#define G_RENDERING_OPTIONS(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_rendering_options_get_type(), GRenderingOptions))
-#define G_IS_RENDERING_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_rendering_options_get_type()))
-#define G_RENDERING_OPTIONS_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_rendering_options_get_type(), GRenderingOptionsIface))
-#define G_RENDERING_OPTIONS_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_RENDERING_OPTIONS, GRenderingOptionsClass))
+#define G_TYPE_RENDERING_OPTIONS            g_rendering_options_get_type()
+#define G_RENDERING_OPTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_RENDERING_OPTIONS, GRenderingOptions))
+#define G_IS_RENDERING_OPTIONS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_RENDERING_OPTIONS))
+#define G_RENDERING_OPTIONS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_RENDERING_OPTIONS, GRenderingOptionsClass))
+#define G_IS_RENDERING_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_RENDERING_OPTIONS))
+#define G_RENDERING_OPTIONS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_RENDERING_OPTIONS, GRenderingOptionsClass))
 
 
 /* Options de représentation (instance) */
diff --git a/src/analysis/routine.h b/src/analysis/routine.h
index 52b2747..7a836cf 100644
--- a/src/analysis/routine.h
+++ b/src/analysis/routine.h
@@ -47,10 +47,12 @@ typedef enum _RoutineType
 } RoutineType;
 
 
-#define G_TYPE_BIN_ROUTINE               g_bin_routine_get_type()
-#define G_BIN_ROUTINE(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_bin_routine_get_type(), GBinRoutine))
-#define G_IS_BIN_ROUTINE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_bin_routine_get_type()))
-#define G_BIN_ROUTINE_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_bin_routine_get_type(), GBinRoutineIface))
+#define G_TYPE_BIN_ROUTINE            g_bin_routine_get_type()
+#define G_BIN_ROUTINE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_BIN_ROUTINE, GBinRoutine))
+#define G_IS_BIN_ROUTINE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_BIN_ROUTINE))
+#define G_BIN_ROUTINE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_BIN_ROUTINE, GBinRoutineClass))
+#define G_IS_BIN_ROUTINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_BIN_ROUTINE))
+#define G_BIN_ROUTINE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_BIN_ROUTINE, GBinRoutineClass))
 
 
 /* Représentation générique de routine (instance) */
diff --git a/src/arch/jvm/instruction.h b/src/arch/jvm/instruction.h
index bac55be..8ec9c48 100644
--- a/src/arch/jvm/instruction.h
+++ b/src/arch/jvm/instruction.h
@@ -117,10 +117,12 @@ typedef enum _JvmOpcodes
 } JvmOpcodes;
 
 
-#define G_TYPE_JVM_INSTRUCTION                 g_jvm_instruction_get_type()
-#define G_JVM_INSTRUCTION(obj)                 (G_TYPE_CHECK_INSTANCE_CAST((obj), g_jvm_instruction_get_type(), GJvmInstruction))
-#define G_IS_JVM_INSTRUCTION(obj)              (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_jvm_instruction_get_type()))
-#define G_JVM_INSTRUCTION_GET_IFACE(inst)      (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_jvm_instruction_get_type(), GJvmInstructionIface))
+#define G_TYPE_JVM_INSTRUCTION            g_jvm_instruction_get_type()
+#define G_JVM_INSTRUCTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_JVM_INSTRUCTION, GJvmInstruction))
+#define G_IS_JVM_INSTRUCTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_JVM_INSTRUCTION))
+#define G_JVM_INSTRUCTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_JVM_INSTRUCTION, GJvmInstructionClass))
+#define G_IS_JVM_INSTRUCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_JVM_INSTRUCTION))
+#define G_JVM_INSTRUCTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JVM_INSTRUCTION, GJvmInstructionClass))
 
 
 /* Définition générique d'une instruction d'architecture JVM (instance) */
diff --git a/src/arch/jvm/operand.h b/src/arch/jvm/operand.h
index 2845b7a..8f4288d 100644
--- a/src/arch/jvm/operand.h
+++ b/src/arch/jvm/operand.h
@@ -37,10 +37,12 @@ typedef enum _JvmOperandType JvmOperandType;
 /* ---------------------- COQUILLE VIDE POUR LES OPERANDES JVM ---------------------- */
 
 
-#define G_TYPE_JVM_OPERAND                  g_jvm_operand_get_type()
-#define G_JVM_OPERAND(obj)                  (G_TYPE_CHECK_INSTANCE_CAST((obj), g_jvm_operand_get_type(), GJvmOperand))
-#define G_IS_JVM_OPERAND(obj)               (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_jvm_operand_get_type()))
-#define G_JVM_OPERAND_GET_IFACE(inst)       (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_jvm_operand_get_type(), GJvmOperandIface))
+#define G_TYPE_JVM_OPERAND            g_jvm_operand_get_type()
+#define G_JVM_OPERAND(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_JVM_OPERAND, GJvmOperand))
+#define G_IS_JVM_OPERAND(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_JVM_OPERAND))
+#define G_JVM_OPERAND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_JVM_OPERAND, GJvmOperandClass))
+#define G_IS_JVM_OPERAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_JVM_OPERAND))
+#define G_JVM_OPERAND_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JVM_OPERAND, GJvmOperandClass))
 
 
 /* Définition d'un opérande de la JVM (instance) */
diff --git a/src/arch/jvm/processor.h b/src/arch/jvm/processor.h
index 05f7cd8..7123d0c 100644
--- a/src/arch/jvm/processor.h
+++ b/src/arch/jvm/processor.h
@@ -29,10 +29,12 @@
 
 
 
-#define G_TYPE_JVM_PROCESSOR                g_jvm_processor_get_type()
-#define G_JVM_PROCESSOR(obj)                (G_TYPE_CHECK_INSTANCE_CAST((obj), g_jvm_processor_get_type(), GJvmProcessor))
-#define G_IS_JVM_PROCESSOR(obj)             (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_jvm_processor_get_type()))
-#define G_JVM_PROCESSOR_GET_IFACE(inst)     (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_jvm_processor_get_type(), GJvmProcessorIface))
+#define G_TYPE_JVM_PROCESSOR            g_jvm_processor_get_type()
+#define G_JVM_PROCESSOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_JVM_PROCESSOR, GJvmProcessor))
+#define G_IS_JVM_PROCESSOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_JVM_PROCESSOR))
+#define G_JVM_PROCESSOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_JVM_PROCESSOR, GJvmProcessorClass))
+#define G_IS_JVM_PROCESSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_JVM_PROCESSOR))
+#define G_JVM_PROCESSOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JVM_PROCESSOR, GJvmProcessorClass))
 
 
 /* Définition du processeur de la JVM (instance) */
diff --git a/src/arch/raw.h b/src/arch/raw.h
index 1246d10..aac48ea 100644
--- a/src/arch/raw.h
+++ b/src/arch/raw.h
@@ -36,10 +36,12 @@
 /* ------------------------- INSTRUCTION INCONNUE / DONNEES ------------------------- */
 
 
-#define G_TYPE_RAW_INSTRUCTION                   g_raw_instruction_get_type()
-#define G_RAW_INSTRUCTION(obj)                   (G_TYPE_CHECK_INSTANCE_CAST((obj), g_raw_instruction_get_type(), GRawInstruction))
-#define G_IS_RAW_INSTRUCTION(obj)                (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_raw_instruction_get_type()))
-#define G_RAW_INSTRUCTION_GET_IFACE(inst)        (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_raw_instruction_get_type(), GRawInstructionIface))
+#define G_TYPE_RAW_INSTRUCTION            g_raw_instruction_get_type()
+#define G_RAW_INSTRUCTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_RAW_INSTRUCTION, GRawInstruction))
+#define G_IS_RAW_INSTRUCTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_RAW_INSTRUCTION))
+#define G_RAW_INSTRUCTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_RAW_INSTRUCTION, GRawInstructionClass))
+#define G_IS_RAW_INSTRUCTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_RAW_INSTRUCTION))
+#define G_RAW_INSTRUCTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_RAW_INSTRUCTION, GRawInstructionClass))
 
 
 /* Définition générique d'une instruction brute d'architecture (instance) */
diff --git a/src/format/executable.h b/src/format/executable.h
index ebb21d6..af69029 100644
--- a/src/format/executable.h
+++ b/src/format/executable.h
@@ -33,13 +33,12 @@
 
 
 
-#define G_TYPE_EXE_FORMAT               g_executable_format_get_type()
-#define G_EXE_FORMAT(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_executable_format_get_type(), GExeFormat))
-#define G_IS_EXE_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_executable_format_get_type()))
-#define G_EXE_FORMAT_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_executable_format_get_type(), GExeFormatIface))
-#define G_EXE_FORMAT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_EXE_FORMAT, GExeFormatClass))
-
-#define G_EXE_FORMAT_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_EXE_FORMAT, GExeFormatClass))
+#define G_TYPE_EXE_FORMAT            g_executable_format_get_type()
+#define G_EXE_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_EXE_FORMAT, GExeFormat))
+#define G_IS_EXE_FORMAT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_EXE_FORMAT))
+#define G_EXE_FORMAT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_EXE_FORMAT, GExeFormatClass))
+#define G_IS_EXE_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_EXE_FORMAT))
+#define G_EXE_FORMAT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_EXE_FORMAT, GExeFormatClass))
 
 
 /* Format d'exécutable générique (instance) */
diff --git a/src/format/java/java.h b/src/format/java/java.h
index f83f3e7..ad70e43 100755
--- a/src/format/java/java.h
+++ b/src/format/java/java.h
@@ -34,11 +34,12 @@
 
 
 
-#define G_TYPE_JAVA_FORMAT               g_java_format_get_type()
-#define G_JAVA_FORMAT(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_java_format_get_type(), GJavaFormat))
-#define G_IS_JAVA_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_java_format_get_type()))
-#define G_JAVA_FORMAT_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_java_format_get_type(), GJavaFormatIface))
-#define G_JAVA_FORMAT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JAVA_FORMAT, GJavaFormatClass))
+#define G_TYPE_JAVA_FORMAT            g_java_format_get_type()
+#define G_JAVA_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_JAVA_FORMAT, GJavaFormat))
+#define G_IS_JAVA_FORMAT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_JAVA_FORMAT))
+#define G_JAVA_FORMAT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_JAVA_FORMAT, GJavaFormatClass))
+#define G_IS_JAVA_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_JAVA_FORMAT))
+#define G_JAVA_FORMAT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_JAVA_FORMAT, GJavaFormatClass))
 
 
 /* Format d'exécutable Java (instance) */
diff --git a/src/format/pe/pe.h b/src/format/pe/pe.h
index c8dee42..f757d26 100644
--- a/src/format/pe/pe.h
+++ b/src/format/pe/pe.h
@@ -34,11 +34,12 @@
 
 
 
-#define G_TYPE_PE_FORMAT               g_pe_format_get_type()
-#define G_PE_FORMAT(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_pe_format_get_type(), GPeFormat))
-#define G_IS_PE_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_pe_format_get_type()))
-#define G_PE_FORMAT_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_pe_format_get_type(), GPeFormatIface))
-#define G_PE_FORMAT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_PE_FORMAT, GPeFormatClass))
+#define G_TYPE_PE_FORMAT            g_pe_format_get_type()
+#define G_PE_FORMAT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_PE_FORMAT, GPeFormat))
+#define G_IS_PE_FORMAT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_PE_FORMAT))
+#define G_PE_FORMAT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_PE_FORMAT, GPeFormatClass))
+#define G_IS_PE_FORMAT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_PE_FORMAT))
+#define G_PE_FORMAT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_PE_FORMAT, GPeFormatClass))
 
 
 /* Format d'exécutable PE (instance) */
diff --git a/src/mangling/itanium/context.h b/src/mangling/itanium/context.h
index 258e7b0..0ac5a6c 100644
--- a/src/mangling/itanium/context.h
+++ b/src/mangling/itanium/context.h
@@ -32,11 +32,12 @@
 
 
 
-#define G_TYPE_ITANIUM_DCONTEXT               g_itanium_dcontext_get_type()
-#define G_ITANIUM_DCONTEXT(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_itanium_dcontext_get_type(), GItaniumDContext))
-#define G_IS_ITANIUM_DCONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_itanium_dcontext_get_type()))
-#define G_ITANIUM_DCONTEXT_GET_IFACE(inst)    (G_TYPE_INSTANCE_GET_INTERFACE((inst), g_itanium_dcontext_get_type(), GItaniumDContextIface))
-#define G_ITANIUM_DCONTEXT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_ITANIUM_DCONTEXT, GItaniumDContextClass))
+#define G_TYPE_ITANIUM_DCONTEXT            g_itanium_dcontext_get_type()
+#define G_ITANIUM_DCONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_ITANIUM_DCONTEXT, GItaniumDContext))
+#define G_IS_ITANIUM_DCONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_ITANIUM_DCONTEXT))
+#define G_ITANIUM_DCONTEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_ITANIUM_DCONTEXT, GItaniumDContextClass))
+#define G_IS_ITANIUM_DCONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_ITANIUM_DCONTEXT))
+#define G_ITANIUM_DCONTEXT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_ITANIUM_DCONTEXT, GItaniumDContextClass))
 
 
 /* Contexte de décodage Itanium (instance) */