X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4cac9f15932adee255ed2be1f6d419ffe068c438..7a9046e942bc1f880f121f0be7e05ef80a0270c8:/src/uobject/uobject.h
diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index ce5e326..2f70940 100644
--- a/src/uobject/uobject.h
+++ b/src/uobject/uobject.h
@@ -1,10 +1,10 @@
/*
* 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,27 +13,26 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see .
*/
-#ifndef UOBJECT_UOBJECT_H_
-#define UOBJECT_UOBJECT_H_
+#ifndef U_OBJECT_H_
+#define U_OBJECT_H_
#include
#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;
@@ -43,20 +42,18 @@ struct UObject {
struct upkg *pkg;
struct upkg_file *pkg_file;
- unsigned long pkg_idx;
};
struct UObjectClass {
GObjectClass parent;
- int (*deserialize)(UObject *obj, struct upkg_file *f);
+ int (*deserialize)(UObject *obj);
};
GType u_object_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);
+GObject *u_object_new_from_package(struct upkg *pkg, unsigned long idx);
+
#endif