uobject: Add a helper function to load objects from packages.

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

diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index ce5e326ee44092177d0d4a5b2cd9285b0dfa4923..0d0d45c1692b2568da4655f369143d3786617866 100644 (file)
--- 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,12 +13,11 @@
  *  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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UOBJECT_UOBJECT_H_
-#define UOBJECT_UOBJECT_H_
+#ifndef U_OBJECT_H_
+#define U_OBJECT_H_
 
 #include <glib-object.h>
 #include "upkg.h"
@@ -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