X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsnap.h;h=e0217948fe3cfdb4b0f7a96b2841096512dd49c1;hb=724821145d62dee9f97465c706952582da6e432d;hp=2f8e83b1364e28265e882ccdc56d5fa09dfb2bdf;hpb=e028f2923eba0794a5323b536b76fc24d19f2f0a;p=inkscape.git

diff --git a/src/snap.h b/src/snap.h
index 2f8e83b13..e0217948f 100644
--- a/src/snap.h
+++ b/src/snap.h
@@ -22,7 +22,6 @@
 #include <libnr/nr-dim2.h>
 #include <libnr/nr-forward.h>
 #include <libnr/nr-scale.h>
-#include "grid-snapper.h"
 #include "guide-snapper.h"
 #include "object-snapper.h"
 
@@ -40,8 +39,10 @@ class SnapManager
 {
 public:
     SnapManager(SPNamedView const *v);
-    
-    bool willSnapSomething() const;
+
+    typedef std::list<const Inkscape::Snapper*> SnapperList;
+
+    bool SomeSnapperMightSnap() const;
 
     Inkscape::SnappedPoint freeSnap(Inkscape::Snapper::PointType t,
                                     NR::Point const &p,
@@ -50,7 +51,22 @@ public:
     Inkscape::SnappedPoint freeSnap(Inkscape::Snapper::PointType t,
                                     NR::Point const &p,
                                     std::list<SPItem const *> const &it) const;
-    
+
+     Inkscape::SnappedPoint freeSnap( Inkscape::Snapper::PointType t,
+                                      NR::Point const &p,
+                                      std::list<SPItem const *> const &it,
+                                      SnapperList const &snappers ) const;
+
+    Inkscape::SnappedPoint freeSnapAlways( Inkscape::Snapper::PointType t,
+                                           NR::Point const &p,
+                                           SPItem const *it,
+                                           SnapperList &snappers );
+
+    Inkscape::SnappedPoint freeSnapAlways( Inkscape::Snapper::PointType t,
+                                           NR::Point const &p,
+                                           std::list<SPItem const *> const &it,
+                                           SnapperList &snappers );
+
     Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType t,
                                            NR::Point const &p,
                                            Inkscape::Snapper::ConstraintLine const &c,
@@ -100,12 +116,11 @@ public:
                                             NR::Point const &o,
                                             NR::Dim2 d) const;
 
-    Inkscape::GridSnapper grid;        ///< grid snapper
     Inkscape::GuideSnapper guide;      ///< guide snapper
     Inkscape::ObjectSnapper object;    ///< snapper to other objects
 
-    typedef std::list<const Inkscape::Snapper*> SnapperList;
     SnapperList getSnappers() const;
+    SnapperList getGridSnappers() const;
 
 protected:
     SPNamedView const *_named_view;