GNOME.org
 

gucharmap r1732 - in trunk: docs/reference docs/reference/tmpl gucharmap

Author: chpe
Date: Fri Mar 21 11:03:52 2008
New Revision: 1732
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1732&view=rev

Log:
Make GucharmapCodepointList abstract, and move the block codepoint list to GucharmapBlockCodepointList.


Added:
   trunk/docs/reference/tmpl/gucharmap-block-codepoint-list.sgml
      - copied, changed from r1731, /trunk/docs/reference/tmpl/gucharmap.sgml
   trunk/gucharmap/gucharmap-block-codepoint-list.c
   trunk/gucharmap/gucharmap-block-codepoint-list.h
Modified:
   trunk/docs/reference/gucharmap-sections.txt
   trunk/docs/reference/gucharmap.types
   trunk/docs/reference/tmpl/gucharmap-codepoint-list.sgml
   trunk/docs/reference/tmpl/gucharmap-script-codepoint-list.sgml
   trunk/docs/reference/tmpl/gucharmap-unused.sgml
   trunk/docs/reference/tmpl/gucharmap.sgml
   trunk/gucharmap/Makefile.am
   trunk/gucharmap/gucharmap-block-chapters-model.c
   trunk/gucharmap/gucharmap-chapters-model.c
   trunk/gucharmap/gucharmap-codepoint-list.c
   trunk/gucharmap/gucharmap-codepoint-list.h
   trunk/gucharmap/gucharmap-script-codepoint-list.h
   trunk/gucharmap/gucharmap.h.in

Modified: trunk/docs/reference/gucharmap-sections.txt
==============================================================================
--- trunk/docs/reference/gucharmap-sections.txt	(original)
+++ trunk/docs/reference/gucharmap-sections.txt	Fri Mar 21 11:03:52 2008
@@ -2,7 +2,6 @@
 <FILE>gucharmap-codepoint-list</FILE>
 <TITLE>GucharmapCodepointList</TITLE>
 GucharmapCodepointList
-gucharmap_codepoint_list_new
 gucharmap_codepoint_list_get_char
 gucharmap_codepoint_list_get_index
 gucharmap_codepoint_list_get_last_index
@@ -53,6 +52,22 @@
 </SECTION>
 
 <SECTION>
+<FILE>gucharmap-block-codepoint-list</FILE>
+GucharmapBlockCodepointListPrivate
+<TITLE>GucharmapBlockCodepointList</TITLE>
+GucharmapBlockCodepointList
+gucharmap_block_codepoint_list_new
+<SUBSECTION Standard>
+GUCHARMAP_BLOCK_CODEPOINT_LIST
+GUCHARMAP_IS_BLOCK_CODEPOINT_LIST
+GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST
+gucharmap_block_codepoint_list_get_type
+GUCHARMAP_BLOCK_CODEPOINT_LIST_CLASS
+GUCHARMAP_IS_BLOCK_CODEPOINT_LIST_CLASS
+GUCHARMAP_BLOCK_CODEPOINT_LIST_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>gucharmap-chartable</FILE>
 GucharmapChartablePrivate
 <TITLE>GucharmapChartable</TITLE>
@@ -95,6 +110,7 @@
 
 <SECTION>
 <FILE>gucharmap-script-codepoint-list</FILE>
+GucharmapScriptCodepointListPrivate
 <TITLE>GucharmapScriptCodepointList</TITLE>
 GucharmapScriptCodepointList
 gucharmap_script_codepoint_list_new
@@ -196,11 +212,3 @@
 gucharmap_unicode_get_locale_character
 </SECTION>
 
-<SECTION>
-<FILE>gucharmap</FILE>
-GUCHARMAP_VERSION_MAJOR
-GUCHARMAP_VERSION_MINOR
-GUCHARMAP_VERSION_MICRO
-GUCHARMAP_CHECK_VERSION
-</SECTION>
-

Modified: trunk/docs/reference/gucharmap.types
==============================================================================
--- trunk/docs/reference/gucharmap.types	(original)
+++ trunk/docs/reference/gucharmap.types	Fri Mar 21 11:03:52 2008
@@ -2,6 +2,7 @@
 #include <gucharmap/gucharmap.h>
 
 gucharmap_block_chapters_model_get_type
+gucharmap_block_codepoint_list_get_type
 gucharmap_chapters_model_get_type
 gucharmap_chapters_view_get_type
 gucharmap_charmap_get_type

Copied: trunk/docs/reference/tmpl/gucharmap-block-codepoint-list.sgml (from r1731, /trunk/docs/reference/tmpl/gucharmap.sgml)
==============================================================================
--- /trunk/docs/reference/tmpl/gucharmap.sgml	(original)
+++ trunk/docs/reference/tmpl/gucharmap-block-codepoint-list.sgml	Fri Mar 21 11:03:52 2008
@@ -1,5 +1,5 @@
 <!-- ##### SECTION Title ##### -->
-gucharmap
+GucharmapBlockCodepointList
 
 <!-- ##### SECTION Short_Description ##### -->
 
@@ -9,42 +9,35 @@
 
 </para>
 
+
 <!-- ##### SECTION See_Also ##### -->
 <para>
 
 </para>
 
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### MACRO GUCHARMAP_VERSION_MAJOR ##### -->
-<para>
-
-</para>
 
+<!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### MACRO GUCHARMAP_VERSION_MINOR ##### -->
+<!-- ##### STRUCT GucharmapBlockCodepointListPrivate ##### -->
 <para>
 
 </para>
 
 
-
-<!-- ##### MACRO GUCHARMAP_VERSION_MICRO ##### -->
+<!-- ##### STRUCT GucharmapBlockCodepointList ##### -->
 <para>
 
 </para>
 
 
-
-<!-- ##### MACRO GUCHARMAP_CHECK_VERSION ##### -->
+<!-- ##### FUNCTION gucharmap_block_codepoint_list_new ##### -->
 <para>
 
 </para>
 
- major: 
- minor: 
- micro: 
+ start: 
+ end: 
+ Returns: 
 
 

Modified: trunk/docs/reference/tmpl/gucharmap-codepoint-list.sgml
==============================================================================
--- trunk/docs/reference/tmpl/gucharmap-codepoint-list.sgml	(original)
+++ trunk/docs/reference/tmpl/gucharmap-codepoint-list.sgml	Fri Mar 21 11:03:52 2008
@@ -23,16 +23,6 @@
 </para>
 
 
-<!-- ##### FUNCTION gucharmap_codepoint_list_new ##### -->
-<para>
-
-</para>
-
- start: 
- end: 
- Returns: 
-
-
 <!-- ##### FUNCTION gucharmap_codepoint_list_get_char ##### -->
 <para>
 

Modified: trunk/docs/reference/tmpl/gucharmap-script-codepoint-list.sgml
==============================================================================
--- trunk/docs/reference/tmpl/gucharmap-script-codepoint-list.sgml	(original)
+++ trunk/docs/reference/tmpl/gucharmap-script-codepoint-list.sgml	Fri Mar 21 11:03:52 2008
@@ -17,6 +17,12 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### STRUCT GucharmapScriptCodepointListPrivate ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT GucharmapScriptCodepointList ##### -->
 <para>
 

Modified: trunk/docs/reference/tmpl/gucharmap-unused.sgml
==============================================================================
--- trunk/docs/reference/tmpl/gucharmap-unused.sgml	(original)
+++ trunk/docs/reference/tmpl/gucharmap-unused.sgml	Fri Mar 21 11:03:52 2008
@@ -0,0 +1,60 @@
+<!-- ##### SECTION ./tmpl/gucharmap.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gucharmap.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/gucharmap.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gucharmap.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/gucharmap.sgml:Title ##### -->
+gucharmap
+
+
+<!-- ##### MACRO GUCHARMAP_CHECK_VERSION ##### -->
+<para>
+
+</para>
+
+ major: 
+ minor: 
+ micro: 
+
+<!-- ##### MACRO GUCHARMAP_VERSION_MAJOR ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GUCHARMAP_VERSION_MICRO ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO GUCHARMAP_VERSION_MINOR ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION gucharmap_codepoint_list_new ##### -->
+<para>
+
+</para>
+
+ start: 
+ end: 
+ Returns: 
+

Modified: trunk/docs/reference/tmpl/gucharmap.sgml
==============================================================================
--- trunk/docs/reference/tmpl/gucharmap.sgml	(original)
+++ trunk/docs/reference/tmpl/gucharmap.sgml	Fri Mar 21 11:03:52 2008
@@ -17,34 +17,3 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### MACRO GUCHARMAP_VERSION_MAJOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GUCHARMAP_VERSION_MINOR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GUCHARMAP_VERSION_MICRO ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO GUCHARMAP_CHECK_VERSION ##### -->
-<para>
-
-</para>
-
- major: 
- minor: 
- micro: 
-
-

Modified: trunk/gucharmap/Makefile.am
==============================================================================
--- trunk/gucharmap/Makefile.am	(original)
+++ trunk/gucharmap/Makefile.am	Fri Mar 21 11:03:52 2008
@@ -18,13 +18,13 @@
 
 NULL =
 
-localedir = $(datadir)/locale
-
 lib_LTLIBRARIES = libgucharmap.la
 
 libgucharmap_la_SOURCES = \
 	gucharmap-block-chapters-model.c \
 	gucharmap-block-chapters-model.h \
+	gucharmap-block-codepoint-list.c \
+	gucharmap-block-codepoint-list.h \
 	gucharmap-chapters-model.c \
 	gucharmap-chapters-model.h \
 	gucharmap-chapters-view.c \
@@ -64,7 +64,7 @@
 	-I$(top_srcdir)			\
 	-DGUCHARMAP_COMPILATION		\
 	-DDATADIR=\"$(datadir)\"	\
-	-DLOCALEDIR=\"$(localedir)\"	\
+	-DLOCALEDIR=\"$(datadir)/locale\"	\
 	$(DISABLE_DEPRECATED)		\
 	$(AM_CPPFLAGS)
 
@@ -116,7 +116,7 @@
 gucharmap_CPPFLAGS = \
 	-I$(top_srcdir)			\
 	-DDATADIR=\"$(datadir)\"	\
-	-DLOCALEDIR=\"$(localedir)\"	\
+	-DLOCALEDIR=\"$(datadir)/locale\"	\
 	$(DISABLE_DEPRECATED)		\
 	$(AM_CPPFLAGS)
 

Modified: trunk/gucharmap/gucharmap-block-chapters-model.c
==============================================================================
--- trunk/gucharmap/gucharmap-block-chapters-model.c	(original)
+++ trunk/gucharmap/gucharmap-block-chapters-model.c	Fri Mar 21 11:03:52 2008
@@ -80,9 +80,9 @@
 
   /* special "All" block */
   if (unicode_block == NULL)
-    return gucharmap_codepoint_list_new (0, UNICHAR_MAX);
+    return gucharmap_block_codepoint_list_new (0, UNICHAR_MAX);
     
-  return gucharmap_codepoint_list_new (unicode_block->start, unicode_block->end);
+  return gucharmap_block_codepoint_list_new (unicode_block->start, unicode_block->end);
 }
 
 static G_CONST_RETURN GucharmapCodepointList * 
@@ -91,7 +91,7 @@
   GucharmapChaptersModelPrivate *model_priv = model->priv;
 
   if (model_priv->book_list == NULL) {
-    model_priv->book_list = gucharmap_codepoint_list_new (0, UNICHAR_MAX);
+    model_priv->book_list = gucharmap_block_codepoint_list_new (0, UNICHAR_MAX);
   }
 
   return model_priv->book_list;

Added: trunk/gucharmap/gucharmap-block-codepoint-list.c
==============================================================================
--- (empty file)
+++ trunk/gucharmap/gucharmap-block-codepoint-list.c	Fri Mar 21 11:03:52 2008
@@ -0,0 +1,116 @@
+/*
+ * Copyright  2004 Noah Levitt
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#include <config.h>
+#include <glib.h>
+
+#include "gucharmap.h"
+#include "gucharmap-private.h"
+
+struct _GucharmapBlockCodepointListPrivate
+{
+  gunichar start;
+  gunichar end;
+};
+
+static gunichar
+get_char (GucharmapCodepointList *list,
+          gint                    index)
+{
+  GucharmapBlockCodepointList *block_list = GUCHARMAP_BLOCK_CODEPOINT_LIST (list);
+  GucharmapBlockCodepointListPrivate *priv = block_list->priv;
+
+  if (index > (gint)priv->end - priv->start)
+    return (gunichar)(-1);
+  else
+    return (gunichar) priv->start + index;
+}
+
+static gint 
+get_index (GucharmapCodepointList *list,
+           gunichar                wc)
+{
+  GucharmapBlockCodepointList *block_list = GUCHARMAP_BLOCK_CODEPOINT_LIST (list);
+  GucharmapBlockCodepointListPrivate *priv = block_list->priv;
+
+  if (wc < priv->start || wc > priv->end)
+    return -1;
+  else
+    return wc - priv->start;
+}
+
+static gint
+get_last_index (GucharmapCodepointList *list)
+{
+  GucharmapBlockCodepointList *block_list = GUCHARMAP_BLOCK_CODEPOINT_LIST (list);
+  GucharmapBlockCodepointListPrivate *priv = block_list->priv;
+
+  return priv->end - priv->start;
+}
+
+static void
+gucharmap_block_codepoint_list_init (GucharmapBlockCodepointList *list)
+{
+  list->priv = G_TYPE_INSTANCE_GET_PRIVATE (list, GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST, GucharmapBlockCodepointListPrivate);
+}
+
+static void
+gucharmap_block_codepoint_list_class_init (GucharmapBlockCodepointListClass *klass)
+{
+  GucharmapCodepointListClass *codepoint_list_class = GUCHARMAP_CODEPOINT_LIST_CLASS (klass);
+
+  g_type_class_add_private (klass, sizeof (GucharmapBlockCodepointListPrivate));
+
+  codepoint_list_class->get_char = get_char;
+  codepoint_list_class->get_index = get_index;
+  codepoint_list_class->get_last_index = get_last_index;
+}
+
+G_DEFINE_TYPE (GucharmapBlockCodepointList, gucharmap_block_codepoint_list, GUCHARMAP_TYPE_CODEPOINT_LIST)
+
+/**
+ * gucharmap_block_codepoint_list_new:
+ *
+ * Creates a new codepoint list.
+ *
+ * Return value: the newly-created #GucharmapBlockCodepointList. Use
+ * g_object_unref() to free the result.
+ **/
+GucharmapCodepointList *
+gucharmap_block_codepoint_list_new (gunichar start,
+                                    gunichar end)
+{
+  GucharmapCodepointList *list;
+  GucharmapBlockCodepointListPrivate *priv;
+
+  g_return_val_if_fail (start <= end, NULL);
+
+  list = g_object_new (GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST, NULL);
+  priv = GUCHARMAP_BLOCK_CODEPOINT_LIST (list)->priv;
+
+  /* XXX: what to do if start > end, etc */
+
+  priv->start = start;
+
+  if (end <= UNICHAR_MAX)
+    priv->end = end;
+  else
+    priv->end = UNICHAR_MAX;
+
+  return list;
+}

Added: trunk/gucharmap/gucharmap-block-codepoint-list.h
==============================================================================
--- (empty file)
+++ trunk/gucharmap/gucharmap-block-codepoint-list.h	Fri Mar 21 11:03:52 2008
@@ -0,0 +1,64 @@
+/*
+ * Copyright  2004 Noah Levitt
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
+ */
+
+#if !defined (__GUCHARMAP_GUCHARMAP_H_INSIDE__) && !defined (GUCHARMAP_COMPILATION)
+#error "Only <gucharmap/gucharmap.h> can be included directly."
+#endif
+
+#ifndef GUCHARMAP_BLOCK_CODEPOINT_LIST_H
+#define GUCHARMAP_BLOCK_CODEPOINT_LIST_H
+
+#include <glib-object.h>
+
+#include <gucharmap/gucharmap-codepoint-list.h>
+
+G_BEGIN_DECLS
+
+#define GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST             (gucharmap_block_codepoint_list_get_type ())
+#define GUCHARMAP_BLOCK_CODEPOINT_LIST(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST, GucharmapBlockCodepointList))
+#define GUCHARMAP_BLOCK_CODEPOINT_LIST_CLASS(k)         (G_TYPE_CHECK_CLASS_CAST((k), GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST, GucharmapBlockCodepointListClass))
+#define GUCHARMAP_IS_BLOCK_CODEPOINT_LIST(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST))
+#define GUCHARMAP_IS_BLOCK_CODEPOINT_LIST_CLASS(k)      (G_TYPE_CHECK_CLASS_TYPE ((k), GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST))
+#define GUCHARMAP_BLOCK_CODEPOINT_LIST_GET_CLASS(o)     (G_TYPE_INSTANCE_GET_CLASS ((o), GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST, GucharmapBlockCodepointListClass))
+
+typedef struct _GucharmapBlockCodepointList         GucharmapBlockCodepointList;
+typedef struct _GucharmapBlockCodepointListPrivate  GucharmapBlockCodepointListPrivate;
+typedef struct _GucharmapBlockCodepointListClass    GucharmapBlockCodepointListClass;
+
+struct _GucharmapBlockCodepointList
+{
+  GucharmapCodepointList parent_instance;
+
+  /*< private >*/
+  GucharmapBlockCodepointListPrivate *priv;
+};
+
+struct _GucharmapBlockCodepointListClass
+{
+  GucharmapCodepointListClass parent_class;
+};
+
+GType                    gucharmap_block_codepoint_list_get_type (void);
+
+GucharmapCodepointList * gucharmap_block_codepoint_list_new      (gunichar start,
+                                                                  gunichar end);
+
+G_END_DECLS
+
+#endif /* #ifndef GUCHARMAP_BLOCK_CODEPOINT_LIST_H */
+

Modified: trunk/gucharmap/gucharmap-chapters-model.c
==============================================================================
--- trunk/gucharmap/gucharmap-chapters-model.c	(original)
+++ trunk/gucharmap/gucharmap-chapters-model.c	Fri Mar 21 11:03:52 2008
@@ -31,7 +31,7 @@
 default_get_codepoint_list (GucharmapChaptersModel *chapters,
                             GtkTreeIter *iter)
 {
-  return gucharmap_codepoint_list_new (0, UNICHAR_MAX);
+  return gucharmap_block_codepoint_list_new (0, UNICHAR_MAX);
 }
 
 static void

Modified: trunk/gucharmap/gucharmap-codepoint-list.c
==============================================================================
--- trunk/gucharmap/gucharmap-codepoint-list.c	(original)
+++ trunk/gucharmap/gucharmap-codepoint-list.c	Fri Mar 21 11:03:52 2008
@@ -22,49 +22,6 @@
 #include "gucharmap.h"
 #include "gucharmap-private.h"
 
-typedef struct _DefaultCodepointListPrivate DefaultCodepointListPrivate;
-
-struct _DefaultCodepointListPrivate
-{
-  gunichar start;
-  gunichar end;
-};
-
-#define GUCHARMAP_CODEPOINT_LIST_GET_PRIVATE(o) \
-            (G_TYPE_INSTANCE_GET_PRIVATE ((o), gucharmap_codepoint_list_get_type (), DefaultCodepointListPrivate))
-
-static gunichar 
-default_get_char (GucharmapCodepointList *list, 
-                  gint                    index)
-{
-  DefaultCodepointListPrivate *priv = GUCHARMAP_CODEPOINT_LIST_GET_PRIVATE (list);
-
-  if (index > (gint)priv->end - priv->start)
-    return (gunichar)(-1);
-  else
-    return (gunichar) priv->start + index;
-}
-
-static gint 
-default_get_index (GucharmapCodepointList *list, 
-                   gunichar                wc)
-{
-  DefaultCodepointListPrivate *priv = GUCHARMAP_CODEPOINT_LIST_GET_PRIVATE (list);
-
-  if (wc < priv->start || wc > priv->end)
-    return -1;
-  else
-    return wc - priv->start;
-}
-
-static gint
-default_get_last_index (GucharmapCodepointList *list)
-{
-  DefaultCodepointListPrivate *priv = GUCHARMAP_CODEPOINT_LIST_GET_PRIVATE (list);
-
-  return priv->end - priv->start;
-}
-
 static void
 gucharmap_codepoint_list_init (GucharmapCodepointList *list)
 {
@@ -73,15 +30,9 @@
 static void
 gucharmap_codepoint_list_class_init (GucharmapCodepointListClass *clazz)
 {
-  g_type_class_add_private (clazz, sizeof (DefaultCodepointListPrivate));
-
-  /* the default implementation is all unicode codepoints in order */
-  clazz->get_char = default_get_char;
-  clazz->get_index = default_get_index;
-  clazz->get_last_index = default_get_last_index;
 }
 
-G_DEFINE_TYPE (GucharmapCodepointList, gucharmap_codepoint_list, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE (GucharmapCodepointList, gucharmap_codepoint_list, G_TYPE_OBJECT)
 
 /**
  * gucharmap_codepoint_list_get_char:
@@ -130,33 +81,3 @@
 
   return GUCHARMAP_CODEPOINT_LIST_GET_CLASS (list)->get_last_index (list);
 }
-
-/**
- * gucharmap_codepoint_list_new:
- *
- * Creates a new codepoint list.
- *
- * Return value: the newly-created #GucharmapCodepointList. Use
- * g_object_unref() to free the result.
- **/
-GucharmapCodepointList * 
-gucharmap_codepoint_list_new (gunichar start,
-                              gunichar end)
-{
-  GucharmapCodepointList *list;
-  DefaultCodepointListPrivate *priv;
-
-  list = GUCHARMAP_CODEPOINT_LIST (g_object_new (gucharmap_codepoint_list_get_type (), NULL));
-  priv = GUCHARMAP_CODEPOINT_LIST_GET_PRIVATE (list);
-
-  /* XXX: what to do if start > end, etc */
-
-  priv->start = start;
-
-  if (end <= UNICHAR_MAX)
-    priv->end = end;
-  else
-    priv->end = UNICHAR_MAX;
-
-  return list;
-}

Modified: trunk/gucharmap/gucharmap-codepoint-list.h
==============================================================================
--- trunk/gucharmap/gucharmap-codepoint-list.h	(original)
+++ trunk/gucharmap/gucharmap-codepoint-list.h	Fri Mar 21 11:03:52 2008
@@ -29,7 +29,7 @@
 
 #define GUCHARMAP_TYPE_CODEPOINT_LIST             (gucharmap_codepoint_list_get_type ())
 #define GUCHARMAP_CODEPOINT_LIST(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), GUCHARMAP_TYPE_CODEPOINT_LIST, GucharmapCodepointList))
-#define GUCHARMAP_CODEPOINT_LIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GUCHARMAP_TYPE_CODEPOINT_LIST, GucharmapCodepointListClass))
+#define GUCHARMAP_CODEPOINT_LIST_CLASS(k)         (G_TYPE_CHECK_CLASS_CAST((k), GUCHARMAP_TYPE_CODEPOINT_LIST, GucharmapCodepointListClass))
 #define GUCHARMAP_IS_CODEPOINT_LIST(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), GUCHARMAP_TYPE_CODEPOINT_LIST))
 #define GUCHARMAP_IS_CODEPOINT_LIST_CLASS(k)      (G_TYPE_CHECK_CLASS_TYPE ((k), GUCHARMAP_TYPE_CODEPOINT_LIST))
 #define GUCHARMAP_CODEPOINT_LIST_GET_CLASS(o)     (G_TYPE_INSTANCE_GET_CLASS ((o), GUCHARMAP_TYPE_CODEPOINT_LIST, GucharmapCodepointListClass))
@@ -55,15 +55,15 @@
 };
 
 GType                    gucharmap_codepoint_list_get_type       (void);
-GucharmapCodepointList * gucharmap_codepoint_list_new            (gunichar start,
-                                                                  gunichar end);
-gunichar                 gucharmap_codepoint_list_get_char       (GucharmapCodepointList *list, 
+
+gunichar                 gucharmap_codepoint_list_get_char       (GucharmapCodepointList *list,
                                                                   gint                    index);
+
 gint                     gucharmap_codepoint_list_get_index      (GucharmapCodepointList *list, 
                                                                   gunichar                wc);
+
 gint                     gucharmap_codepoint_list_get_last_index (GucharmapCodepointList *list);
 
 G_END_DECLS
 
 #endif /* #ifndef GUCHARMAP_CODEPOINT_LIST_H */
-

Modified: trunk/gucharmap/gucharmap-script-codepoint-list.h
==============================================================================
--- trunk/gucharmap/gucharmap-script-codepoint-list.h	(original)
+++ trunk/gucharmap/gucharmap-script-codepoint-list.h	Fri Mar 21 11:03:52 2008
@@ -24,7 +24,6 @@
 #define GUCHARMAP_SCRIPT_CODEPOINT_LIST_H
 
 #include <glib-object.h>
-#include <glib.h>
 
 #include <gucharmap/gucharmap-codepoint-list.h>
 

Modified: trunk/gucharmap/gucharmap.h.in
==============================================================================
--- trunk/gucharmap/gucharmap.h.in	(original)
+++ trunk/gucharmap/gucharmap.h.in	Fri Mar 21 11:03:52 2008
@@ -31,14 +31,19 @@
    (GUCHARMAP_VERSION_MAJOR == (major) && GUCHARMAP_VERSION_MINOR > (minor)) || \
    (GUCHARMAP_VERSION_MAJOR == (major) && GUCHARMAP_VERSION_MINOR == (minor) && GUCHARMAP_VERSION_MICRO >= (micro)))
 
-#include <gucharmap/gucharmap-block-chapters-model.h>
-#include <gucharmap/gucharmap-chapters-model.h>
-#include <gucharmap/gucharmap-charmap.h>
-#include <gucharmap/gucharmap-chartable.h>
 #include <gucharmap/gucharmap-codepoint-list.h>
-#include <gucharmap/gucharmap-script-chapters-model.h>
+#include <gucharmap/gucharmap-block-codepoint-list.h>
 #include <gucharmap/gucharmap-script-codepoint-list.h>
+
+#include <gucharmap/gucharmap-chapters-model.h>
+#include <gucharmap/gucharmap-block-chapters-model.h>
+#include <gucharmap/gucharmap-script-chapters-model.h>
+
+#include <gucharmap/gucharmap-chartable.h>
+#include <gucharmap/gucharmap-charmap.h>
+
 #include <gucharmap/gucharmap-type-builtins.h>
+
 #include <gucharmap/gucharmap-unicode-info.h>
 
 #undef __GUCHARMAP_GUCHARMAP_H_INSIDE__
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]