X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/0438ce1525f7c1e722140c046fccb0f686b4cab2..76b8a4bf05701afcd1be69ff4490a7c6be431dc4:/src/uobject/loadable.h?ds=inline
diff --git a/src/uobject/loadable.h b/src/uobject/loadable.h
index 8d45884..d862583 100644
--- a/src/uobject/loadable.h
+++ b/src/uobject/loadable.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,25 +13,23 @@
* 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 U_OBJECT_LOADABLE_H_
#define U_OBJECT_LOADABLE_H_
-#include
-#include
+#include
-#define U_OBJECT_TYPE_LOADABLE (u_object_loadable_get_type())
+#define U_TYPE_OBJECT_LOADABLE (u_object_loadable_get_type())
#define U_OBJECT_LOADABLE(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
- U_OBJECT_TYPE_LOADABLE, UObjectLoadable)
+ U_TYPE_OBJECT_LOADABLE, UObjectLoadableIface)
#define U_OBJECT_IS_LOADABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, \
- U_OBJECT_TYPE_LOADABLE)
+ U_TYPE_OBJECT_LOADABLE)
#define U_OBJECT_LOADABLE_GET_INTERFACE(inst) G_TYPE_INSTANCE_GET_INTERFACE \
- (inst, U_OBJECT_TYPE_LOADABLE, UObjectLoadable)
+ (inst, U_TYPE_OBJECT_LOADABLE, UObjectLoadableIface)
-typedef struct UObjectLoadable UObjectLoadable;
+typedef struct UObjectLoadableIface UObjectLoadableIface;
/*
* Interface for UObjects supporting "load" and "unload". These are generally
@@ -39,11 +37,11 @@ typedef struct UObjectLoadable UObjectLoadable;
* useful -- textures and sounds, for example -- where you might want to keep
* around instances but the actual texture or sound data is not needed.
*/
-struct UObjectLoadable {
+struct UObjectLoadableIface {
GTypeInterface parent;
- int (*load)(GObject *obj);
- void (*unload)(GObject *obj);
+ int (*load)(UObject *obj);
+ void (*unload)(UObject *obj);
};
GType u_object_loadable_get_type(void);