uobject: Rename some interface-related identifiers.

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

diff --git a/src/uobject/loadable.h b/src/uobject/loadable.h
index e5de5ad00af78199161cc123d32b11e3622ee9f3..296366b6272c6d7c4ecf0566c39d6700ae221891 100644 (file)
--- a/src/uobject/loadable.h
+++ b/src/uobject/loadable.h
@@ -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);