From 7a9046e942bc1f880f121f0be7e05ef80a0270c8 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 23 Mar 2011 18:39:04 -0400
Subject: [PATCH] uobject: Rename U_OBJECT_TYPE to U_TYPE_OBJECT.

Other tools, such as gob2, expect this naming convention.
---
 src/engine/music.c    |  2 +-
 src/engine/palette.c  |  2 +-
 src/engine/texture.c  |  2 +-
 src/uobject/uobject.c |  4 ++--
 src/uobject/uobject.h | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/engine/music.c b/src/engine/music.c
index eb209bb..87cbec5 100644
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -38,7 +38,7 @@ struct music_priv {
 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)
 );
diff --git a/src/engine/palette.c b/src/engine/palette.c
index 4bea975..6ad0594 100644
--- a/src/engine/palette.c
+++ b/src/engine/palette.c
@@ -22,7 +22,7 @@
 #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)
 {
diff --git a/src/engine/texture.c b/src/engine/texture.c
index db6edd0..499a397 100644
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -54,7 +54,7 @@ void exportable_init(UObjectExportable *e)
 {
 }
 
-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)
 {
diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 15a26b5..a64cf17 100644
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -28,7 +28,7 @@
 #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,
@@ -104,7 +104,7 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
 		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;
 }
diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index 0d0d45c..2f70940 100644
--- a/src/uobject/uobject.h
+++ b/src/uobject/uobject.h
@@ -22,17 +22,17 @@
 #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;
-- 
2.43.0