Update to new code in trunk

(bzr r13645.1.166)

2 files changed, 6 insertions, 11 deletions

diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index 4705fd821..7efe5dd98 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -223,7 +223,6 @@ void SatellitesArrayParam::param_transform_multiply(Geom::Affine const &postmul,
 }
 
 void SatellitesArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
-                                                 SPDesktop *desktop,
                                                  SPItem *item,
                                                  bool mirror)
 {
@@ -260,23 +259,22 @@ void SatellitesArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
                             "<b>Ctrl+Alt+Click</b> reset");
                 }
                 FilletChamferKnotHolderEntity *e = new FilletChamferKnotHolderEntity(this, index);
-                e->create(desktop, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, _(tip),_knot_shape, _knot_mode, _knot_color);
+                e->create(NULL, item, knotholder, Inkscape::CTRL_TYPE_UNKNOWN, _(tip),_knot_shape, _knot_mode, _knot_color);
                 knotholder->add(e);
             }
             index++;
         }
     }
     if (mirror) {
-        addKnotHolderEntities(knotholder, desktop, item, false);
+        addKnotHolderEntities(knotholder, item, false);
     }
 }
 
 void SatellitesArrayParam::addKnotHolderEntities(KnotHolder *knotholder,
-        SPDesktop *desktop,
         SPItem *item)
 {
     _knoth = knotholder;
-    addKnotHolderEntities(knotholder, desktop, item, true);
+    addKnotHolderEntities(knotholder, item, true);
 }
 
 FilletChamferKnotHolderEntity::FilletChamferKnotHolderEntity(
diff --git a/src/live_effects/parameter/satellitesarray.h b/src/live_effects/parameter/satellitesarray.h
index 5b2d8a799..edaf2f08d 100644
--- a/src/live_effects/parameter/satellitesarray.h
+++ b/src/live_effects/parameter/satellitesarray.h
@@ -41,12 +41,9 @@ public:
         return NULL;
     }
     virtual void setHelperSize(int hs);
-    virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop,
-                                       SPItem *item);
-    virtual void addKnotHolderEntities(KnotHolder *knotholder, SPDesktop *desktop,
-                                       SPItem *item, bool mirror);
-    virtual void addCanvasIndicators(SPLPEItem const *lpeitem,
-                                     std::vector<Geom::PathVector> &hp_vec);
+    virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item);
+    virtual void addKnotHolderEntities(KnotHolder *knotholder, SPItem *item, bool mirror);
+    virtual void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec);
     virtual void updateCanvasIndicators();
     virtual void updateCanvasIndicators(bool mirror);
     virtual bool providesKnotHolderEntities() const