Kouhei Sutou
kous****@users*****
2006年 11月 27日 (月) 18:11:09 JST
Index: tomoe/lib/tomoe-dict.c
diff -u tomoe/lib/tomoe-dict.c:1.114 tomoe/lib/tomoe-dict.c:1.115
--- tomoe/lib/tomoe-dict.c:1.114 Mon Nov 27 18:05:48 2006
+++ tomoe/lib/tomoe-dict.c Mon Nov 27 18:11:09 2006
@@ -21,7 +21,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-dict.c,v 1.114 2006/11/27 09:05:48 kous Exp $
+ * $Id: tomoe-dict.c,v 1.115 2006/11/27 09:11:09 kous Exp $
*/
#include <stdio.h>
@@ -382,7 +382,7 @@
writing = tomoe_char_get_writing (chr);
if (!writing) return;
- n_strokes = tomoe_writing_get_number_of_strokes (writing);
+ n_strokes = tomoe_writing_get_n_strokes (writing);
if ((context->min_n_strokes < 0 || context->min_n_strokes <= n_strokes) &&
(context->max_n_strokes < 0 || context->max_n_strokes >= n_strokes)) {
context->results = g_list_prepend (context->results,
Index: tomoe/lib/tomoe-query.c
diff -u tomoe/lib/tomoe-query.c:1.1 tomoe/lib/tomoe-query.c:1.2
--- tomoe/lib/tomoe-query.c:1.1 Wed Nov 22 18:04:47 2006
+++ tomoe/lib/tomoe-query.c Mon Nov 27 18:11:09 2006
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-query.c,v 1.1 2006/11/22 09:04:47 kous Exp $
+ * $Id: tomoe-query.c,v 1.2 2006/11/27 09:11:09 kous Exp $
*/
#include <stdlib.h>
@@ -38,7 +38,7 @@
GList *readings;
GList *radicals;
GList *variants;
- gint number_of_strokes;
+ gint n_strokes;
TomoeWriting *writing;
};
@@ -48,7 +48,7 @@
PROP_READINGS,
PROP_RADICALS,
PROP_VARIANTS,
- PROP_NUMBER_OF_STROKES,
+ PROP_N_STROKES,
PROP_WRITING
};
@@ -86,7 +86,7 @@
priv->readings = NULL;
priv->radicals = NULL;
priv->variants = NULL;
- priv->number_of_strokes = -1;
+ priv->n_strokes = -1;
priv->writing = NULL;
}
@@ -120,7 +120,7 @@
priv->readings = NULL;
priv->radicals = NULL;
priv->variants = NULL;
- priv->number_of_strokes = -1;
+ priv->n_strokes = -1;
priv->writing = NULL;
G_OBJECT_CLASS (tomoe_query_parent_class)->dispose (object);
Index: tomoe/lib/tomoe-query.h
diff -u tomoe/lib/tomoe-query.h:1.1 tomoe/lib/tomoe-query.h:1.2
--- tomoe/lib/tomoe-query.h:1.1 Wed Nov 22 18:04:47 2006
+++ tomoe/lib/tomoe-query.h Mon Nov 27 18:11:09 2006
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-query.h,v 1.1 2006/11/22 09:04:47 kous Exp $
+ * $Id: tomoe-query.h,v 1.2 2006/11/27 09:11:09 kous Exp $
*/
/**
@@ -71,7 +71,7 @@
TomoeChar *chr);
void tomoe_query_add_variant (TomoeQuery *query,
TomoeChar *chr);
-void tomoe_query_set_number_of_strokes (TomoeQuery *query,
+void tomoe_query_set_n_strokes (TomoeQuery *query,
gint num);
void tomoe_query_set_writing (TomoeQuery *query,
TomoeWriting *writing);
Index: tomoe/lib/tomoe-writing.c
diff -u tomoe/lib/tomoe-writing.c:1.10 tomoe/lib/tomoe-writing.c:1.11
--- tomoe/lib/tomoe-writing.c:1.10 Mon Nov 27 15:46:41 2006
+++ tomoe/lib/tomoe-writing.c Mon Nov 27 18:11:09 2006
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-writing.c,v 1.10 2006/11/27 06:46:41 kous Exp $
+ * $Id: tomoe-writing.c,v 1.11 2006/11/27 09:11:09 kous Exp $
*/
#include <stdlib.h>
@@ -34,7 +34,7 @@
{
GList *stroke_first;
GList *stroke_last;
- guint number_of_strokes;
+ guint n_strokes;
};
G_DEFINE_TYPE (TomoeWriting, tomoe_writing, G_TYPE_OBJECT)
@@ -93,7 +93,7 @@
if (!priv->stroke_first)
priv->stroke_first = priv->stroke_last;
priv->stroke_last = g_list_last (priv->stroke_last);
- priv->number_of_strokes++;
+ priv->n_strokes++;
}
void
@@ -126,11 +126,11 @@
priv->stroke_first = NULL;
priv->stroke_last = NULL;
- priv->number_of_strokes = 0;
+ priv->n_strokes = 0;
}
guint
-tomoe_writing_get_number_of_strokes (TomoeWriting *writing)
+tomoe_writing_get_n_strokes (TomoeWriting *writing)
{
TomoeWritingPrivate *priv;
@@ -139,7 +139,7 @@
priv = TOMOE_WRITING_GET_PRIVATE(writing);
g_return_val_if_fail (priv, 0);
- return priv->number_of_strokes;
+ return priv->n_strokes;
}
void
@@ -160,7 +160,7 @@
priv->stroke_first = g_list_remove (priv->stroke_first, stroke);
priv->stroke_last = g_list_last (priv->stroke_first);
- priv->number_of_strokes--;
+ priv->n_strokes--;
_stroke_free (stroke);
}
Index: tomoe/lib/tomoe-writing.h
diff -u tomoe/lib/tomoe-writing.h:1.8 tomoe/lib/tomoe-writing.h:1.9
--- tomoe/lib/tomoe-writing.h:1.8 Mon Nov 27 14:50:32 2006
+++ tomoe/lib/tomoe-writing.h Mon Nov 27 18:11:09 2006
@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: tomoe-writing.h,v 1.8 2006/11/27 05:50:32 kous Exp $
+ * $Id: tomoe-writing.h,v 1.9 2006/11/27 09:11:09 kous Exp $
*/
/** @file tomoe-handwrite.h
@@ -74,8 +74,7 @@
gint x,
gint y);
void tomoe_writing_clear (TomoeWriting *writing);
-guint tomoe_writing_get_number_of_strokes
- (TomoeWriting *writing);
+guint tomoe_writing_get_n_strokes (TomoeWriting *writing);
void tomoe_writing_remove_last_stroke(TomoeWriting *writing);
const GList *tomoe_writing_get_strokes (TomoeWriting *writing);