X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fline-snapper.h;h=4c971d23817500634e9e10cb98aa83c819058b1d;hb=958c867c4ffb2cafbc87fb484a20c20dab458f3b;hp=c1c7da39a7dbc2bba44eddec414345efcec287a7;hpb=5c681d52040046fc1284c71112618c2b09e36e86;p=inkscape.git

diff --git a/src/line-snapper.h b/src/line-snapper.h
index c1c7da39a..4c971d238 100644
--- a/src/line-snapper.h
+++ b/src/line-snapper.h
@@ -7,6 +7,9 @@
  *
  *    Authors:
  *      Carl Hetherington <inkscape@carlh.net>
+ * 		Diederik van Lierop <mail@diedenrezi.nl>
+ *
+ * 	  Copyright (C) 1999-2008 Authors
  *
  *    Released under GNU GPL, read the file 'COPYING' for more information.
  */
@@ -19,37 +22,40 @@ namespace Inkscape
 class LineSnapper : public Snapper
 {
 public:
-  LineSnapper(SPNamedView const *nv, NR::Coord const d);
+  LineSnapper(SnapManager *sm, Geom::Coord const d);
+
+  void freeSnap(SnappedConstraints &sc,
+                   Inkscape::SnapPreferences::PointType const &t,
+                   Geom::Point const &p,
+                   SnapSourceType const &source_type,
+                   bool const &first_point,
+                   Geom::OptRect const &bbox_to_snap,
+                   std::vector<SPItem const *> const *it,
+                   std::vector<std::pair<Geom::Point, int> > *unselected_nodes) const;
+
+  void constrainedSnap(SnappedConstraints &sc,
+                          Inkscape::SnapPreferences::PointType const &t,
+                          Geom::Point const &p,
+                          SnapSourceType const &source_type,
+                          bool const &first_point,
+                          Geom::OptRect const &bbox_to_snap,
+                          ConstraintLine const &c,
+                          std::vector<SPItem const *> const *it) const;
 
 protected:
-  typedef std::list<std::pair<NR::Point, NR::Point> > LineList; 
+  typedef std::list<std::pair<Geom::Point, Geom::Point> > LineList;
   //first point is a vector normal to the line
   //second point is a point on the line
 
 private:
-  void _doFreeSnap(SnappedConstraints &sc,
-                   Inkscape::Snapper::PointType const &t,
-                   NR::Point const &p,
-                   bool const &first_point,
-                   std::vector<NR::Point> &points_to_snap,
-                   std::list<SPItem const *> const &it,
-                   std::vector<NR::Point> *unselected_nodes) const;
-  
-  void _doConstrainedSnap(SnappedConstraints &sc,
-                          Inkscape::Snapper::PointType const &t,
-                          NR::Point const &p,
-                          bool const &first_point,
-                          std::vector<NR::Point> &points_to_snap,
-                          ConstraintLine const &c,
-                          std::list<SPItem const *> const &it) const;
-  
   /**
    *  \param p Point that we are trying to snap.
    *  \return List of lines that we should try snapping to.
    */
-  virtual LineList _getSnapLines(NR::Point const &p) const = 0;
-  
-  virtual void _addSnappedLine(SnappedConstraints &sc, NR::Point const snapped_point, NR::Coord const snapped_distance, NR::Point const normal_to_line, NR::Point const point_on_line) const = 0;
+  virtual LineList _getSnapLines(Geom::Point const &p) const = 0;
+
+  virtual void _addSnappedLine(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source, Geom::Point const normal_to_line, Geom::Point const point_on_line) const = 0;
+  virtual void _addSnappedPoint(SnappedConstraints &sc, Geom::Point const snapped_point, Geom::Coord const snapped_distance, SnapSourceType const &source) const = 0;
 };
 
 }