Other tools, such as gob2, expect this naming convention.
static void exportable_init(UObjectExportable *);
static void loadable_init(UObjectLoadable *);
-G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_OBJECT_TYPE, 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)
);
#include "palette.h"
#include "upkg.h"
-G_DEFINE_DYNAMIC_TYPE(EnginePalette, engine_palette, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EnginePalette, engine_palette, U_TYPE_OBJECT);
static int deserialize(UObject *uo)
{
{
}
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_TYPE_OBJECT);
static int deserialize(UObject *uo)
{
#include "pack.h"
#define U_OBJECT_GET_PRIV(o) \
- G_TYPE_INSTANCE_GET_PRIVATE(o, U_OBJECT_TYPE, struct u_object_priv)
+ G_TYPE_INSTANCE_GET_PRIVATE(o, U_TYPE_OBJECT, struct u_object_priv)
enum {
PROPERTY_BYTE = 1,
obj = u_object_new_from_package(uo->pkg, index-1);
}
- g_value_init(val, U_OBJECT_TYPE);
+ g_value_init(val, U_TYPE_OBJECT);
g_value_take_object(val, obj);
return 0;
}
#include <glib-object.h>
#include "upkg.h"
-#define U_OBJECT_TYPE u_object_get_type()
+#define U_TYPE_OBJECT u_object_get_type()
#define U_OBJECT(obj) \
- G_TYPE_CHECK_INSTANCE_CAST(obj, U_OBJECT_TYPE, UObject)
+ G_TYPE_CHECK_INSTANCE_CAST(obj, U_TYPE_OBJECT, UObject)
#define U_OBJECT_CLASS(class) \
- G_TYPE_CHECK_CLASS_CAST(class, U_OBJECT_TYPE, UObjectClass)
+ G_TYPE_CHECK_CLASS_CAST(class, U_TYPE_OBJECT, UObjectClass)
#define IS_U_OBJECT(obj) \
- G_TYPE_CHECK_INSTANCE_TYPE(obj, U_OBJECT_TYPE)
+ G_TYPE_CHECK_INSTANCE_TYPE(obj, U_TYPE_OBJECT)
#define IS_U_OBJECT_CLASS(class) \
- G_TYPE_CHECK_CLASS_TYPE(class, U_OBJECT_TYPE, UObjectClass)
+ G_TYPE_CHECK_CLASS_TYPE(class, U_TYPE_OBJECT, UObjectClass)
#define U_OBJECT_GET_CLASS(obj) \
- G_TYPE_INSTANCE_GET_CLASS(obj, U_OBJECT_TYPE, UObjectClass)
+ G_TYPE_INSTANCE_GET_CLASS(obj, U_TYPE_OBJECT, UObjectClass)
typedef struct UObject UObject;
typedef struct UObjectClass UObjectClass;