From: mental Date: Sat, 29 Apr 2006 22:57:44 +0000 (+0000) Subject: rationalize function names and remove spurious soft_ptr X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=776877aa300b25ef93a53a1c2a451ddb1ca78250;p=inkscape.git rationalize function names and remove spurious soft_ptr --- diff --git a/ChangeLog b/ChangeLog index 0bb9aeeb2..4b9af61e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-04-29 MenTaLguY + + * src/display/nr-arena-group.cpp, src/display/nr-arena-item.cpp, + src/display/nr-arena-item.h, src/display/nr-arena-shape.cpp: + + rationalize function names and remove spurious soft_ptr + 2006-04-29 MenTaLguY * src/document.cpp: diff --git a/src/display/nr-arena-group.cpp b/src/display/nr-arena-group.cpp index 64274202f..f15c72e8e 100644 --- a/src/display/nr-arena-group.cpp +++ b/src/display/nr-arena-group.cpp @@ -105,9 +105,9 @@ nr_arena_group_add_child (NRArenaItem *item, NRArenaItem *child, NRArenaItem *re NRArenaGroup *group = NR_ARENA_GROUP (item); if (!ref) { - group->children = nr_arena_item_attach_ref (item, child, NULL, group->children); + group->children = nr_arena_item_attach (item, child, NULL, group->children); } else { - ref->next = nr_arena_item_attach_ref (item, child, ref, ref->next); + ref->next = nr_arena_item_attach (item, child, ref, ref->next); } if (ref == group->last) group->last = child; @@ -123,9 +123,9 @@ nr_arena_group_remove_child (NRArenaItem *item, NRArenaItem *child) if (child == group->last) group->last = child->prev; if (child->prev) { - nr_arena_item_detach_unref (item, child); + nr_arena_item_detach (item, child); } else { - group->children = nr_arena_item_detach_unref (item, child); + group->children = nr_arena_item_detach (item, child); } nr_arena_item_request_update (item, NR_ARENA_ITEM_STATE_ALL, FALSE); @@ -139,15 +139,15 @@ nr_arena_group_set_child_position (NRArenaItem *item, NRArenaItem *child, NRAren if (child == group->last) group->last = child->prev; if (child->prev) { - nr_arena_item_detach_unref (item, child); + nr_arena_item_detach (item, child); } else { - group->children = nr_arena_item_detach_unref (item, child); + group->children = nr_arena_item_detach (item, child); } if (!ref) { - group->children = nr_arena_item_attach_ref (item, child, NULL, group->children); + group->children = nr_arena_item_attach (item, child, NULL, group->children); } else { - ref->next = nr_arena_item_attach_ref (item, child, ref, ref->next); + ref->next = nr_arena_item_attach (item, child, ref, ref->next); } if (ref == group->last) group->last = child; diff --git a/src/display/nr-arena-item.cpp b/src/display/nr-arena-item.cpp index 44068cf9d..22719e846 100644 --- a/src/display/nr-arena-item.cpp +++ b/src/display/nr-arena-item.cpp @@ -858,8 +858,8 @@ nr_arena_item_set_clip (NRArenaItem *item, NRArenaItem *clip) if (clip != item->clip) { nr_arena_item_request_render (item); - if (item->clip) item->clip = nr_arena_item_detach_unref (item, item->clip); - if (clip) item->clip = nr_arena_item_attach_ref (item, clip, NULL, NULL); + if (item->clip) item->clip = nr_arena_item_detach (item, item->clip); + if (clip) item->clip = nr_arena_item_attach (item, clip, NULL, NULL); nr_arena_item_request_update (item, NR_ARENA_ITEM_STATE_ALL, TRUE); } } @@ -873,8 +873,8 @@ nr_arena_item_set_mask (NRArenaItem *item, NRArenaItem *mask) if (mask != item->mask) { nr_arena_item_request_render (item); - if (item->mask) item->mask = nr_arena_item_detach_unref (item, item->mask); - if (mask) item->mask = nr_arena_item_attach_ref (item, mask, NULL, NULL); + if (item->mask) item->mask = nr_arena_item_detach (item, item->mask); + if (mask) item->mask = nr_arena_item_attach (item, mask, NULL, NULL); nr_arena_item_request_update (item, NR_ARENA_ITEM_STATE_ALL, TRUE); } } @@ -908,7 +908,7 @@ nr_arena_item_set_order (NRArenaItem *item, int order) /* Helpers */ NRArenaItem * -nr_arena_item_attach_ref (NRArenaItem *parent, NRArenaItem *child, NRArenaItem *prev, NRArenaItem *next) +nr_arena_item_attach (NRArenaItem *parent, NRArenaItem *child, NRArenaItem *prev, NRArenaItem *next) { nr_return_val_if_fail (parent != NULL, NULL); nr_return_val_if_fail (NR_IS_ARENA_ITEM (parent), NULL); @@ -935,7 +935,7 @@ nr_arena_item_attach_ref (NRArenaItem *parent, NRArenaItem *child, NRArenaItem * } NRArenaItem * -nr_arena_item_detach_unref (NRArenaItem *parent, NRArenaItem *child) +nr_arena_item_detach (NRArenaItem *parent, NRArenaItem *child) { NRArenaItem *prev, *next; diff --git a/src/display/nr-arena-item.h b/src/display/nr-arena-item.h index 737fed879..22b992920 100644 --- a/src/display/nr-arena-item.h +++ b/src/display/nr-arena-item.h @@ -71,7 +71,7 @@ struct NRGC { }; struct NRArenaItem : public NRObject { - Inkscape::GC::soft_ptr arena; + NRArena *arena; Inkscape::GC::soft_ptr parent; NRArenaItem *next; Inkscape::GC::soft_ptr prev; @@ -175,8 +175,8 @@ void nr_arena_item_set_order (NRArenaItem *item, int order); /* Helpers */ -NRArenaItem *nr_arena_item_attach_ref (NRArenaItem *parent, NRArenaItem *child, NRArenaItem *prev, NRArenaItem *next); -NRArenaItem *nr_arena_item_detach_unref (NRArenaItem *parent, NRArenaItem *child); +NRArenaItem *nr_arena_item_attach (NRArenaItem *parent, NRArenaItem *child, NRArenaItem *prev, NRArenaItem *next); +NRArenaItem *nr_arena_item_detach (NRArenaItem *parent, NRArenaItem *child); #define NR_ARENA_ITEM_SET_DATA(i,v) (((NRArenaItem *) (i))->data = (v)) #define NR_ARENA_ITEM_GET_DATA(i) (((NRArenaItem *) (i))->data) diff --git a/src/display/nr-arena-shape.cpp b/src/display/nr-arena-shape.cpp index 6368e149b..e1e0ea540 100644 --- a/src/display/nr-arena-shape.cpp +++ b/src/display/nr-arena-shape.cpp @@ -144,9 +144,9 @@ nr_arena_shape_add_child(NRArenaItem *item, NRArenaItem *child, NRArenaItem *ref NRArenaShape *shape = (NRArenaShape *) item; if (!ref) { - shape->markers = nr_arena_item_attach_ref(item, child, NULL, shape->markers); + shape->markers = nr_arena_item_attach(item, child, NULL, shape->markers); } else { - ref->next = nr_arena_item_attach_ref(item, child, ref, ref->next); + ref->next = nr_arena_item_attach(item, child, ref, ref->next); } nr_arena_item_request_update(item, NR_ARENA_ITEM_STATE_ALL, FALSE); @@ -158,9 +158,9 @@ nr_arena_shape_remove_child(NRArenaItem *item, NRArenaItem *child) NRArenaShape *shape = (NRArenaShape *) item; if (child->prev) { - nr_arena_item_detach_unref(item, child); + nr_arena_item_detach(item, child); } else { - shape->markers = nr_arena_item_detach_unref(item, child); + shape->markers = nr_arena_item_detach(item, child); } nr_arena_item_request_update(item, NR_ARENA_ITEM_STATE_ALL, FALSE); @@ -172,15 +172,15 @@ nr_arena_shape_set_child_position(NRArenaItem *item, NRArenaItem *child, NRArena NRArenaShape *shape = (NRArenaShape *) item; if (child->prev) { - nr_arena_item_detach_unref(item, child); + nr_arena_item_detach(item, child); } else { - shape->markers = nr_arena_item_detach_unref(item, child); + shape->markers = nr_arena_item_detach(item, child); } if (!ref) { - shape->markers = nr_arena_item_attach_ref(item, child, NULL, shape->markers); + shape->markers = nr_arena_item_attach(item, child, NULL, shape->markers); } else { - ref->next = nr_arena_item_attach_ref(item, child, ref, ref->next); + ref->next = nr_arena_item_attach(item, child, ref, ref->next); } nr_arena_item_request_render(child);