From c102a87dc4726085fb0f7360a5cf7c575e1fde59 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 20 Jul 2006 04:03:08 +0000 Subject: marker refactoring work (bzr r1441) --- src/sp-switch.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sp-switch.cpp') diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp index 6884c352f..65ecc5442 100644 --- a/src/sp-switch.cpp +++ b/src/sp-switch.cpp @@ -75,9 +75,9 @@ SPObject *CSwitch::_evaluateFirst() { return NULL; } -GSList *CSwitch::_childList(bool add_ref, Action action) { - if ( ActionGeneral != action ) { - return CGroup::_childList(add_ref, action); +GSList *CSwitch::_childList(bool add_ref, SPObject::Action action) { + if ( action != SPObject::ActionGeneral ) { + return _group->childList(add_ref, action); } SPObject *child = _evaluateFirst(); @@ -120,7 +120,7 @@ void CSwitch::_reevaluate(bool add_to_arena) { _releaseLastItem(_cached_item); SPItem * child; - for ( GSList *l = _childList(false, ActionShow); + for ( GSList *l = _childList(false, SPObject::ActionShow); NULL != l ; l = g_slist_remove (l, l->data)) { SPObject *o = SP_OBJECT (l->data); @@ -162,7 +162,7 @@ void CSwitch::_showChildren (NRArena *arena, NRArenaItem *ai, unsigned int key, NRArenaItem *ac = NULL; NRArenaItem *ar = NULL; SPItem * child; - GSList *l = _childList(false, ActionShow); + GSList *l = _childList(false, SPObject::ActionShow); while (l) { SPObject *o = SP_OBJECT (l->data); if (SP_IS_ITEM (o)) { -- cgit v1.2.3