From 900577c7e71534ec32dcb4e0677a509a6e517b12 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Tue, 5 Aug 2008 22:40:31 +0000 Subject: NR::Maybe => boost::optional (bzr r6569) --- src/object-snapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/object-snapper.cpp') diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 5f65e3ff9..020a4793d 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -96,7 +96,7 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent, _candidates->clear(); } - NR::Maybe bbox_of_item = NR::Rect(); // a default NR::Rect is infinitely large + boost::optional bbox_of_item = NR::Rect(); // a default NR::Rect is infinitely large NR::Rect bbox_to_snap_incl = bbox_to_snap; // _incl means: will include the snapper tolerance bbox_to_snap_incl.growBy(getSnapperTolerance()); // see? @@ -217,7 +217,7 @@ void Inkscape::ObjectSnapper::_collectNodes(Inkscape::Snapper::PointType const & // Discard the bbox of a clipped path / mask, because we don't want to snap to both the bbox // of the item AND the bbox of the clipping path at the same time if (!(*i).clip_or_mask) { - NR::Maybe b = sp_item_bbox_desktop(root_item, bbox_type); + boost::optional b = sp_item_bbox_desktop(root_item, bbox_type); if (b) { for ( unsigned k = 0 ; k < 4 ; k++ ) { _points_to_snap_to->push_back(b->corner(k)); @@ -588,7 +588,7 @@ void Inkscape::ObjectSnapper::freeSnap(SnappedConstraints &sc, Inkscape::Snapper::PointType const &t, NR::Point const &p, bool const &first_point, - NR::Maybe const &bbox_to_snap, + boost::optional const &bbox_to_snap, std::vector const *it, std::vector *unselected_nodes) const { @@ -631,7 +631,7 @@ void Inkscape::ObjectSnapper::constrainedSnap( SnappedConstraints &sc, Inkscape::Snapper::PointType const &t, NR::Point const &p, bool const &first_point, - NR::Maybe const &bbox_to_snap, + boost::optional const &bbox_to_snap, ConstraintLine const &c, std::vector const *it) const { -- cgit v1.2.3