uobject: Rename U_OBJECT_TYPE to U_TYPE_OBJECT.

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

diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index 7319ee68efb2d0b5b89aaa271c81c0e8844fdf8c..2f709403ef1bbbc8593b2e71fb48a4ceda738c0b 100644 (file)
--- a/src/uobject/uobject.h
+++ b/src/uobject/uobject.h
@@ -22,17 +22,17 @@
 #include <glib-object.h>
 #include "upkg.h"
 
-#define U_OBJECT_TYPE u_object_get_type()
+#define U_TYPE_OBJECT u_object_get_type()
 #define U_OBJECT(obj) \
-       G_TYPE_CHECK_INSTANCE_CAST(obj, U_OBJECT_TYPE, UObject)
+       G_TYPE_CHECK_INSTANCE_CAST(obj, U_TYPE_OBJECT, UObject)
 #define U_OBJECT_CLASS(class) \
-       G_TYPE_CHECK_CLASS_CAST(class, U_OBJECT_TYPE, UObjectClass)
+       G_TYPE_CHECK_CLASS_CAST(class, U_TYPE_OBJECT, UObjectClass)
 #define IS_U_OBJECT(obj) \
-       G_TYPE_CHECK_INSTANCE_TYPE(obj, U_OBJECT_TYPE)
+       G_TYPE_CHECK_INSTANCE_TYPE(obj, U_TYPE_OBJECT)
 #define IS_U_OBJECT_CLASS(class) \
-       G_TYPE_CHECK_CLASS_TYPE(class, U_OBJECT_TYPE, UObjectClass)
+       G_TYPE_CHECK_CLASS_TYPE(class, U_TYPE_OBJECT, UObjectClass)
 #define U_OBJECT_GET_CLASS(obj) \
-       G_TYPE_INSTANCE_GET_CLASS(obj, U_OBJECT_TYPE, UObjectClass)
+       G_TYPE_INSTANCE_GET_CLASS(obj, U_TYPE_OBJECT, UObjectClass)
 
 typedef struct UObject      UObject;
 typedef struct UObjectClass UObjectClass;
@@ -54,4 +54,6 @@ GType u_object_get_type(void);
 
 int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx);
 
+GObject *u_object_new_from_package(struct upkg *pkg, unsigned long idx);
+
 #endif