Node tool: snap while scaling a selection of nodes. Consider this as experimental...

[inkscape.git] / src / seltrans.h

diff --git a/src/seltrans.h b/src/seltrans.h
index d0ac5dccf5a679d49653cc9d7130999a22bb0ac2..bb26aa2cbae7d5de0179b28343b76dfa72c01840 100644 (file)
--- a/src/seltrans.h
+++ b/src/seltrans.h
@@ -24,6 +24,7 @@
 #include "selcue.h"
 #include "message-context.h"
 #include <vector>
+#include "sp-item.h"
 
 struct SPKnot;
 class SPDesktop;
@@ -102,7 +103,6 @@ private:
     Geom::Point _getGeomHandlePos(Geom::Point const &visual_handle_pos);
     Geom::Point _calcAbsAffineDefault(Geom::Scale const default_scale);
     Geom::Point _calcAbsAffineGeom(Geom::Scale const geom_scale);
-    void _keepClosestPointOnly(std::vector<std::pair<Geom::Point, int> > &points, const Geom::Point &reference);
     void _display_snapsource();
 
     enum State {
@@ -117,9 +117,9 @@ private:
     std::vector<Geom::Matrix> _items_affines;
     std::vector<Geom::Point> _items_centers;
 
-    std::vector<std::pair<Geom::Point, int> > _snap_points;
-    std::vector<std::pair<Geom::Point, int> > _bbox_points; // the bbox point of the selection as a whole, i.e. max. 4 corners plus optionally some midpoints
-    std::vector<std::pair<Geom::Point, int> > _bbox_points_for_translating; // the bbox points of each selected item, only to be used for translating
+    std::vector<Inkscape::SnapCandidatePoint> _snap_points;
+    std::vector<Inkscape::SnapCandidatePoint> _bbox_points; // the bbox point of the selection as a whole, i.e. max. 4 corners plus optionally some midpoints
+    std::vector<Inkscape::SnapCandidatePoint> _bbox_points_for_translating; // the bbox points of each selected item, only to be used for translating
 
     Inkscape::SelCue _selcue;