uobject: More namespace cleanups.

[upkg.git] / src / uobject.c

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;
 }