- Major refactoring of snapping related code...

- Enabling snap indicator for all remaining tools

(bzr r5556)

1 files changed, 13 insertions, 13 deletions

diff --git a/src/line-snapper.h b/src/line-snapper.h
index 39df82057..e5fc95dcb 100644
--- a/src/line-snapper.h
+++ b/src/line-snapper.h
@@ -21,28 +21,28 @@ class LineSnapper : public Snapper
 public:
   LineSnapper(SPNamedView const *nv, NR::Coord const d);
 
-protected:
-  typedef std::list<std::pair<NR::Point, NR::Point> > LineList; 
-  //first point is a vector normal to the line
-  //second point is a point on the line
-
-private:
-  void _doFreeSnap(SnappedConstraints &sc,
+  void freeSnap(SnappedConstraints &sc,
                    Inkscape::Snapper::PointType const &t,
                    NR::Point const &p,
                    bool const &first_point,
-                   std::vector<NR::Point> &points_to_snap,
-                   std::vector<SPItem const *> const &it,
+                   NR::Maybe<NR::Rect> const &bbox_to_snap,
+                   std::vector<SPItem const *> const *it,
                    std::vector<NR::Point> *unselected_nodes) const;
   
-  void _doConstrainedSnap(SnappedConstraints &sc,
+  void constrainedSnap(SnappedConstraints &sc,
                           Inkscape::Snapper::PointType const &t,
                           NR::Point const &p,
                           bool const &first_point,
-                          std::vector<NR::Point> &points_to_snap,
+                          NR::Maybe<NR::Rect> const &bbox_to_snap,
                           ConstraintLine const &c,
-                          std::vector<SPItem const *> const &it) const;
-  
+                          std::vector<SPItem const *> const *it) const;
+
+protected:
+  typedef std::list<std::pair<NR::Point, NR::Point> > LineList; 
+  //first point is a vector normal to the line
+  //second point is a point on the line
+
+private:
   /**
    *  \param p Point that we are trying to snap.
    *  \return List of lines that we should try snapping to.