uobject: Make interface functions take UObjects directly.

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

diff --git a/src/uobject/exportable.h b/src/uobject/exportable.h
index fd6a0d7aa7297c9b4fec26144e987681cb937a15..4033a1a15976122704e152e1b67d7fe04a2bf758 100644 (file)
--- a/src/uobject/exportable.h
+++ b/src/uobject/exportable.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
@@ -20,27 +20,27 @@
 #define U_OBJECT_EXPORTABLE_H_
 
 #include <stdio.h>
-#include <glib-object.h>
+#include <uobject/uobject.h>
 
-#define U_OBJECT_TYPE_EXPORTABLE (u_object_exportable_get_type())
+#define U_TYPE_OBJECT_EXPORTABLE (u_object_exportable_get_type())
 #define U_OBJECT_EXPORTABLE(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, \
-       U_OBJECT_TYPE_EXPORTABLE, UObjectExportable)
+       U_TYPE_OBJECT_EXPORTABLE, UObjectExportableIface)
 #define U_OBJECT_IS_EXPORTABLE(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, \
-       U_OBJECT_TYPE_EXPORTABLE)
+       U_TYPE_OBJECT_EXPORTABLE)
 #define U_OBJECT_EXPORTABLE_GET_INTERFACE(inst) G_TYPE_INSTANCE_GET_INTERFACE \
-       (inst, U_OBJECT_TYPE_EXPORTABLE, UObjectExportable)
+       (inst, U_TYPE_OBJECT_EXPORTABLE, UObjectExportableIface)
 
-typedef struct UObjectExportable UObjectExportable;
+typedef struct UObjectExportableIface UObjectExportableIface;
 
 /*
  * Interface for UObjects that support exporting to a file.  For example, a
  * texture might be saved to disk as a PNG image for editing.
  */
-struct UObjectExportable {
+struct UObjectExportableIface {
        GTypeInterface parent;
 
-       int (*export)(GObject *obj, FILE *f);
-       int (*export_name)(GObject *obj, char *buf, size_t n);
+       int (*export)(UObject *obj, FILE *f);
+       int (*export_name)(UObject *obj, char *buf, size_t n);
 };
 
 GType u_object_exportable_get_type(void);