uobject: More namespace cleanups.

[upkg.git] / src / uobject / uobject.h

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