Fix change in revision 9947 to be consistent with rest of the codebase.

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

diff --git a/src/line-snapper.h b/src/line-snapper.h
index 91e8ca596d8e2d2188d0b36c795c603eb19fad0b..cdc45c286bce947b2cb86904c88f7095025702db 100644 (file)
--- a/src/line-snapper.h
+++ b/src/line-snapper.h
@@ -7,7 +7,7 @@
  *
  *    Authors:
  *      Carl Hetherington <inkscape@carlh.net>
- *             Diederik van Lierop <mail@diedenrezi.nl>
+ *      Diederik van Lierop <mail@diedenrezi.nl>
  *
  *       Copyright (C) 1999-2008 Authors
  *
@@ -18,6 +18,7 @@
 
 namespace Inkscape
 {
+class SnapCandidatePoint;
 
 class LineSnapper : public Snapper
 {
@@ -25,20 +26,17 @@ public:
   LineSnapper(SnapManager *sm, Geom::Coord const d);
 
   void freeSnap(SnappedConstraints &sc,
-                   Inkscape::SnapPreferences::PointType const &t,
-                   Geom::Point const &p,
-                   bool const &first_point,
+                   Inkscape::SnapCandidatePoint const &p,
                    Geom::OptRect const &bbox_to_snap,
                    std::vector<SPItem const *> const *it,
-                   std::vector<Geom::Point> *unselected_nodes) const;
+                   std::vector<Inkscape::SnapCandidatePoint> *unselected_nodes) const;
 
   void constrainedSnap(SnappedConstraints &sc,
-                          Inkscape::SnapPreferences::PointType const &t,
-                          Geom::Point const &p,
-                          bool const &first_point,
+                          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,7 +50,12 @@ private:
    */
   virtual LineList _getSnapLines(Geom::Point const &p) const = 0;
 
-  virtual void _addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, Geom::Point const normal_to_line, Geom::Point const point_on_line) const = 0;
+  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, 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, bool constrained_snap) const = 0;
 };
 
 }