1) Use the "snap guides" button both for guides being snap sources, as well as for guides being snap targets

2) Remove some redundant guide-snapping code from the object snapper,

(bzr r10576)

1 files changed, 0 insertions, 38 deletions

diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index da6eca027..82114e2c4 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -742,44 +742,6 @@ void Inkscape::ObjectSnapper::constrainedSnap( SnappedConstraints &sc,
     }
 }
 
-
-// This method is used to snap a guide to nodes, while dragging the guide around
-void Inkscape::ObjectSnapper::guideFreeSnap(SnappedConstraints &sc,
-                                        Geom::Point const &p,
-                                        Geom::Point const &guide_normal) const
-{
-    if (!_snapmanager->snapprefs.getSnapModeOthers()) {
-        return;
-    }
-
-
-    //std::vector<SPItem const *> const it; //just an empty list
-
-    freeSnap(sc, SnapCandidatePoint(p, SNAPSOURCE_GUIDE), Geom::Rect(p, p), NULL, NULL);
-    //_findCandidates(_snapmanager->getDocument()->getRoot(), &it, true, Geom::Rect(p, p), false, Geom::identity());
-    //_snapTranslatingGuide(sc, p, guide_normal);
-
-}
-
-// This method is used to snap the origin of a guide to nodes/paths, while dragging the origin along the guide
-void Inkscape::ObjectSnapper::guideConstrainedSnap(SnappedConstraints &sc,
-                                        Geom::Point const &p,
-                                        Geom::Point const &guide_normal,
-                                        SnapConstraint const &/*c*/) const
-{
-    /* Get a list of all the SPItems that we will try to snap to */
-    std::vector<SPItem*> cand;
-    std::vector<SPItem const *> const it; //just an empty list
-
-    std::cout << "guideConstrainedSnap" << std::endl;
-
-    if (_snapmanager->snapprefs.getSnapModeOthers()) {
-        _findCandidates(_snapmanager->getDocument()->getRoot(), &it, true, Geom::Rect(p, p), false, Geom::identity());
-        _snapTranslatingGuide(sc, p, guide_normal);
-    }
-
-}
-
 /**
  *  \return true if this Snapper will snap at least one kind of point.
  */