uobject: Rename U_OBJECT_TYPE to U_TYPE_OBJECT.

Other tools, such as gob2, expect this naming convention.

diff --git a/src/engine/music.c b/src/engine/music.c
index eb209bb629fe7f9eee64da87b2a19f0c0d27e03d..87cbec553d5d14c5a4f66c46b07e98e65cc4fe8d 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -38,7 +38,7 @@ struct music_priv {
 static void exportable_init(UObjectExportable *);
 static void loadable_init(UObjectLoadable *);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_OBJECT_TYPE, 0,
+G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_TYPE_OBJECT, 0,
        G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_EXPORTABLE, exportable_init)
        G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_LOADABLE, loadable_init)
 );

diff --git a/src/engine/palette.c b/src/engine/palette.c
index 4bea975072b3a347720e6477a140a42ea7c6ad22..6ad05944634852bc0917c3cd25a6d84bed7cbc5e 100644 (file)
--- a/src/engine/palette.c
+++ b/src/engine/palette.c
@@ -22,7 +22,7 @@
 #include "palette.h"
 #include "upkg.h"
 
-G_DEFINE_DYNAMIC_TYPE(EnginePalette, engine_palette, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EnginePalette, engine_palette, U_TYPE_OBJECT);
 
 static int deserialize(UObject *uo)
 {

diff --git a/src/engine/texture.c b/src/engine/texture.c
index db6edd02487c6d4a93464a7aa6d2738400b49cc2..499a397216c4c811090807301d531e463683818e 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -54,7 +54,7 @@ void exportable_init(UObjectExportable *e)
 {
 }
 
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_TYPE_OBJECT);
 
 static int deserialize(UObject *uo)
 {

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 15a26b562f4e585849c25530c0913a3ca7a72b5b..a64cf17718f5259b7fcdf91db37fbb545099eb49 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -28,7 +28,7 @@
 #include "pack.h"
 
 #define U_OBJECT_GET_PRIV(o) \
-       G_TYPE_INSTANCE_GET_PRIVATE(o, U_OBJECT_TYPE, struct u_object_priv)
+       G_TYPE_INSTANCE_GET_PRIVATE(o, U_TYPE_OBJECT, struct u_object_priv)
 
 enum {
        PROPERTY_BYTE = 1,
@@ -104,7 +104,7 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
                obj = u_object_new_from_package(uo->pkg, index-1);
        }
 
-       g_value_init(val, U_OBJECT_TYPE);
+       g_value_init(val, U_TYPE_OBJECT);
        g_value_take_object(val, obj);
        return 0;
 }

diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index 0d0d45c1692b2568da4655f369143d3786617866..2f709403ef1bbbc8593b2e71fb48a4ceda738c0b 100644 (file)
--- a/src/uobject/uobject.h
+++ b/src/uobject/uobject.h
@@ -22,17 +22,17 @@
 #include <glib-object.h>
 #include "upkg.h"
 
-#define U_OBJECT_TYPE u_object_get_type()
+#define U_TYPE_OBJECT u_object_get_type()
 #define U_OBJECT(obj) \
-       G_TYPE_CHECK_INSTANCE_CAST(obj, U_OBJECT_TYPE, UObject)
+       G_TYPE_CHECK_INSTANCE_CAST(obj, U_TYPE_OBJECT, UObject)
 #define U_OBJECT_CLASS(class) \
-       G_TYPE_CHECK_CLASS_CAST(class, U_OBJECT_TYPE, UObjectClass)
+       G_TYPE_CHECK_CLASS_CAST(class, U_TYPE_OBJECT, UObjectClass)
 #define IS_U_OBJECT(obj) \
-       G_TYPE_CHECK_INSTANCE_TYPE(obj, U_OBJECT_TYPE)
+       G_TYPE_CHECK_INSTANCE_TYPE(obj, U_TYPE_OBJECT)
 #define IS_U_OBJECT_CLASS(class) \
-       G_TYPE_CHECK_CLASS_TYPE(class, U_OBJECT_TYPE, UObjectClass)
+       G_TYPE_CHECK_CLASS_TYPE(class, U_TYPE_OBJECT, UObjectClass)
 #define U_OBJECT_GET_CLASS(obj) \
-       G_TYPE_INSTANCE_GET_CLASS(obj, U_OBJECT_TYPE, UObjectClass)
+       G_TYPE_INSTANCE_GET_CLASS(obj, U_TYPE_OBJECT, UObjectClass)
 
 typedef struct UObject      UObject;
 typedef struct UObjectClass UObjectClass;