summaryrefslogtreecommitdiffstats
path: root/src/sp-item-group.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2011-07-16 07:42:39 +0000
committerJon A. Cruz <jon@joncruz.org>2011-07-16 07:42:39 +0000
commit2be2cf32db0668dc64512a98f6c2394152bd10cc (patch)
tree8e25abb2f884e06692d861e6a1471440d6554946 /src/sp-item-group.cpp
parentadded WITH_GNOME_VFS as an option for cmake (diff)
downloadinkscape-2be2cf32db0668dc64512a98f6c2394152bd10cc.tar.gz
inkscape-2be2cf32db0668dc64512a98f6c2394152bd10cc.zip
Cleanup of oudated/redundant SP_ITEM() macro use.
(bzr r10461)
Diffstat (limited to 'src/sp-item-group.cpp')
-rw-r--r--src/sp-item-group.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 8d38fee07..491b2a62a 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -169,17 +169,15 @@ sp_group_dispose(GObject *object)
delete SP_GROUP(object)->group;
}
-static void
-sp_group_child_added (SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
+static void sp_group_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
{
- SPItem *item;
-
- item = SP_ITEM (object);
+ SPGroup *group = SP_GROUP(object);
- if (((SPObjectClass *) (parent_class))->child_added)
+ if (((SPObjectClass *) (parent_class))->child_added) {
(* ((SPObjectClass *) (parent_class))->child_added) (object, child, ref);
+ }
- SP_GROUP(object)->group->onChildAdded(child);
+ group->group->onChildAdded(child);
}
/* fixme: hide (Lauris) */
@@ -347,7 +345,7 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
SPRoot *root = doc->getRoot();
SPObject *defs = root->defs;
- SPItem *gitem = SP_ITEM (group);
+ SPItem *gitem = group;
Inkscape::XML::Node *grepr = gitem->getRepr();
g_return_if_fail (!strcmp (grepr->name(), "svg:g") || !strcmp (grepr->name(), "svg:a") || !strcmp (grepr->name(), "svg:switch"));
@@ -360,7 +358,7 @@ sp_item_group_ungroup (SPGroup *group, GSList **children, bool do_done)
if (SP_IS_BOX3D(gitem)) {
group = box3d_convert_to_group(SP_BOX3D(gitem));
- gitem = SP_ITEM(group);
+ gitem = group;
}
sp_lpe_item_remove_all_path_effects(SP_LPE_ITEM(group), false);