merged with trunk so I can build again...

(bzr r10092.1.36)

1 files changed, 7 insertions, 12 deletions

diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index 19c014b9b..500e43c9c 100644
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -19,7 +19,7 @@
 #include <glibmm/i18n.h>
 
 #include "sp-switch.h"
-#include "display/nr-arena-group.h"
+#include "display/drawing-group.h"
 #include "conditions.h"
 
 #include <sigc++/functors/ptr_fun.h>
@@ -117,7 +117,7 @@ void CSwitch::onOrderChanged (Inkscape::XML::Node *, Inkscape::XML::Node *, Inks
     _reevaluate();
 }
 
-void CSwitch::_reevaluate(bool /*add_to_arena*/) {
+void CSwitch::_reevaluate(bool /*add_to_drawing*/) {
     SPObject *evaluated_child = _evaluateFirst();
     if (!evaluated_child || _cached_item == evaluated_child) {
         return;
@@ -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);
     }
 
@@ -158,22 +157,18 @@ void CSwitch::_releaseLastItem(SPObject *obj)
     _cached_item = NULL;
 }
 
-void CSwitch::_showChildren (NRArena *arena, NRArenaItem *ai, unsigned int key, unsigned int flags) {
+void CSwitch::_showChildren (Inkscape::Drawing &drawing, Inkscape::DrawingItem *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);
+            Inkscape::DrawingItem *ac = child->invoke_show (drawing, key, flags);
             if (ac) {
-                nr_arena_item_add_child (ai, ac, ar);
-                ar = ac;
+                ai->appendChild(ac);
             }
         }
         l = g_slist_remove (l, o);