uobject: More namespace cleanups.

diff --git a/src/engine/music.c b/src/engine/music.c
index 565a6a0528b975c2441c3363785a18ff0d566dc9..434d881fda70d1fe51f1efd2bd3989f05a4eadb6 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -40,9 +40,9 @@ 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_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_EXPORTABLE, exportable_init)
-       G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_LOADABLE, loadable_init)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, UOBJECT_TYPE, 0,
+       G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_EXPORTABLE, exportable_init)
+       G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_LOADABLE, loadable_init)
 );
 
 static int load(GObject *o)
@@ -129,7 +129,7 @@ static int deserialize(UObject *o, struct upkg_file *f)
        unsigned char buf[32];
        long size;
 
-       U_OBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
+       UOBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
 
        buflen = upkg_export_read(f, buf, sizeof buf);
 
@@ -183,7 +183,7 @@ static void engine_music_finalize(GObject *o)
 
 static void engine_music_class_init(EngineMusicClass *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 music_priv));
 

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 9cd6571bbae872ed89bfe333f9ca7fd4229831de..209409b2f9ecbe09513cde05c7b0a7b795e153f9 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, 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));

diff --git a/src/exportable.c b/src/exportable.c
index 8bda8506324711dfc949eca218a5cc059a8d3ab1..5553014b3d86cc1222c6c064439edba41028bdeb 100644 (file)
--- a/src/exportable.c
+++ b/src/exportable.c
@@ -21,7 +21,7 @@
 #include <glib-object.h>
 #include <uobject/exportable.h>
 
-GType u_object_exportable_get_type(void)
+GType uobject_exportable_get_type(void)
 {
        static GType type = 0;
        if (type == 0) {
@@ -37,14 +37,14 @@ GType u_object_exportable_get_type(void)
        return type;
 }
 
-int u_object_export(GObject *obj, FILE *f)
+int uobject_export(GObject *obj, FILE *f)
 {
-       g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(obj), -1);
-       return U_OBJECT_EXPORTABLE_GET_INTERFACE(obj)->export(obj, f);
+       g_return_val_if_fail(UOBJECT_IS_EXPORTABLE(obj), -1);
+       return UOBJECT_EXPORTABLE_GET_INTERFACE(obj)->export(obj, f);
 }
 
-int u_object_export_name(GObject *obj, char *buf, size_t n)
+int uobject_export_name(GObject *obj, char *buf, size_t n)
 {
-       g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(obj), -1);
-       return U_OBJECT_EXPORTABLE_GET_INTERFACE(obj)->export_name(obj, buf, n);
+       g_return_val_if_fail(UOBJECT_IS_EXPORTABLE(obj), -1);
+       return UOBJECT_EXPORTABLE_GET_INTERFACE(obj)->export_name(obj, buf, n);
 }

diff --git a/src/loadable.c b/src/loadable.c
index c4970ec65178219570e1c620ae24e8a3244ef18a..a7c18201ba0d297fdaf2fd71013bf2a54591ad29 100644 (file)
--- a/src/loadable.c
+++ b/src/loadable.c
@@ -21,7 +21,7 @@
 #include <glib-object.h>
 #include <uobject/loadable.h>
 
-GType u_object_loadable_get_type(void)
+GType uobject_loadable_get_type(void)
 {
        static GType type = 0;
        if (type == 0) {
@@ -37,14 +37,14 @@ GType u_object_loadable_get_type(void)
        return type;
 }
 
-int u_object_load(GObject *obj)
+int uobject_load(GObject *obj)
 {
-       g_return_val_if_fail(U_OBJECT_IS_LOADABLE(obj), -1);
-       return U_OBJECT_LOADABLE_GET_INTERFACE(obj)->load(obj);
+       g_return_val_if_fail(UOBJECT_IS_LOADABLE(obj), -1);
+       return UOBJECT_LOADABLE_GET_INTERFACE(obj)->load(obj);
 }
 
-void u_object_unload(GObject *obj)
+void uobject_unload(GObject *obj)
 {
-       g_return_if_fail(U_OBJECT_IS_LOADABLE(obj));
-       U_OBJECT_LOADABLE_GET_INTERFACE(obj)->unload(obj);
+       g_return_if_fail(UOBJECT_IS_LOADABLE(obj));
+       UOBJECT_LOADABLE_GET_INTERFACE(obj)->unload(obj);
 }

diff --git a/src/uobject.c b/src/uobject.c
index ec517b7bd0bb97f60ee7d01e5eaed01a0c118e96..e271a678bb83f2f3b44ab568f4d6a041805f50d2 100644 (file)
--- a/src/uobject.c
+++ b/src/uobject.c
@@ -27,8 +27,8 @@
 #include "upkg.h"
 #include "pack.h"
 
-#define U_OBJECT_GET_PRIV(o) \
-       G_TYPE_INSTANCE_GET_PRIVATE(o, U_OBJECT_TYPE, struct uobject_priv)
+#define UOBJECT_GET_PRIV(o) \
+       G_TYPE_INSTANCE_GET_PRIVATE(o, UOBJECT_TYPE, struct uobject_priv)
 
 enum {
        PROPERTY_BYTE = 1,
@@ -61,7 +61,7 @@ struct uobject_priv {
        unsigned long nbuf;
 };
 
-G_DEFINE_TYPE(UObject, u_object, G_TYPE_OBJECT);
+G_DEFINE_TYPE(UObject, uobject, G_TYPE_OBJECT);
 
 static unsigned long
 get_real_size(unsigned long *real, unsigned size, unsigned char *buf, size_t n)
@@ -95,7 +95,7 @@ get_real_size(unsigned long *real, unsigned size, unsigned char *buf, size_t n)
 static unsigned long
 decode_property(UObject *o, const char *name, struct upkg_file *f, unsigned long len)
 {
-       struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
+       struct uobject_priv *priv = UOBJECT_GET_PRIV(o);
        unsigned long real_size, rc;
        int type, size, top;
        GValue val = {0};
@@ -149,7 +149,7 @@ decode_property(UObject *o, const char *name, struct upkg_file *f, unsigned long
 /* Deserialize properties from an Unreal package. */
 static int deserialize(UObject *o, struct upkg_file *f)
 {
-       struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
+       struct uobject_priv *priv = UOBJECT_GET_PRIV(o);
        unsigned long rc, tot_len = 0;
 
        while (1) {
@@ -181,7 +181,7 @@ static int deserialize(UObject *o, struct upkg_file *f)
                        break;
                }
 
-               rc = decode_property(U_OBJECT(o), name, f, len);
+               rc = decode_property(UOBJECT(o), name, f, len);
                if (rc == 0)
                        return -1;
                len = rc;
@@ -196,10 +196,10 @@ static int deserialize(UObject *o, struct upkg_file *f)
        return 0;
 }
 
-int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
+int uobject_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
 {
-       g_return_val_if_fail(IS_U_OBJECT(obj), -1);
-       UObject *uo = U_OBJECT(obj);
+       g_return_val_if_fail(IS_UOBJECT(obj), -1);
+       UObject *uo = UOBJECT(obj);
        struct upkg_file *f;
        int rc;
 
@@ -209,7 +209,7 @@ int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
                return -1;
        }
 
-       rc = U_OBJECT_GET_CLASS(obj)->deserialize(uo, f);
+       rc = UOBJECT_GET_CLASS(obj)->deserialize(uo, f);
        if (rc != 0) {
                upkg_export_close(f);
        } else {
@@ -221,29 +221,29 @@ int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
        return rc;
 }
 
-static void u_object_init(UObject *o)
+static void uobject_init(UObject *o)
 {
        o->pkg      = NULL;
        o->pkg_file = NULL;
        o->pkg_idx  = 0;
 }
 
-static void u_object_finalize(GObject *o)
+static void uobject_finalize(GObject *o)
 {
-       UObject *uo = U_OBJECT(o);
+       UObject *uo = UOBJECT(o);
 
        if (uo->pkg_file) {
                upkg_export_close(uo->pkg_file);
        }
 
-       G_OBJECT_CLASS(u_object_parent_class)->finalize(o);
+       G_OBJECT_CLASS(uobject_parent_class)->finalize(o);
 }
 
-static void u_object_class_init(UObjectClass *class)
+static void uobject_class_init(UObjectClass *class)
 {
        g_type_class_add_private(class, sizeof (struct uobject_priv));
        GObjectClass *go = G_OBJECT_CLASS(class);
 
        class->deserialize = deserialize;
-       go->finalize       = u_object_finalize;
+       go->finalize       = uobject_finalize;
 }

diff --git a/src/uobject/exportable.h b/src/uobject/exportable.h
index da4c719b97fe136d2a751d5e7d47c717811a68f4..931d5b94a4010895b8d870d3090419837d7be0ef 100644 (file)
--- a/src/uobject/exportable.h
+++ b/src/uobject/exportable.h
@@ -23,13 +23,13 @@
 #include <stdio.h>
 #include <glib-object.h>
 
-#define U_OBJECT_TYPE_EXPORTABLE (u_object_exportable_get_type())
-#define U_OBJECT_EXPORTABLE(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
-       U_OBJECT_TYPE_EXPORTABLE, UObjectExportable)
-#define U_OBJECT_IS_EXPORTABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, \
-       U_OBJECT_TYPE_EXPORTABLE)
-#define U_OBJECT_EXPORTABLE_GET_INTERFACE(inst) G_TYPE_INSTANCE_GET_INTERFACE \
-       (inst, U_OBJECT_TYPE_EXPORTABLE, UObjectExportable)
+#define UOBJECT_TYPE_EXPORTABLE (uobject_exportable_get_type())
+#define UOBJECT_EXPORTABLE(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
+       UOBJECT_TYPE_EXPORTABLE, UObjectExportable)
+#define UOBJECT_IS_EXPORTABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, \
+       UOBJECT_TYPE_EXPORTABLE)
+#define UOBJECT_EXPORTABLE_GET_INTERFACE(inst) G_TYPE_INSTANCE_GET_INTERFACE \
+       (inst, UOBJECT_TYPE_EXPORTABLE, UObjectExportable)
 
 typedef struct UObjectExportable UObjectExportable;
 
@@ -40,9 +40,9 @@ struct UObjectExportable {
        int (*export_name)(GObject *obj, char *buf, size_t n);
 };
 
-GType u_object_exportable_get_type(void);
+GType uobject_exportable_get_type(void);
 
-int u_object_export(GObject *obj, FILE *f);
-int u_object_export_name(GObject *obj, char *buf, size_t n);
+int uobject_export(GObject *obj, FILE *f);
+int uobject_export_name(GObject *obj, char *buf, size_t n);
 
 #endif

diff --git a/src/uobject/loadable.h b/src/uobject/loadable.h
index dbae55bf174c05dc06cb0874a59c4452fdc9701b..90888e9b0703de18c9397481ff8af58bcd918fee 100644 (file)
--- a/src/uobject/loadable.h
+++ b/src/uobject/loadable.h
@@ -23,13 +23,13 @@
 #include <stdio.h>
 #include <glib-object.h>
 
-#define U_OBJECT_TYPE_LOADABLE (u_object_loadable_get_type())
-#define U_OBJECT_LOADABLE(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
-       U_OBJECT_TYPE_LOADABLE, UObjectLoadable)
-#define U_OBJECT_IS_LOADABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, \
-       U_OBJECT_TYPE_LOADABLE)
-#define U_OBJECT_LOADABLE_GET_INTERFACE(inst) G_TYPE_INSTANCE_GET_INTERFACE \
-       (inst, U_OBJECT_TYPE_LOADABLE, UObjectLoadable)
+#define UOBJECT_TYPE_LOADABLE (uobject_loadable_get_type())
+#define UOBJECT_LOADABLE(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
+       UOBJECT_TYPE_LOADABLE, UObjectLoadable)
+#define UOBJECT_IS_LOADABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, \
+       UOBJECT_TYPE_LOADABLE)
+#define UOBJECT_LOADABLE_GET_INTERFACE(inst) G_TYPE_INSTANCE_GET_INTERFACE \
+       (inst, UOBJECT_TYPE_LOADABLE, UObjectLoadable)
 
 typedef struct UObjectLoadable UObjectLoadable;
 
@@ -40,9 +40,9 @@ struct UObjectLoadable {
        void (*unload)(GObject *obj);
 };
 
-GType u_object_loadable_get_type(void);
+GType uobject_loadable_get_type(void);
 
-int u_object_load(GObject *obj);
-void u_object_unload(GObject *obj);
+int uobject_load(GObject *obj);
+void uobject_unload(GObject *obj);
 
 #endif

diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index ce5e326ee44092177d0d4a5b2cd9285b0dfa4923..dfca528d10dff03095cc549fa32adc965a0564ef 100644 (file)
--- a/src/uobject/uobject.h
+++ b/src/uobject/uobject.h
@@ -23,17 +23,17 @@
 #include <glib-object.h>
 #include "upkg.h"
 
-#define U_OBJECT_TYPE u_object_get_type()
-#define U_OBJECT(obj) \
-       G_TYPE_CHECK_INSTANCE_CAST(obj, U_OBJECT_TYPE, UObject)
-#define U_OBJECT_CLASS(class) \
-       G_TYPE_CHECK_CLASS_CAST(class, U_OBJECT_TYPE, UObjectClass)
-#define IS_U_OBJECT(obj) \
-       G_TYPE_CHECK_INSTANCE_TYPE(obj, U_OBJECT_TYPE)
-#define IS_U_OBJECT_CLASS(class) \
-       G_TYPE_CHECK_CLASS_TYPE(class, U_OBJECT_TYPE, UObjectClass)
-#define U_OBJECT_GET_CLASS(obj) \
-       G_TYPE_INSTANCE_GET_CLASS(obj, U_OBJECT_TYPE, UObjectClass)
+#define UOBJECT_TYPE uobject_get_type()
+#define UOBJECT(obj) \
+       G_TYPE_CHECK_INSTANCE_CAST(obj, UOBJECT_TYPE, UObject)
+#define UOBJECT_CLASS(class) \
+       G_TYPE_CHECK_CLASS_CAST(class, UOBJECT_TYPE, UObjectClass)
+#define IS_UOBJECT(obj) \
+       G_TYPE_CHECK_INSTANCE_TYPE(obj, UOBJECT_TYPE)
+#define IS_UOBJECT_CLASS(class) \
+       G_TYPE_CHECK_CLASS_TYPE(class, UOBJECT_TYPE, UObjectClass)
+#define UOBJECT_GET_CLASS(obj) \
+       G_TYPE_INSTANCE_GET_CLASS(obj, UOBJECT_TYPE, UObjectClass)
 
 typedef struct UObject      UObject;
 typedef struct UObjectClass UObjectClass;
@@ -52,11 +52,8 @@ struct UObjectClass {
        int (*deserialize)(UObject *obj, struct upkg_file *f);
 };
 
-GType u_object_get_type(void);
+GType uobject_get_type(void);
 
-const GValue *u_object_get_property(UObject *obj, const char *name);
-void u_object_set_property(UObject *obj, const char *name, const GValue *val);
-
-int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx);
+int uobject_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx);
 
 #endif

diff --git a/src/upkg.c b/src/upkg.c
index c8d2469ae7578039acf5411ce11096683d9479b5..e1a8a805f8bfbb83a37f112a66b102df04567030 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -157,15 +157,15 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
        char name[256];
        FILE *of;
 
-       if (u_object_deserialize(obj, pkg, idx) != 0) {
+       if (uobject_deserialize(obj, pkg, idx) != 0) {
                return -1;
        }
 
-       if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+       if (UOBJECT_IS_LOADABLE(obj) && uobject_load(obj) != 0) {
                return -1;
        }
 
-       u_object_export_name(obj, name, sizeof name);
+       uobject_export_name(obj, name, sizeof name);
 
        printf("exporting %s to %s\n", upkg_export_name(pkg, idx), name);
        of = fopen(name, "wb");
@@ -174,15 +174,15 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
                return -1;
        }
 
-       u_object_export(obj, of);
+       uobject_export(obj, of);
 
        if (fclose(of) != 0) {
                perror(name);
                return -1;
        }
 
-       if (U_OBJECT_IS_LOADABLE(obj)) {
-               u_object_unload(obj);
+       if (UOBJECT_IS_LOADABLE(obj)) {
+               uobject_unload(obj);
        }
 
        return 0;
@@ -206,7 +206,7 @@ int package_export(struct upkg *pkg)
                if (!type) continue;
 
                obj = g_object_new(type, NULL);
-               if (U_OBJECT_IS_EXPORTABLE(obj)) {
+               if (UOBJECT_IS_EXPORTABLE(obj)) {
                        if (export(pkg, obj, i) != 0) {
                                rc = EXIT_FAILURE;
                        }