More changes to align with GOB2's expectations.
-static void exportable_init(UObjectExportable *);
-static void loadable_init(UObjectLoadable *);
+static void exportable_init(UObjectExportableIface *);
+static void loadable_init(UObjectLoadableIface *);
G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_TYPE_OBJECT, 0,
G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_TYPE_OBJECT, 0,
- G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_EXPORTABLE, exportable_init)
- G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_LOADABLE, loadable_init)
+ G_IMPLEMENT_INTERFACE(U_TYPE_OBJECT_EXPORTABLE, exportable_init)
+ G_IMPLEMENT_INTERFACE(U_TYPE_OBJECT_LOADABLE, loadable_init)
);
static int load(GObject *o)
);
static int load(GObject *o)
-static void exportable_init(UObjectExportable *e)
+static void exportable_init(UObjectExportableIface *e)
{
e->export = export;
e->export_name = export_name;
}
{
e->export = export;
e->export_name = export_name;
}
-static void loadable_init(UObjectLoadable *l)
+static void loadable_init(UObjectLoadableIface *l)
{
l->load = load;
l->unload = unload;
{
l->load = load;
l->unload = unload;
static GType type = 0;
if (type == 0) {
static const GTypeInfo info = {
static GType type = 0;
if (type == 0) {
static const GTypeInfo info = {
- sizeof (UObjectExportable),
+ sizeof (UObjectExportableIface),
#include <stdio.h>
#include <glib-object.h>
#include <stdio.h>
#include <glib-object.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, \
#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, \
#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 \
#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.
*/
/*
* 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);
GTypeInterface parent;
int (*export)(GObject *obj, FILE *f);
static GType type = 0;
if (type == 0) {
static const GTypeInfo info = {
static GType type = 0;
if (type == 0) {
static const GTypeInfo info = {
- sizeof (UObjectLoadable),
+ sizeof (UObjectLoadableIface),
#include <stdio.h>
#include <glib-object.h>
#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, \
#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, \
#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 \
#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
/*
* Interface for UObjects supporting "load" and "unload". These are generally
* useful -- textures and sounds, for example -- where you might want to keep
* around instances but the actual texture or sound data is not needed.
*/
* 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);
GTypeInterface parent;
int (*load)(GObject *obj);