X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/c49355663c73c1775c179ec6360d09ce0978bb97..7a9046e942bc1f880f121f0be7e05ef80a0270c8:/src/uobject/uobject.h

diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index b9e16fa..2f70940 100644
--- a/src/uobject/uobject.h
+++ b/src/uobject/uobject.h
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright (C) 2009 Nick Bowler
+ *  Copyright © 2009-2011 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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