diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-08-05 22:40:31 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-08-05 22:40:31 +0000 |
| commit | 900577c7e71534ec32dcb4e0677a509a6e517b12 (patch) | |
| tree | 8d5b4c6201b0728bff338e89106d1a8c5a0b7fef /src/object-snapper.cpp | |
| parent | codedread's patch for bug 254850 (fixes handling of description field in Obje... (diff) | |
| download | inkscape-900577c7e71534ec32dcb4e0677a509a6e517b12.tar.gz inkscape-900577c7e71534ec32dcb4e0677a509a6e517b12.zip | |
NR::Maybe => boost::optional
(bzr r6569)
Diffstat (limited to 'src/object-snapper.cpp')
| -rw-r--r-- | src/object-snapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<NR::Rect> bbox_of_item = NR::Rect(); // a default NR::Rect is infinitely large + boost::optional<NR::Rect> 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<NR::Rect> b = sp_item_bbox_desktop(root_item, bbox_type); + boost::optional<NR::Rect> 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<NR::Rect> const &bbox_to_snap, + boost::optional<NR::Rect> const &bbox_to_snap, std::vector<SPItem const *> const *it, std::vector<NR::Point> *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<NR::Rect> const &bbox_to_snap, + boost::optional<NR::Rect> const &bbox_to_snap, ConstraintLine const &c, std::vector<SPItem const *> const *it) const { |