GNOME.org
 

[gnumeric] Namespace

commit 5261e1ced9070771b5765b54231b4ccfabfb2133
Author: Morten Welinder <terra gnome org>
Date:   Sat Feb 28 18:21:59 2015 -0500

    Namespace

 src/gnm-cell-combo.c              |    4 +-
 src/gnm-pane.c                    |    8 +++---
 src/gnm-sheet-slicer-combo.c      |    2 +-
 src/gnm-so-filled.c               |    6 ++--
 src/gnm-so-line.c                 |    6 ++--
 src/gnm-so-path.c                 |    6 ++--
 src/gnm-so-polygon.c              |    6 ++--
 src/gui-clipboard.c               |    8 +++---
 src/sheet-control-gui.c           |    6 ++--
 src/sheet-filter.c                |    6 ++--
 src/sheet-object-cell-comment.c   |   14 ++++++------
 src/sheet-object-component.c      |   12 +++++-----
 src/sheet-object-graph.c          |   14 ++++++------
 src/sheet-object-image.c          |    8 +++---
 src/sheet-object-impl.h           |   14 ++++++------
 src/sheet-object-widget.c         |   18 ++++++++--------
 src/sheet-object.c                |   42 ++++++++++++++++++------------------
 src/sheet-object.h                |   18 ++++++++--------
 src/validation.c                  |    2 +-
 src/widgets/gnm-cell-combo-view.c |    2 +-
 src/xml-sax-read.c                |    2 +-
 src/xml-sax-write.c               |    4 +-
 22 files changed, 104 insertions(+), 104 deletions(-)
---
diff --git a/src/gnm-cell-combo.c b/src/gnm-cell-combo.c
index 2aeb250..79e0b99 100644
--- a/src/gnm-cell-combo.c
+++ b/src/gnm-cell-combo.c
@@ -106,7 +106,7 @@ gnm_cell_combo_init (SheetObject *so)
 static void
 gnm_cell_combo_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (gobject_class);
 
        gcc_parent_klass = g_type_class_peek_parent (gobject_class);
 
@@ -125,4 +125,4 @@ gnm_cell_combo_class_init (GObjectClass *gobject_class)
 
 GSF_CLASS_ABSTRACT (GnmCellCombo, gnm_cell_combo,
                    gnm_cell_combo_class_init, gnm_cell_combo_init,
-                   SHEET_OBJECT_TYPE)
+                   GNM_SO_TYPE)
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 972e3d2..87db574 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -2553,10 +2553,10 @@ gnm_pane_drag_begin (GnmPane *pane, SheetObject *so, GdkEvent *event)
                candidate = SHEET_OBJECT (ptr->data);
 
                if (exportable == NULL &&
-                   IS_SHEET_OBJECT_EXPORTABLE (candidate))
+                   GNM_IS_SO_EXPORTABLE (candidate))
                        exportable = candidate;
                if (imageable == NULL &&
-                   IS_SHEET_OBJECT_IMAGEABLE (candidate))
+                   GNM_IS_SO_IMAGEABLE (candidate))
                        imageable = candidate;
        }
 
@@ -3109,7 +3109,7 @@ cb_bounds_changed (SheetObject *so, GocItem *sov)
                gnm_pane_object_update_bbox (GNM_PANE (sov->canvas), so);
        }
 
-       sheet_object_view_set_bounds (SHEET_OBJECT_VIEW (sov),
+       sheet_object_view_set_bounds (GNM_SO_VIEW (sov),
                coords, so->flags & SHEET_OBJECT_IS_VISIBLE);
 }
 
@@ -3127,7 +3127,7 @@ gnm_pane_object_register (SheetObject *so, GocItem *view, gboolean selectable)
 {
        g_signal_connect_object (so, "bounds-changed",
                G_CALLBACK (cb_bounds_changed), view, 0);
-       return SHEET_OBJECT_VIEW (view);
+       return GNM_SO_VIEW (view);
 }
 
 /**
diff --git a/src/gnm-sheet-slicer-combo.c b/src/gnm-sheet-slicer-combo.c
index 6f8cb2c..d219626 100644
--- a/src/gnm-sheet-slicer-combo.c
+++ b/src/gnm-sheet-slicer-combo.c
@@ -89,7 +89,7 @@ gnm_sheet_slicer_combo_get_property (GObject *obj, guint property_id,
 static void
 gnm_sheet_slicer_combo_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (gobject_class);
 
        gssc_parent_klass = g_type_class_peek_parent (gobject_class);
 
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index 6c7e940..9d7870a 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -128,7 +128,7 @@ so_filled_item_view_class_init (SheetObjectViewClass *sov_klass)
 typedef SheetObjectViewClass   FilledItemViewClass;
 static GSF_CLASS (FilledItemView, so_filled_item_view,
        so_filled_item_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 #endif /* GNM_WITH_GTK */
 
@@ -502,7 +502,7 @@ gnm_so_filled_finalize (GObject *object)
 static void
 gnm_so_filled_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (gobject_class);
 
        gnm_so_filled_parent_class = g_type_class_peek_parent (gobject_class);
 
@@ -552,4 +552,4 @@ gnm_so_filled_init (GObject *obj)
 
 GSF_CLASS (GnmSOFilled, gnm_so_filled,
           gnm_so_filled_class_init, gnm_so_filled_init,
-          SHEET_OBJECT_TYPE)
+          GNM_SO_TYPE)
diff --git a/src/gnm-so-line.c b/src/gnm-so-line.c
index def4c60..f5deb28 100644
--- a/src/gnm-so-line.c
+++ b/src/gnm-so-line.c
@@ -89,7 +89,7 @@ typedef SheetObjectView               LineGocView;
 typedef SheetObjectViewClass   LineGocViewClass;
 static GSF_CLASS (LineGocView, so_line_goc_view,
        so_line_goc_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 #endif /* GNM_WITH_GTK */
 enum {
@@ -409,7 +409,7 @@ gnm_so_line_finalize (GObject *object)
 static void
 gnm_so_line_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class  = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class  = GNM_SO_CLASS (gobject_class);
 
        gnm_so_line_parent_class = g_type_class_peek_parent (gobject_class);
 
@@ -453,4 +453,4 @@ gnm_so_line_init (GObject *obj)
 
 GSF_CLASS (GnmSOLine, gnm_so_line,
           gnm_so_line_class_init, gnm_so_line_init,
-          SHEET_OBJECT_TYPE)
+          GNM_SO_TYPE)
diff --git a/src/gnm-so-path.c b/src/gnm-so-path.c
index eff7d36..cbc2c34 100644
--- a/src/gnm-so-path.c
+++ b/src/gnm-so-path.c
@@ -148,7 +148,7 @@ so_path_goc_view_class_init (SheetObjectViewClass *sov_klass)
 typedef SheetObjectViewClass   GnmSOPathViewClass;
 static GSF_CLASS (GnmSOPathView, so_path_goc_view,
        so_path_goc_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 #endif
 
@@ -647,7 +647,7 @@ gnm_so_path_finalize (GObject *object)
 static void
 gnm_so_path_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (gobject_class);
 
        gnm_so_path_parent_class = g_type_class_peek_parent (gobject_class);
 
@@ -695,4 +695,4 @@ gnm_so_path_init (GObject *obj)
 
 GSF_CLASS (GnmSOPath, gnm_so_path,
           gnm_so_path_class_init, gnm_so_path_init,
-          SHEET_OBJECT_TYPE)
+          GNM_SO_TYPE)
diff --git a/src/gnm-so-polygon.c b/src/gnm-so-polygon.c
index b65e59c..4aa375a 100644
--- a/src/gnm-so-polygon.c
+++ b/src/gnm-so-polygon.c
@@ -103,7 +103,7 @@ typedef SheetObjectView     PolygonGocView;
 typedef SheetObjectViewClass   PolygonGocViewClass;
 static GSF_CLASS (PolygonGocView, so_polygon_goc_view,
        so_polygon_goc_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 #endif /* GNM_WITH_GTK */
 
@@ -283,7 +283,7 @@ gnm_so_polygon_finalize (GObject *object)
 static void
 gnm_so_polygon_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (gobject_class);
 
        gnm_so_polygon_parent_class = g_type_class_peek_parent (gobject_class);
 
@@ -329,4 +329,4 @@ gnm_so_polygon_init (GObject *obj)
 
 GSF_CLASS (GnmSOPolygon, gnm_so_polygon,
           gnm_so_polygon_class_init, gnm_so_polygon_init,
-          SHEET_OBJECT_TYPE)
+          GNM_SO_TYPE)
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index e978cb8..1c8ac96 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -759,7 +759,7 @@ image_write (GnmCellRegion *cr, gchar const *mime_type, int *size)
        if (strncmp (mime_type, "image/", 6) != 0)
                return ret;
        for (l = cr->objects; l != NULL; l = l->next) {
-               if (IS_SHEET_OBJECT_IMAGEABLE (SHEET_OBJECT (l->data))) {
+               if (GNM_IS_SO_IMAGEABLE (SHEET_OBJECT (l->data))) {
                        so = SHEET_OBJECT (l->data);
                        break;
                }
@@ -811,7 +811,7 @@ object_write (GnmCellRegion *cr, gchar const *mime_type, int *size)
        g_return_val_if_fail (so != NULL, NULL);
 
        for (l = cr->objects; l != NULL; l = l->next) {
-               if (IS_SHEET_OBJECT_EXPORTABLE (SHEET_OBJECT (l->data))) {
+               if (GNM_IS_SO_EXPORTABLE (SHEET_OBJECT (l->data))) {
                        so = SHEET_OBJECT (l->data);
                        break;
                }
@@ -1100,9 +1100,9 @@ gnm_x_claim_clipboard (GdkDisplay *display)
                for (ptr = content->objects; ptr != NULL;
                     ptr = ptr->next) {
                        SheetObject *candidate = SHEET_OBJECT (ptr->data);
-                       if (exportable == NULL && IS_SHEET_OBJECT_EXPORTABLE (candidate))
+                       if (exportable == NULL && GNM_IS_SO_EXPORTABLE (candidate))
                                exportable = candidate;
-                       if (imageable == NULL && IS_SHEET_OBJECT_IMAGEABLE (candidate))
+                       if (imageable == NULL && GNM_IS_SO_IMAGEABLE (candidate))
                                imageable = candidate;
                }
                /* Currently, we can't render sheet objects as text or html */
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index c222eba..dbb2ed7 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -2551,7 +2551,7 @@ calc_obj_place (GnmPane *pane, gint64 canvas_coord, gboolean is_col,
        return colrow;
 }
 
-#define SO_CLASS(so) SHEET_OBJECT_CLASS (G_OBJECT_GET_CLASS(so))
+#define SO_CLASS(so) GNM_SO_CLASS (G_OBJECT_GET_CLASS(so))
 
 /**
  * scg_object_select:
@@ -4284,7 +4284,7 @@ scg_drag_send_image (G_GNUC_UNUSED SheetControlGUI *scg,
        GSList *ptr;
 
        for (ptr = objects; ptr != NULL; ptr = ptr->next) {
-               if (IS_SHEET_OBJECT_IMAGEABLE (SHEET_OBJECT (ptr->data))) {
+               if (GNM_IS_SO_IMAGEABLE (SHEET_OBJECT (ptr->data))) {
                        so = SHEET_OBJECT (ptr->data);
                        break;
                }
@@ -4328,7 +4328,7 @@ scg_drag_send_graph (G_GNUC_UNUSED SheetControlGUI *scg,
        GSList *ptr;
 
        for (ptr = objects; ptr != NULL; ptr = ptr->next)
-               if (IS_SHEET_OBJECT_EXPORTABLE (SHEET_OBJECT (ptr->data))) {
+               if (GNM_IS_SO_EXPORTABLE (SHEET_OBJECT (ptr->data))) {
                        so = SHEET_OBJECT (ptr->data);
                        break;
                }
diff --git a/src/sheet-filter.c b/src/sheet-filter.c
index 3b56e70..3418884 100644
--- a/src/sheet-filter.c
+++ b/src/sheet-filter.c
@@ -576,7 +576,7 @@ gnm_filter_combo_finalize (GObject *object)
        gnm_filter_condition_free (fcombo->cond);
        fcombo->cond = NULL;
 
-       parent = g_type_class_peek (SHEET_OBJECT_TYPE);
+       parent = g_type_class_peek (GNM_SO_TYPE);
        parent->finalize (object);
 }
 
@@ -595,7 +595,7 @@ gnm_filter_combo_view_new (SheetObject *so, SheetObjectViewContainer *container)
 static void
 gnm_filter_combo_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (gobject_class);
 
        /* Object class method overrides */
        gobject_class->finalize = gnm_filter_combo_finalize;
@@ -617,7 +617,7 @@ gnm_filter_combo_class_init (GObjectClass *gobject_class)
 
 GSF_CLASS (GnmFilterCombo, gnm_filter_combo,
           gnm_filter_combo_class_init, gnm_filter_combo_init,
-          SHEET_OBJECT_TYPE)
+          GNM_SO_TYPE)
 
 /*************************************************************************/
 
diff --git a/src/sheet-object-cell-comment.c b/src/sheet-object-cell-comment.c
index 7621e0e..e446b9f 100644
--- a/src/sheet-object-cell-comment.c
+++ b/src/sheet-object-cell-comment.c
@@ -133,7 +133,7 @@ comment_view_button_released (GocItem *item, int button, double x, double y)
                return FALSE;
 
        gnm_canvas_get_screen_position (item->canvas, x, y, &ix, &iy);
-       so = sheet_object_view_get_so (SHEET_OBJECT_VIEW (item));
+       so = sheet_object_view_get_so (GNM_SO_VIEW (item));
        scg_comment_display (GNM_PANE (item->canvas)->simple.scg,
                             CELL_COMMENT (so),
                             ix, iy);
@@ -157,7 +157,7 @@ comment_view_button2_pressed (GocItem *item, int button, double x, double y)
                return FALSE;
 
        scg = GNM_PANE (item->canvas)->simple.scg;
-       so = sheet_object_view_get_so (SHEET_OBJECT_VIEW (item));
+       so = sheet_object_view_get_so (GNM_SO_VIEW (item));
        r = sheet_object_get_range (so);
        dialog_cell_comment (scg->wbcg, so->sheet, &r->start);
        return TRUE;
@@ -172,7 +172,7 @@ comment_view_enter_notify (GocItem *item, double x, double y)
        gnm_widget_set_cursor_type (GTK_WIDGET (item->canvas), GDK_ARROW);
 
        gnm_canvas_get_screen_position (item->canvas, x, y, &ix, &iy);
-       so = sheet_object_view_get_so (SHEET_OBJECT_VIEW (item));
+       so = sheet_object_view_get_so (GNM_SO_VIEW (item));
 
        scg_comment_select (GNM_PANE (item->canvas)->simple.scg,
                            CELL_COMMENT (so),
@@ -184,7 +184,7 @@ static gboolean
 comment_view_leave_notify (GocItem *item, double x, double y)
 {
        scg_comment_unselect (GNM_PANE (item->canvas)->simple.scg,
-                             CELL_COMMENT (sheet_object_view_get_so (SHEET_OBJECT_VIEW (item))));
+                             CELL_COMMENT (sheet_object_view_get_so (GNM_SO_VIEW (item))));
        return TRUE;
 }
 
@@ -206,7 +206,7 @@ comment_view_class_init (SheetObjectViewClass *sov_klass)
 
 static GSF_CLASS (CommentView, comment_view,
        comment_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 static void
 cell_comment_finalize (GObject *object)
@@ -358,7 +358,7 @@ cell_comment_copy (SheetObject *dst, SheetObject const *src)
 static void
 cell_comment_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *sheet_object_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *sheet_object_class = GNM_SO_CLASS (gobject_class);
 
        cell_comment_parent_class = g_type_class_peek_parent (gobject_class);
 
@@ -392,7 +392,7 @@ cell_comment_init (GnmComment *cc)
 }
 
 GSF_CLASS (GnmComment, cell_comment,
-          cell_comment_class_init, cell_comment_init, SHEET_OBJECT_TYPE)
+          cell_comment_class_init, cell_comment_init, GNM_SO_TYPE)
 
 char const  *
 cell_comment_author_get (GnmComment const *cc)
diff --git a/src/sheet-object-component.c b/src/sheet-object-component.c
index 93be6c3..8924148 100644
--- a/src/sheet-object-component.c
+++ b/src/sheet-object-component.c
@@ -79,7 +79,7 @@ so_component_goc_view_class_init (SheetObjectViewClass *sov_klass)
 
 static GSF_CLASS (SOComponentGocView, so_component_goc_view,
        so_component_goc_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 
 /****************************************************************************/
@@ -273,7 +273,7 @@ gnm_soc_populate_menu (SheetObject *so, GPtrArray *actions)
 
        unsigned int i;
 
-       SHEET_OBJECT_CLASS (parent_klass)->populate_menu (so, actions);
+       GNM_SO_CLASS (parent_klass)->populate_menu (so, actions);
 
        for (i = 0; i < G_N_ELEMENTS (soc_actions); i++)
                go_ptr_array_insert (actions, (gpointer) (soc_actions + i), 1 + i);
@@ -401,7 +401,7 @@ gnm_soc_draw_cairo (SheetObject const *so, cairo_t *cr,
 static void
 gnm_soc_class_init (GObjectClass *klass)
 {
-       SheetObjectClass        *so_class  = SHEET_OBJECT_CLASS (klass);
+       SheetObjectClass        *so_class  = GNM_SO_CLASS (klass);
 
        parent_klass = g_type_class_peek_parent (klass);
 
@@ -444,9 +444,9 @@ soc_exportable_init (SheetObjectExportableIface *soe_iface)
 
 GSF_CLASS_FULL (SheetObjectComponent, sheet_object_component,
                NULL, NULL, gnm_soc_class_init,NULL,
-               gnm_soc_init, SHEET_OBJECT_TYPE, 0,
-               GSF_INTERFACE (soc_imageable_init, SHEET_OBJECT_IMAGEABLE_TYPE) \
-               GSF_INTERFACE (soc_exportable_init, SHEET_OBJECT_EXPORTABLE_TYPE));
+               gnm_soc_init, GNM_SO_TYPE, 0,
+               GSF_INTERFACE (soc_imageable_init, GNM_SO_IMAGEABLE_TYPE) \
+               GSF_INTERFACE (soc_exportable_init, GNM_SO_EXPORTABLE_TYPE));
 
 /**
  * sheet_object_component_new:
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index ddb5d71..80eb150 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -86,7 +86,7 @@ typedef SheetObjectViewClass  SOGraphGocViewClass;
 
 static GSF_CLASS (SOGraphGocView, so_graph_goc_view,
        so_graph_goc_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 /****************************************************************************/
 #define SHEET_OBJECT_CONFIG_KEY "sheet-object-graph-key"
@@ -161,7 +161,7 @@ cb_graph_size_changed (GocItem *item, GtkAllocation *allocation)
 {
        GogRenderer *rend;
        GogGraph *graph;
-       SheetObject *so = sheet_object_view_get_so (SHEET_OBJECT_VIEW (item->parent));
+       SheetObject *so = sheet_object_view_get_so (GNM_SO_VIEW (item->parent));
        PrintInformation *pi = so->sheet->print_info;
        double top, bottom, left, right, edge_to_below_header, edge_to_above_footer, w, h, x = 0., y = 0.;
        w = print_info_get_paper_width (pi, GTK_UNIT_POINTS);
@@ -404,7 +404,7 @@ gnm_sog_populate_menu (SheetObject *so, GPtrArray *actions)
 
        unsigned int i;
 
-       SHEET_OBJECT_CLASS (parent_klass)->populate_menu (so, actions);
+       GNM_SO_CLASS (parent_klass)->populate_menu (so, actions);
 
        for (i = 0; i < G_N_ELEMENTS (sog_actions); i++)
                go_ptr_array_insert (actions, (gpointer) (sog_actions + i), 1 + i);
@@ -561,7 +561,7 @@ gnm_sog_bounds_changed (SheetObject *so)
 static void
 gnm_sog_class_init (GObjectClass *klass)
 {
-       SheetObjectClass        *so_class  = SHEET_OBJECT_CLASS (klass);
+       SheetObjectClass        *so_class  = GNM_SO_CLASS (klass);
 
        parent_klass = g_type_class_peek_parent (klass);
 
@@ -608,9 +608,9 @@ sog_exportable_init (SheetObjectExportableIface *soe_iface)
 
 GSF_CLASS_FULL (SheetObjectGraph, sheet_object_graph,
                NULL, NULL, gnm_sog_class_init,NULL,
-               gnm_sog_init, SHEET_OBJECT_TYPE, 0,
-               GSF_INTERFACE (sog_imageable_init, SHEET_OBJECT_IMAGEABLE_TYPE) \
-               GSF_INTERFACE (sog_exportable_init, SHEET_OBJECT_EXPORTABLE_TYPE))
+               gnm_sog_init, GNM_SO_TYPE, 0,
+               GSF_INTERFACE (sog_imageable_init, GNM_SO_IMAGEABLE_TYPE) \
+               GSF_INTERFACE (sog_exportable_init, GNM_SO_EXPORTABLE_TYPE))
 
 /**
  * sheet_object_graph_new:
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index ba9d237..a391c6e 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -92,7 +92,7 @@ typedef SheetObjectView       SOImageGocView;
 typedef SheetObjectViewClass   SOImageGocViewClass;
 static GSF_CLASS (SOImageGocView, so_image_goc_view,
        so_image_goc_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 /****************************************************************************/
 struct _SheetObjectImage {
@@ -558,7 +558,7 @@ gnm_soi_class_init (GObjectClass *object_class)
        object_class->get_property = gnm_soi_get_property;
 
        /* SheetObject class method overrides */
-       so_class = SHEET_OBJECT_CLASS (object_class);
+       so_class = GNM_SO_CLASS (object_class);
        so_class->new_view              = gnm_soi_new_view;
        so_class->populate_menu         = gnm_soi_populate_menu;
        so_class->write_xml_sax         = gnm_soi_write_xml_sax;
@@ -613,5 +613,5 @@ soi_imageable_init (SheetObjectImageableIface *soi_iface)
 
 GSF_CLASS_FULL (SheetObjectImage, sheet_object_image,
           NULL, NULL, gnm_soi_class_init, NULL,
-          gnm_soi_init, SHEET_OBJECT_TYPE, 0,
-          GSF_INTERFACE (soi_imageable_init, SHEET_OBJECT_IMAGEABLE_TYPE))
+          gnm_soi_init, GNM_SO_TYPE, 0,
+          GSF_INTERFACE (soi_imageable_init, GNM_SO_IMAGEABLE_TYPE))
diff --git a/src/sheet-object-impl.h b/src/sheet-object-impl.h
index edfea5e..e055ee0 100644
--- a/src/sheet-object-impl.h
+++ b/src/sheet-object-impl.h
@@ -105,7 +105,7 @@ typedef struct {
        void *data_pad3;
        void *data_pad4;
 } SheetObjectClass;
-#define SHEET_OBJECT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), SHEET_OBJECT_TYPE, SheetObjectClass))
+#define GNM_SO_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNM_SO_TYPE, SheetObjectClass))
 
 /***************************************************************************/
 
@@ -123,12 +123,12 @@ typedef struct {
                            double const *coords, gboolean visible);
 } SheetObjectViewClass;
 
-#define SHEET_OBJECT_VIEW_TYPE         (sheet_object_view_get_type ())
-#define SHEET_OBJECT_VIEW(o)           (G_TYPE_CHECK_INSTANCE_CAST((o), SHEET_OBJECT_VIEW_TYPE, 
SheetObjectView))
-#define IS_SHEET_OBJECT_VIEW(o)                (G_TYPE_CHECK_INSTANCE_TYPE((o), SHEET_OBJECT_VIEW_TYPE))
-#define SHEET_OBJECT_VIEW_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), SHEET_OBJECT_VIEW_TYPE, 
SheetObjectViewIface))
-#define IS_SHEET_OBJECT_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE((k), SHEET_OBJECT_VIEW_TYPE))
-#define SHEET_OBJECT_VIEW_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), SHEET_OBJECT_VIEW_TYPE, 
SheetObjectViewClass))
+#define GNM_SO_VIEW_TYPE               (sheet_object_view_get_type ())
+#define GNM_SO_VIEW(o)         (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_SO_VIEW_TYPE, SheetObjectView))
+#define GNM_IS_SO_VIEW(o)              (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_SO_VIEW_TYPE))
+#define GNM_SO_VIEW_CLASS(k)   (G_TYPE_CHECK_CLASS_CAST((k), GNM_SO_VIEW_TYPE, SheetObjectViewIface))
+#define GNM_IS_SO_VIEW_CLASS(k)        (G_TYPE_CHECK_CLASS_TYPE((k), GNM_SO_VIEW_TYPE))
+#define GNM_SO_VIEW_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), GNM_SO_VIEW_TYPE, SheetObjectViewClass))
 
 GType       sheet_object_view_get_type   (void);
 SheetObject *sheet_object_view_get_so    (SheetObjectView *sov);
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index bbd2b63..8fceb20 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -172,7 +172,7 @@ so_widget_view_class_init (SheetObjectViewClass *sov_klass)
 
 static GSF_CLASS (SOWidgetView, so_widget_view,
        so_widget_view_class_init, NULL,
-       SHEET_OBJECT_VIEW_TYPE)
+       GNM_SO_VIEW_TYPE)
 
 /****************************************************************************/
 
@@ -190,7 +190,7 @@ static void                                                         \
 sheet_widget_ ## n1 ## _class_init (GObjectClass *object_class)                \
 {                                                                      \
        SheetObjectWidgetClass *sow_class = GNM_SOW_CLASS (object_class); \
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (object_class); \
+       SheetObjectClass *so_class = GNM_SO_CLASS (object_class);       \
        object_class->finalize          = &sheet_widget_ ## n1 ## _finalize; \
        object_class->set_property      = fn_set_property;              \
        object_class->get_property      = fn_get_property;              \
@@ -313,7 +313,7 @@ sheet_object_widget_new_view (SheetObject *so, SheetObjectViewContainer *contain
 static void
 sheet_object_widget_class_init (GObjectClass *object_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (object_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (object_class);
        SheetObjectWidgetClass *sow_class = GNM_SOW_CLASS (object_class);
 
        sheet_object_widget_class = G_OBJECT_CLASS (object_class);
@@ -336,7 +336,7 @@ sheet_object_widget_init (SheetObjectWidget *sow)
 GSF_CLASS (SheetObjectWidget, sheet_object_widget,
           sheet_object_widget_class_init,
           sheet_object_widget_init,
-          SHEET_OBJECT_TYPE)
+          GNM_SO_TYPE)
 
 static WorkbookControl *
 widget_wbc (GtkWidget *widget)
@@ -1996,7 +1996,7 @@ static void
 sheet_widget_scrollbar_class_init (SheetObjectWidgetClass *sow_class)
 {
        SheetWidgetAdjustmentClass *swa_class = (SheetWidgetAdjustmentClass *)sow_class;
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (sow_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (sow_class);
 
         sow_class->create_widget = &sheet_widget_scrollbar_create_widget;
        so_class->user_config = &sheet_widget_scrollbar_user_config;
@@ -2102,7 +2102,7 @@ static void
 sheet_widget_spinbutton_class_init (SheetObjectWidgetClass *sow_class)
 {
        SheetWidgetAdjustmentClass *swa_class = (SheetWidgetAdjustmentClass *)sow_class;
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (sow_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (sow_class);
 
         sow_class->create_widget = &sheet_widget_spinbutton_create_widget;
        so_class->user_config = &sheet_widget_spinbutton_user_config;
@@ -2212,7 +2212,7 @@ static void
 sheet_widget_slider_class_init (SheetObjectWidgetClass *sow_class)
 {
        SheetWidgetAdjustmentClass *swa_class = (SheetWidgetAdjustmentClass *)sow_class;
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (sow_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (sow_class);
 
         sow_class->create_widget = &sheet_widget_slider_create_widget;
        so_class->user_config = &sheet_widget_slider_user_config;
@@ -3971,7 +3971,7 @@ sheet_widget_list_draw_cairo (SheetObject const *so, cairo_t *cr,
 static void
 sheet_widget_list_class_init (SheetObjectWidgetClass *sow_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (sow_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (sow_class);
 
        so_class->draw_cairo = &sheet_widget_list_draw_cairo;
         sow_class->create_widget = &sheet_widget_list_create_widget;
@@ -4104,7 +4104,7 @@ sheet_widget_combo_draw_cairo (SheetObject const *so, cairo_t *cr,
 static void
 sheet_widget_combo_class_init (SheetObjectWidgetClass *sow_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (sow_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (sow_class);
 
        so_class->draw_cairo = &sheet_widget_combo_draw_cairo;
         sow_class->create_widget = &sheet_widget_combo_create_widget;
diff --git a/src/sheet-object.c b/src/sheet-object.c
index e39deab..3b35699 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -70,7 +70,7 @@ sheet_object_anchor_get_type (void)
 }
 
 /* Returns the class for a SheetObject */
-#define SO_CLASS(so) SHEET_OBJECT_CLASS(G_OBJECT_GET_CLASS(so))
+#define SO_CLASS(so) GNM_SO_CLASS(G_OBJECT_GET_CLASS(so))
 
 enum {
        SO_PROP_0 = 0,
@@ -273,7 +273,7 @@ sheet_object_populate_menu (SheetObject *so, GPtrArray *actions)
 {
        g_return_if_fail  (NULL != so);
 
-       SHEET_OBJECT_CLASS (G_OBJECT_GET_CLASS(so))->populate_menu (so, actions);
+       GNM_SO_CLASS (G_OBJECT_GET_CLASS(so))->populate_menu (so, actions);
 }
 
 /**
@@ -390,7 +390,7 @@ so_default_size (G_GNUC_UNUSED SheetObject const *so, double *width, double *hei
 static void
 sheet_object_class_init (GObjectClass *klass)
 {
-       SheetObjectClass *sheet_object_class = SHEET_OBJECT_CLASS (klass);
+       SheetObjectClass *sheet_object_class = GNM_SO_CLASS (klass);
 
        parent_klass = g_type_class_peek_parent (klass);
 
@@ -412,14 +412,14 @@ sheet_object_class_init (GObjectClass *klass)
                                      GSF_PARAM_STATIC | G_PARAM_READWRITE));
 
        signals [BOUNDS_CHANGED] = g_signal_new ("bounds-changed",
-               SHEET_OBJECT_TYPE,
+               GNM_SO_TYPE,
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (SheetObjectClass, bounds_changed),
                NULL, NULL,
                g_cclosure_marshal_VOID__VOID,
                G_TYPE_NONE, 0);
        signals [UNREALIZED] = g_signal_new ("unrealized",
-               SHEET_OBJECT_TYPE,
+               GNM_SO_TYPE,
                G_SIGNAL_RUN_LAST,
                G_STRUCT_OFFSET (SheetObjectClass, unrealized),
                NULL, NULL,
@@ -446,7 +446,7 @@ sheet_object_get_view (SheetObject const *so, SheetObjectViewContainer *containe
        g_return_val_if_fail (GNM_IS_SO (so), NULL);
 
        for (l = so->realized_list; l; l = l->next) {
-               SheetObjectView *view = SHEET_OBJECT_VIEW (l->data);
+               SheetObjectView *view = GNM_SO_VIEW (l->data);
                if (container == g_object_get_qdata (G_OBJECT (view), sov_container_quark))
                        return view;
        }
@@ -697,7 +697,7 @@ sheet_object_new_view (SheetObject *so, SheetObjectViewContainer *container)
        if (NULL == view)
                return NULL;
 
-       g_return_val_if_fail (IS_SHEET_OBJECT_VIEW (view), NULL);
+       g_return_val_if_fail (GNM_IS_SO_VIEW (view), NULL);
 
        /* Store some useful information */
        g_object_set_qdata (G_OBJECT (view), sov_so_quark, so);
@@ -1276,8 +1276,8 @@ sheet_object_view_set_bounds (SheetObjectView *sov,
 {
        SheetObjectViewClass *klass;
 
-       g_return_if_fail (IS_SHEET_OBJECT_VIEW (sov));
-       klass = SHEET_OBJECT_VIEW_GET_CLASS (sov);
+       g_return_if_fail (GNM_IS_SO_VIEW (sov));
+       klass = GNM_SO_VIEW_GET_CLASS (sov);
        if (NULL != klass->set_bounds)
                (klass->set_bounds) (sov, coords, visible);
 }
@@ -1316,7 +1316,7 @@ cb_so_menu_activate (GObject *menu, GocItem *view)
        SheetObjectAction const *a = g_object_get_data (menu, "action");
 
        if (a->func) {
-               SheetObject *so = sheet_object_view_get_so (SHEET_OBJECT_VIEW (view));
+               SheetObject *so = sheet_object_view_get_so (GNM_SO_VIEW (view));
                gpointer data = g_object_get_data (G_OBJECT (view->canvas), "sheet-control");
 
                if (data == NULL)
@@ -1401,7 +1401,7 @@ sheet_object_view_button_pressed (GocItem *item, int button, double x, double y)
                /* cb_sheet_object_widget_canvas_event calls even if selected */
                if (NULL == g_hash_table_lookup (pane->drag.ctrl_pts, so)) {
                        SheetObjectClass *soc =
-                               G_TYPE_INSTANCE_GET_CLASS (so, SHEET_OBJECT_TYPE, SheetObjectClass);
+                               G_TYPE_INSTANCE_GET_CLASS (so, GNM_SO_TYPE, SheetObjectClass);
                        GdkEventButton *event = (GdkEventButton *) goc_canvas_get_cur_event (item->canvas);
 
                        if (soc->interactive && button != 3)
@@ -1506,24 +1506,24 @@ sheet_object_imageable_get_type (void)
        return type;
 }
 
-#define SHEET_OBJECT_IMAGEABLE_CLASS(o)        (G_TYPE_INSTANCE_GET_INTERFACE ((o), 
SHEET_OBJECT_IMAGEABLE_TYPE, SheetObjectImageableIface))
+#define GNM_SO_IMAGEABLE_CLASS(o)      (G_TYPE_INSTANCE_GET_INTERFACE ((o), GNM_SO_IMAGEABLE_TYPE, 
SheetObjectImageableIface))
 
 GtkTargetList *
 sheet_object_get_target_list (SheetObject const *so)
 {
-       if (!IS_SHEET_OBJECT_IMAGEABLE (so))
+       if (!GNM_IS_SO_IMAGEABLE (so))
                return NULL;
 
-       return SHEET_OBJECT_IMAGEABLE_CLASS (so)->get_target_list (so);
+       return GNM_SO_IMAGEABLE_CLASS (so)->get_target_list (so);
 }
 
 void
 sheet_object_write_image (SheetObject const *so, char const *format, double resolution,
                          GsfOutput *output, GError **err)
 {
-       g_return_if_fail (IS_SHEET_OBJECT_IMAGEABLE (so));
+       g_return_if_fail (GNM_IS_SO_IMAGEABLE (so));
 
-       SHEET_OBJECT_IMAGEABLE_CLASS (so)->write_image (so, format, resolution,
+       GNM_SO_IMAGEABLE_CLASS (so)->write_image (so, format, resolution,
                                                        output, err);
 
 }
@@ -1550,15 +1550,15 @@ sheet_object_exportable_get_type (void)
        return type;
 }
 
-#define SHEET_OBJECT_EXPORTABLE_CLASS(o)       (G_TYPE_INSTANCE_GET_INTERFACE ((o), 
SHEET_OBJECT_EXPORTABLE_TYPE, SheetObjectExportableIface))
+#define GNM_SO_EXPORTABLE_CLASS(o)     (G_TYPE_INSTANCE_GET_INTERFACE ((o), GNM_SO_EXPORTABLE_TYPE, 
SheetObjectExportableIface))
 
 GtkTargetList *
 sheet_object_exportable_get_target_list (SheetObject const *so)
 {
-       if (!IS_SHEET_OBJECT_EXPORTABLE (so))
+       if (!GNM_IS_SO_EXPORTABLE (so))
                return NULL;
 
-       return SHEET_OBJECT_EXPORTABLE_CLASS (so)->get_target_list (so);
+       return GNM_SO_EXPORTABLE_CLASS (so)->get_target_list (so);
 }
 
 void
@@ -1568,10 +1568,10 @@ sheet_object_write_object (SheetObject const *so, char const *format,
 {
        GnmLocale *locale;
 
-       g_return_if_fail (IS_SHEET_OBJECT_EXPORTABLE (so));
+       g_return_if_fail (GNM_IS_SO_EXPORTABLE (so));
 
        locale = gnm_push_C_locale ();
-       SHEET_OBJECT_EXPORTABLE_CLASS (so)->
+       GNM_SO_EXPORTABLE_CLASS (so)->
                write_object (so, format, output, err, convs);
        gnm_pop_C_locale (locale);
 }
diff --git a/src/sheet-object.h b/src/sheet-object.h
index bb5ea52..9c95141 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -25,20 +25,20 @@ struct _SheetObjectAnchor {
 };
 GType sheet_object_anchor_get_type (void); /* Boxed type */
 
-#define SHEET_OBJECT_TYPE     (sheet_object_get_type ())
-#define SHEET_OBJECT(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), SHEET_OBJECT_TYPE, SheetObject))
-#define GNM_IS_SO(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), SHEET_OBJECT_TYPE))
+#define GNM_SO_TYPE     (sheet_object_get_type ())
+#define SHEET_OBJECT(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), GNM_SO_TYPE, SheetObject))
+#define GNM_IS_SO(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_SO_TYPE))
 GType sheet_object_get_type (void);
 
-#define SHEET_OBJECT_IMAGEABLE_TYPE  (sheet_object_imageable_get_type ())
-#define SHEET_OBJECT_IMAGEABLE(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), SHEET_OBJECT_IMAGEABLE_TYPE, 
SheetObjectImageableIface))
-#define IS_SHEET_OBJECT_IMAGEABLE(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHEET_OBJECT_IMAGEABLE_TYPE))
+#define GNM_SO_IMAGEABLE_TYPE  (sheet_object_imageable_get_type ())
+#define GNM_SO_IMAGEABLE(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_SO_IMAGEABLE_TYPE, 
SheetObjectImageableIface))
+#define GNM_IS_SO_IMAGEABLE(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SO_IMAGEABLE_TYPE))
 
 GType sheet_object_imageable_get_type (void);
 
-#define SHEET_OBJECT_EXPORTABLE_TYPE  (sheet_object_exportable_get_type ())
-#define SHEET_OBJECT_EXPORTABLE(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), SHEET_OBJECT_EXPORTABLE_TYPE, 
SheetObjectExportableIface))
-#define IS_SHEET_OBJECT_EXPORTABLE(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHEET_OBJECT_EXPORTABLE_TYPE))
+#define GNM_SO_EXPORTABLE_TYPE  (sheet_object_exportable_get_type ())
+#define GNM_SO_EXPORTABLE(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_SO_EXPORTABLE_TYPE, 
SheetObjectExportableIface))
+#define GNM_IS_SO_EXPORTABLE(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNM_SO_EXPORTABLE_TYPE))
 
 GType sheet_object_exportable_get_type (void);
 
diff --git a/src/validation.c b/src/validation.c
index 8f0797e..f0d9f9a 100644
--- a/src/validation.c
+++ b/src/validation.c
@@ -114,7 +114,7 @@ gnm_validation_combo_view_new (SheetObject *so, SheetObjectViewContainer *contai
 static void
 gnm_validation_combo_class_init (GObjectClass *gobject_class)
 {
-       SheetObjectClass *so_class = SHEET_OBJECT_CLASS (gobject_class);
+       SheetObjectClass *so_class = GNM_SO_CLASS (gobject_class);
        gobject_class->finalize = gnm_validation_combo_finalize;
        so_class->new_view = gnm_validation_combo_view_new;
 
diff --git a/src/widgets/gnm-cell-combo-view.c b/src/widgets/gnm-cell-combo-view.c
index 3db5c9a..e637cff 100644
--- a/src/widgets/gnm-cell-combo-view.c
+++ b/src/widgets/gnm-cell-combo-view.c
@@ -479,4 +479,4 @@ gnm_cell_combo_view_init (SheetObjectView *view)
 
 GSF_CLASS (GnmCComboView, gnm_ccombo_view,
           NULL, gnm_cell_combo_view_init,
-          SHEET_OBJECT_VIEW_TYPE)
+          GNM_SO_VIEW_TYPE)
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index ab8eacc..c9d4015 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -2365,7 +2365,7 @@ xml_sax_read_obj (GsfXMLIn *xin, gboolean needs_cleanup,
        }
 
        g_return_if_fail (so != NULL);
-       klass = SHEET_OBJECT_CLASS (G_OBJECT_GET_CLASS (so));
+       klass = GNM_SO_CLASS (G_OBJECT_GET_CLASS (so));
        g_return_if_fail (klass != NULL);
 
        state->so = so;
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index 7d9cdfa..664f6dc 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -1226,7 +1226,7 @@ xml_write_objects (GnmOutputXML *state, GSList *objects)
         */
        for (ptr = objects ;ptr != NULL ; ptr = ptr->next) {
                SheetObject *so = ptr->data;
-               SheetObjectClass *klass = SHEET_OBJECT_CLASS (G_OBJECT_GET_CLASS (so));
+               SheetObjectClass *klass = GNM_SO_CLASS (G_OBJECT_GET_CLASS (so));
                if (klass == NULL || klass->write_xml_sax == NULL)
                        continue;
 
@@ -1240,7 +1240,7 @@ xml_write_objects (GnmOutputXML *state, GSList *objects)
 
        for (ptr = objects ;ptr != NULL ; ptr = ptr->next) {
                SheetObject *so = ptr->data;
-               SheetObjectClass *klass = SHEET_OBJECT_CLASS (G_OBJECT_GET_CLASS (so));
+               SheetObjectClass *klass = GNM_SO_CLASS (G_OBJECT_GET_CLASS (so));
 
                if (needs_container) {
                        needs_container = FALSE;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]