X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-namedview.h;h=54291413e078d05a561a99a31dd01992880e53f7;hb=8e75b1268dabafcba82b82a5e5d51c78b300a010;hp=f96207794ea7215ebb43afa025af7b0efa9f3d27;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index f96207794..54291413e 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -22,10 +22,7 @@
 #include "sp-object-group.h"
 #include "libnr/nr-point.h"
 #include "sp-metric.h"
-#include "grid-snapper.h"
-#include "guide-snapper.h"
-#include "object-snapper.h"
-
+#include "snap.h"
 
 enum {
     SP_BORDER_LAYER_BOTTOM,
@@ -40,15 +37,6 @@ struct SPNamedView : public SPObjectGroup {
     unsigned int showpageshadow : 1;
     unsigned int borderlayer : 2;
 
-    int snap_grid_bbox;
-    int snap_grid_point;
-    int snap_guide_bbox;
-    int snap_guide_point;
-    int snap_object_bbox;
-    int snap_object_point;
-    int snap_object_paths;
-    int snap_object_nodes;
-
     double zoom;
     double cx;
     double cy;
@@ -57,9 +45,7 @@ struct SPNamedView : public SPObjectGroup {
     gint window_x;
     gint window_y;
 
-    Inkscape::GridSnapper grid_snapper;
-    Inkscape::GuideSnapper guide_snapper;
-    Inkscape::ObjectSnapper object_snapper;
+    SnapManager snap_manager;
 
     SPUnit const *gridunit;
     /* Grid data is in points regardless of unit */
@@ -81,6 +67,8 @@ struct SPNamedView : public SPObjectGroup {
     bool has_abs_tolerance;
     
     GQuark default_layer_id;
+    
+    double connector_spacing;
 
     guint32 gridcolor;
     guint32 gridempcolor;
@@ -102,9 +90,6 @@ struct SPNamedView : public SPObjectGroup {
     guint getViewCount();
     GSList const *getViewList() const;
     SPMetric getDefaultMetric() const;
-
-    typedef std::list<const Inkscape::Snapper *> SnapperList;
-    SnapperList getSnappers() const;
 };
 
 struct SPNamedViewClass {