Merge from trunk.

[inkscape.git] / src / line-snapper.h

diff --git a/src/line-snapper.h b/src/line-snapper.h
index 429139421dbaa9d2876f3d06fd87aa0beccc919f..cdc45c286bce947b2cb86904c88f7095025702db 100644 (file)
--- a/src/line-snapper.h
+++ b/src/line-snapper.h
@@ -34,8 +34,9 @@ public:
   void constrainedSnap(SnappedConstraints &sc,
                           Inkscape::SnapCandidatePoint const &p,
                           Geom::OptRect const &bbox_to_snap,
-                          ConstraintLine const &c,
-                          std::vector<SPItem const *> const *it) const;
+                          SnapConstraint const &c,
+                          std::vector<SPItem const *> const *it,
+                          std::vector<SnapCandidatePoint> *unselected_nodes) const;
 
 protected:
   typedef std::list<std::pair<Geom::Point, Geom::Point> > LineList;
@@ -52,9 +53,9 @@ private:
   virtual void _addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, Geom::Point const normal_to_line, Geom::Point const point_on_line) const = 0;
 
   // Will only be implemented for guide lines, because grid lines don't have an origin
-  virtual void _addSnappedLinesOrigin(SnappedConstraints &sc, Geom::Point const origin, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num) const;
+  virtual void _addSnappedLinesOrigin(SnappedConstraints &sc, Geom::Point const origin, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const;
 
-  virtual void _addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num) const = 0;
+  virtual void _addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, long source_num, bool constrained_snap) const = 0;
 };
 
 }