Removed old calls to set_shape and update_patheffect.

(bzr r11608.1.45)

13 files changed, 23 insertions, 21 deletions

diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index 3b30e31ab..39982c49c 100644
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
@@ -73,7 +73,7 @@ static void box3d_side_class_init(Box3DSideClass *klass)
     sp_object_class->set = box3d_side_set;
     sp_object_class->update = box3d_side_update;
 
-    shape_class->set_shape = box3d_side_set_shape;
+    //shape_class->set_shape = box3d_side_set_shape;
 }
 
 CBox3DSide::CBox3DSide(Box3DSide* box3dside) : CPolygon(box3dside) {
diff --git a/src/sp-ellipse.cpp b/src/sp-ellipse.cpp
index d5d25504b..73965dfcb 100644
--- a/src/sp-ellipse.cpp
+++ b/src/sp-ellipse.cpp
@@ -117,8 +117,8 @@ static void sp_genericellipse_class_init(SPGenericEllipseClass *klass)
 
     item_class->snappoints = sp_genericellipse_snappoints;
 
-    shape_class->set_shape = sp_genericellipse_set_shape;
-    lpe_item_class->update_patheffect = sp_genericellipse_update_patheffect;
+    //shape_class->set_shape = sp_genericellipse_set_shape;
+    //lpe_item_class->update_patheffect = sp_genericellipse_update_patheffect;
 }
 
 CGenericEllipse::CGenericEllipse(SPGenericEllipse* genericEllipse) : CShape(genericEllipse) {
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 406db4d8f..507dab20b 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -135,7 +135,7 @@ sp_group_class_init (SPGroupClass *klass)
     item_class->hide = sp_group_hide;
     item_class->snappoints = sp_group_snappoints;
 
-    lpe_item_class->update_patheffect = sp_group_update_patheffect;
+    //lpe_item_class->update_patheffect = sp_group_update_patheffect;
 }
 
 CGroup::CGroup(SPGroup *group) : CLPEItem(group) {
@@ -851,9 +851,10 @@ void CGroup::onUpdatePatheffect(bool write) {
     for ( GSList const *iter = item_list; iter; iter = iter->next ) {
         SPObject *subitem = static_cast<SPObject *>(iter->data);
         if (SP_IS_LPE_ITEM(subitem)) {
-            if (SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (subitem))->update_patheffect) {
-                SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (subitem))->update_patheffect (SP_LPE_ITEM(subitem), write);
-            }
+            //if (SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (subitem))->update_patheffect) {
+            //    SP_LPE_ITEM_CLASS (G_OBJECT_GET_CLASS (subitem))->update_patheffect (SP_LPE_ITEM(subitem), write);
+            //}
+        	((SPLPEItem*)subitem)->clpeitem->onUpdatePatheffect(write);
         }
     }
 
diff --git a/src/sp-line.cpp b/src/sp-line.cpp
index a431a0948..b39117d9e 100644
--- a/src/sp-line.cpp
+++ b/src/sp-line.cpp
@@ -65,7 +65,7 @@ void SPLineClass::sp_line_class_init(SPLineClass *klass)
     sp_object_class->update = SPLine::update;
 
     SPShapeClass *shape_class = (SPShapeClass *) klass;
-    shape_class->set_shape = SPLine::setShape;
+    //shape_class->set_shape = SPLine::setShape;
 }
 
 CLine::CLine(SPLine* line) : CShape(line) {
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index 15243c651..b013a8b06 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -108,7 +108,7 @@ sp_lpe_item_class_init(SPLPEItemClass *klass)
     sp_object_class->child_added = sp_lpe_item_child_added;
     sp_object_class->remove_child = sp_lpe_item_remove_child;
 
-    klass->update_patheffect = NULL;
+    //klass->update_patheffect = NULL;
 }
 
 // CPPIFY: remove
@@ -404,7 +404,7 @@ bool sp_lpe_item_perform_path_effect(SPLPEItem *lpeitem, SPCurve *curve) {
 
 // CPPIFY: make pure virtual
 void CLPEItem::onUpdatePatheffect(bool write) {
-	throw;
+	//throw;
 }
 
 /**
diff --git a/src/sp-lpe-item.h b/src/sp-lpe-item.h
index b45e9950a..57fff4952 100644
--- a/src/sp-lpe-item.h
+++ b/src/sp-lpe-item.h
@@ -59,7 +59,7 @@ public:
 struct SPLPEItemClass {
     SPItemClass parent_class;
 
-    void (* update_patheffect) (SPLPEItem *lpeitem, bool write);
+    //void (* update_patheffect) (SPLPEItem *lpeitem, bool write);
 };
 
 
diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index f2f707882..08a57234b 100644
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -159,7 +159,7 @@ sp_offset_class_init(SPOffsetClass *klass)
     item_class->description = sp_offset_description;
     item_class->snappoints = sp_offset_snappoints;
 
-    shape_class->set_shape = sp_offset_set_shape;
+    //shape_class->set_shape = sp_offset_set_shape;
 }
 
 COffset::COffset(SPOffset* offset) : CShape(offset) {
diff --git a/src/sp-path.cpp b/src/sp-path.cpp
index d58242a38..d68e87d29 100644
--- a/src/sp-path.cpp
+++ b/src/sp-path.cpp
@@ -120,7 +120,7 @@ sp_path_class_init(SPPathClass * klass)
     item_class->set_transform = sp_path_set_transform;
     item_class->convert_to_guides = sp_path_convert_to_guides;
 
-    lpe_item_class->update_patheffect = sp_path_update_patheffect;
+    //lpe_item_class->update_patheffect = sp_path_update_patheffect;
 }
 
 
diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp
index 47374605b..cf814ccb6 100644
--- a/src/sp-rect.cpp
+++ b/src/sp-rect.cpp
@@ -90,7 +90,7 @@ sp_rect_class_init(SPRectClass *klass)
     item_class->convert_to_guides = sp_rect_convert_to_guides;
     item_class->snappoints = sp_rect_snappoints; //override the default sp_shape_snappoints; see sp_rect_snappoints for details
 
-    shape_class->set_shape = sp_rect_set_shape;
+    //shape_class->set_shape = sp_rect_set_shape;
 }
 
 CRect::CRect(SPRect* rect) : CShape(rect) {
diff --git a/src/sp-shape.cpp b/src/sp-shape.cpp
index 87b1e7607..64ddff20e 100644
--- a/src/sp-shape.cpp
+++ b/src/sp-shape.cpp
@@ -106,9 +106,10 @@ void SPShapeClass::sp_shape_class_init(SPShapeClass *klass)
     item_class->show = SPShape::sp_shape_show;
     item_class->hide = SPShape::sp_shape_hide;
     item_class->snappoints = SPShape::sp_shape_snappoints;
-    lpe_item_class->update_patheffect = NULL;
 
-    klass->set_shape = NULL;
+    //lpe_item_class->update_patheffect = NULL;
+
+    //klass->set_shape = NULL;
 }
 
 CShape::CShape(SPShape* shape) : CLPEItem(shape) {
diff --git a/src/sp-shape.h b/src/sp-shape.h
index 7459b2f90..5920df8b2 100644
--- a/src/sp-shape.h
+++ b/src/sp-shape.h
@@ -90,7 +90,7 @@ public:
     SPLPEItemClass item_class;
 
     /* Build bpath from extra shape attributes */
-    void (* set_shape) (SPShape *shape);
+    //void (* set_shape) (SPShape *shape);
 
 private:
     static SPLPEItemClass *parent_class;
diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index f5e7cdb0b..d549c2192 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -92,9 +92,9 @@ static void sp_spiral_class_init(SPSpiralClass *klass)
     item_class->description = sp_spiral_description;
     item_class->snappoints = sp_spiral_snappoints;
 
-    lpe_item_class->update_patheffect = sp_spiral_update_patheffect;
+    //lpe_item_class->update_patheffect = sp_spiral_update_patheffect;
 
-    shape_class->set_shape = sp_spiral_set_shape;
+    //shape_class->set_shape = sp_spiral_set_shape;
 }
 
 CSpiral::CSpiral(SPSpiral* spiral) : CShape(spiral) {
diff --git a/src/sp-star.cpp b/src/sp-star.cpp
index aead51b8b..fca4d6f35 100644
--- a/src/sp-star.cpp
+++ b/src/sp-star.cpp
@@ -86,9 +86,9 @@ static void sp_star_class_init(SPStarClass *klass)
     item_class->description = sp_star_description;
     item_class->snappoints = sp_star_snappoints;
 
-    lpe_item_class->update_patheffect = sp_star_update_patheffect;
+    //lpe_item_class->update_patheffect = sp_star_update_patheffect;
 
-    shape_class->set_shape = sp_star_set_shape;
+    //shape_class->set_shape = sp_star_set_shape;
 }
 
 CStar::CStar(SPStar* star) : CPolygon(star) {