uobject: Namespace changes.

[upkg.git] / src / engine / texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 209409b2f9ecbe09513cde05c7b0a7b795e153f9..9cd6571bbae872ed89bfe333f9ca7fd4229831de 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -49,14 +49,14 @@ void exportable_init(UObjectExportable *e)
 {
 }
 
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, UOBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
 
 static int deserialize(UObject *o, struct upkg_file *f)
 {
        struct texture_priv *priv = TEXTURE_GET_PRIV(o);
        EngineTexture *t = ENGINE_TEXTURE(o);
 
-       UOBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+       U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
 
        printf("Texture size: %ux%u\n", t->usize, t->vsize);
 
@@ -109,7 +109,7 @@ static void engine_texture_init(EngineTexture *t)
 
 static void engine_texture_class_init(EngineTextureClass *class)
 {
-       UObjectClass *uo = UOBJECT_CLASS(class);
+       UObjectClass *uo = U_OBJECT_CLASS(class);
        GObjectClass *go = G_OBJECT_CLASS(class);
 
        g_type_class_add_private(class, sizeof (struct texture_priv));