X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4a3125b61348969b91b9642bba803fc17135c189..949182326954cce40971b97af387cc4c0196617b:/src/uobject/loadable.h?ds=sidebyside

diff --git a/src/uobject/loadable.h b/src/uobject/loadable.h
index 68d7772..296366b 100644
--- a/src/uobject/loadable.h
+++ b/src/uobject/loadable.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,15 +22,15 @@
 #include <stdio.h>
 #include <glib-object.h>
 
-#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
@@ -38,7 +38,7 @@ 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);