diff options
| author | MenTaLguY <mental@rydia.net> | 2006-04-29 22:57:44 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2006-04-29 22:57:44 +0000 |
| commit | defd1012376cb1fa70f9a10c67a029bc90e3986c (patch) | |
| tree | 28027d905d48c6b405f271210c3abaf3d2b1a30a /src/display/nr-arena-item.cpp | |
| parent | use proper unref function on SPRoot to avoid appearance of leak (diff) | |
| download | inkscape-defd1012376cb1fa70f9a10c67a029bc90e3986c.tar.gz inkscape-defd1012376cb1fa70f9a10c67a029bc90e3986c.zip | |
rationalize function names and remove spurious soft_ptr
(bzr r636)
Diffstat (limited to 'src/display/nr-arena-item.cpp')
| -rw-r--r-- | src/display/nr-arena-item.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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; |