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

3 files changed, 18 insertions, 17 deletions

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) */