Hiroyuki Ikezoe
ikezo****@users*****
2006年 11月 27日 (月) 14:24:26 JST
Index: tomoe/lib/tomoe-char.c
diff -u tomoe/lib/tomoe-char.c:1.47 tomoe/lib/tomoe-char.c:1.48
--- tomoe/lib/tomoe-char.c:1.47 Mon Nov 27 11:02:57 2006
+++ tomoe/lib/tomoe-char.c Mon Nov 27 14:24:26 2006
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-char.c,v 1.47 2006/11/27 02:02:57 kous Exp $
+ * $Id: tomoe-char.c,v 1.48 2006/11/27 05:24:26 ikezoe Exp $
*/
#include <stdlib.h>
@@ -34,7 +34,7 @@
typedef struct _TomoeCharPrivate TomoeCharPrivate;
struct _TomoeCharPrivate
{
- char *charCode;
+ gchar *char_code;
TomoeWriting *writing;
GList *readings;
GHashTable *meta;
@@ -75,11 +75,11 @@
tomoe_char_init (TomoeChar *chr)
{
TomoeCharPrivate *priv = TOMOE_CHAR_GET_PRIVATE (chr);
- priv->charCode = NULL;
- priv->writing = NULL;
- priv->meta = g_hash_table_new_full(g_str_hash, g_str_equal,
- g_free, g_free);
- priv->readings = NULL;
+ priv->char_code = NULL;
+ priv->writing = NULL;
+ priv->meta = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, g_free);
+ priv->readings = NULL;
}
TomoeChar*
@@ -93,8 +93,8 @@
{
TomoeCharPrivate *priv = TOMOE_CHAR_GET_PRIVATE (object);
- if (priv->charCode)
- g_free (priv->charCode);
+ if (priv->char_code)
+ g_free (priv->char_code);
if (priv->writing)
g_object_unref (G_OBJECT (priv->writing));
if (priv->meta)
@@ -104,10 +104,10 @@
g_list_free (priv->readings);
}
- priv->charCode = NULL;
- priv->writing = NULL;
- priv->meta = NULL;
- priv->readings = NULL;
+ priv->char_code = NULL;
+ priv->writing = NULL;
+ priv->meta = NULL;
+ priv->readings = NULL;
G_OBJECT_CLASS (tomoe_char_parent_class)->dispose (object);
}
@@ -149,7 +149,7 @@
}
}
-const char*
+const gchar *
tomoe_char_get_code (TomoeChar* chr)
{
TomoeCharPrivate *priv;
@@ -157,7 +157,7 @@
g_return_val_if_fail (TOMOE_IS_CHAR (chr), NULL);
priv = TOMOE_CHAR_GET_PRIVATE (chr);
- return priv->charCode;
+ return priv->char_code;
}
void
@@ -168,8 +168,8 @@
g_return_if_fail (TOMOE_IS_CHAR (chr));
priv = TOMOE_CHAR_GET_PRIVATE (chr);
- g_free (priv->charCode);
- priv->charCode = code ? g_strdup (code) : NULL;
+ g_free (priv->char_code);
+ priv->char_code = code ? g_strdup (code) : NULL;
}
const GList *
@@ -232,8 +232,8 @@
priv_b = TOMOE_CHAR_GET_PRIVATE (b);
if (!priv_a || !priv_b) return 0;
- if (!priv_a->charCode || !priv_b->charCode) return 0;
- return strcmp (priv_a->charCode, priv_b->charCode);
+ if (!priv_a->char_code || !priv_b->char_code) return 0;
+ return strcmp (priv_a->char_code, priv_b->char_code);
}
void