NR::Maybe => boost::optional

[inkscape.git] / src / snap.h

diff --git a/src/snap.h b/src/snap.h
index 900f548cef9bd049c04c2a83864c4215293caf94..966d2a5431127968a7de6089d16ed1d3bdf79024 100644 (file)
--- a/src/snap.h
+++ b/src/snap.h
@@ -50,31 +50,31 @@ public:
     void setup(SPDesktop const *desktop_for_snapindicator = NULL, SPItem const *item_to_ignore = NULL, std::vector<NR::Point> *unselected_nodes = NULL);
     void setup(SPDesktop const *desktop_for_snapindicator, std::vector<SPItem const *> &items_to_ignore, std::vector<NR::Point> *unselected_nodes = NULL);
 
-    // freeSnapVoid() is preferred over freeSnap(), because it only returns a 
-    // point, by overwriting p, if snapping has occured; otherwise p is untouched    
-    void freeSnapVoid(Inkscape::Snapper::PointType point_type,
+    // freeSnapReturnByRef() is preferred over freeSnap(), because it only returns a 
+    // point if snapping has occured (by overwriting p); otherwise p is untouched    
+    void freeSnapReturnByRef(Inkscape::Snapper::PointType point_type,
                       NR::Point &p,
                       bool first_point = true,
-                      NR::Maybe<NR::Rect> const &bbox_to_snap = NR::Nothing()) const;
+                      boost::optional<NR::Rect> const &bbox_to_snap = boost::optional<NR::Rect>()) const;
     
     Inkscape::SnappedPoint freeSnap(Inkscape::Snapper::PointType point_type,
                                     NR::Point const &p,
                                     bool first_point = true,
-                                    NR::Maybe<NR::Rect> const &bbox_to_snap = NR::Nothing()) const;
+                                    boost::optional<NR::Rect> const &bbox_to_snap = boost::optional<NR::Rect>() ) const;
     
-    // constrainedSnapVoid() is preferred over constrainedSnap(), because it only returns a 
+    // constrainedSnapReturnByRef() is preferred over constrainedSnap(), because it only returns a 
     // point, by overwriting p, if snapping has occured; otherwise p is untouched
-    void constrainedSnapVoid(Inkscape::Snapper::PointType point_type,
+    void constrainedSnapReturnByRef(Inkscape::Snapper::PointType point_type,
                              NR::Point &p,
                              Inkscape::Snapper::ConstraintLine const &constraint,
                              bool first_point = true,
-                             NR::Maybe<NR::Rect> const &bbox_to_snap = NR::Nothing()) const;
+                             boost::optional<NR::Rect> const &bbox_to_snap = boost::optional<NR::Rect>()) const;
     
     Inkscape::SnappedPoint constrainedSnap(Inkscape::Snapper::PointType point_type,
                                            NR::Point const &p,
                                            Inkscape::Snapper::ConstraintLine const &constraint,
                                            bool first_point = true,
-                                           NR::Maybe<NR::Rect> const &bbox_to_snap = NR::Nothing()) const;
+                                           boost::optional<NR::Rect> const &bbox_to_snap = boost::optional<NR::Rect>()) const;
                                            
     void guideSnap(NR::Point &p, NR::Point const &guide_normal) const;