]> git.draconx.ca Git - upkg.git/blobdiff - src/engine/texture.c
uobject: Don't expose symbols that don't start with uobject.
[upkg.git] / src / engine / texture.c
index 0e6e1c354bf8dc12b892425d8d2ccf918308e584..209409b2f9ecbe09513cde05c7b0a7b795e153f9 100644 (file)
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
 #include "texture.h"
 #include "upkg.h"
 
@@ -49,14 +49,14 @@ void exportable_init(UObjectExportable *e)
 {
 }
 
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, UOBJECT_TYPE);
 
 static int deserialize(UObject *o, struct upkg_file *f)
 {
        struct texture_priv *priv = TEXTURE_GET_PRIV(o);
        EngineTexture *t = ENGINE_TEXTURE(o);
 
-       U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+       UOBJECT_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 = U_OBJECT_CLASS(class);
+       UObjectClass *uo = UOBJECT_CLASS(class);
        GObjectClass *go = G_OBJECT_CLASS(class);
 
        g_type_class_add_private(class, sizeof (struct texture_priv));