Make knotholder members protected

diff --git a/src/knotholder.h b/src/knotholder.h
index 14a1397689f5fc23a1f53c6b3476266468977e4c..bd57776dbfd4066650b2d9e4f8f8743e6efe5e23 100644 (file)
--- a/src/knotholder.h
+++ b/src/knotholder.h
@@ -52,15 +52,18 @@ public:
 
     void add_pattern_knotholder();
 
-//private:
+    const SPItem *getItem() { return item; }
+
+    friend class ShapeEditor;
+
+protected:
     SPDesktop *desktop;
     SPItem *item; // TODO: Remove this and keep the actual item (e.g., SPRect etc.) in the item-specific knotholders
+    Inkscape::XML::Node *repr; ///< repr of the item, for setting and releasing listeners.
     std::list<KnotHolderEntity *> entity;
 
     SPKnotHolderReleasedFunc released;
 
-    Inkscape::XML::Node *repr; ///< repr of the item, for setting and releasing listeners.
-
     gboolean local_change; ///< if true, no need to recreate knotholder if repr was changed.
 };
 

diff --git a/src/live_effects/parameter/pointparam-knotholder.cpp b/src/live_effects/parameter/pointparam-knotholder.cpp
index 65105412085f3d0bea2cf7057c87d00e674a80ec..a8d357415c739692077607f190580a2d4ba2753e 100644 (file)
--- a/src/live_effects/parameter/pointparam-knotholder.cpp
+++ b/src/live_effects/parameter/pointparam-knotholder.cpp
@@ -112,7 +112,7 @@ static void pointparam_knot_clicked_handler(SPKnot */*knot*/, guint /*state*/, P
  */
 static void pointparam_knot_moved_handler(SPKnot */*knot*/, NR::Point const *p, guint /*state*/, PointParamKnotHolder *kh)
 {
-    NR::Matrix const i2d(from_2geom(sp_item_i2d_affine(kh->item)));
+    NR::Matrix const i2d(from_2geom(sp_item_i2d_affine(kh->getItem())));
     NR::Point pos = (*p) / i2d;
 
     Inkscape::SVGOStringStream os;
@@ -123,7 +123,7 @@ static void pointparam_knot_moved_handler(SPKnot */*knot*/, NR::Point const *p,
 
 static void pointparam_knot_ungrabbed_handler(SPKnot *knot, unsigned int /*state*/, PointParamKnotHolder *kh)
 {
-    NR::Matrix const i2d(from_2geom(sp_item_i2d_affine(kh->item)));
+    NR::Matrix const i2d(from_2geom(sp_item_i2d_affine(kh->getItem())));
     NR::Point pos = sp_knot_position(knot) / i2d;
 
     Inkscape::SVGOStringStream os;