diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-25 01:06:47 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-25 01:06:47 +0000 |
| commit | 4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3 (patch) | |
| tree | 75853d8eec5e85fb93a2a798b57f072e3c9eeb99 /src/sp-switch.cpp | |
| parent | Replace direct use of Cairo contexts and surfaces in the rendering tree (diff) | |
| parent | Revert workarounds from 10501 - no longer necessary (diff) | |
| download | inkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.tar.gz inkscape-4f3cc7cbb73a72e1ab10a587a3b81f8c8737fec3.zip | |
Merge from trunk
(bzr r10347.1.18)
Diffstat (limited to 'src/sp-switch.cpp')
| -rw-r--r-- | src/sp-switch.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp index 19c014b9b..eb30f2644 100644 --- a/src/sp-switch.cpp +++ b/src/sp-switch.cpp @@ -125,7 +125,6 @@ void CSwitch::_reevaluate(bool /*add_to_arena*/) { _releaseLastItem(_cached_item); - SPItem * child; for ( GSList *l = _childList(false, SPObject::ActionShow); NULL != l ; l = g_slist_remove (l, l->data)) { @@ -134,7 +133,7 @@ void CSwitch::_reevaluate(bool /*add_to_arena*/) { continue; } - child = SP_ITEM (o); + SPItem * child = SP_ITEM(o); child->setEvaluated(o == evaluated_child); } @@ -161,16 +160,14 @@ void CSwitch::_releaseLastItem(SPObject *obj) void CSwitch::_showChildren (NRArena *arena, NRArenaItem *ai, unsigned int key, unsigned int flags) { SPObject *evaluated_child = _evaluateFirst(); - NRArenaItem *ac = NULL; NRArenaItem *ar = NULL; - SPItem * child; GSList *l = _childList(false, SPObject::ActionShow); while (l) { SPObject *o = SP_OBJECT (l->data); if (SP_IS_ITEM (o)) { - child = SP_ITEM (o); + SPItem * child = SP_ITEM(o); child->setEvaluated(o == evaluated_child); - ac = child->invoke_show (arena, key, flags); + NRArenaItem *ac = child->invoke_show (arena, key, flags); if (ac) { nr_arena_item_add_child (ai, ac, ar); ar = ac; |