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

5 files changed, 30 insertions, 22 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) */