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

6 files changed, 36 insertions, 30 deletions

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