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/eraser-context.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/eraser-context.cpp')
| -rw-r--r-- | src/eraser-context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp index 81025d2b2..7f662f526 100644 --- a/src/eraser-context.cpp +++ b/src/eraser-context.cpp @@ -557,7 +557,7 @@ sp_eraser_context_root_handler(SPEventContext *event_context, if (dc->dragging && event->button.button == 1 && !event_context->space_panning) { dc->dragging = FALSE; - NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); + boost::optional<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); sp_eraser_apply(dc, motion_dt); @@ -743,7 +743,7 @@ set_to_accumulated(SPEraserContext *dc) Inkscape::XML::Document *xml_doc = sp_document_repr_doc(desktop->doc()); SPItem* acid = SP_ITEM(desktop->doc()->getObjectByRepr(dc->repr)); - NR::Maybe<NR::Rect> eraserBbox = acid->getBounds(NR::identity()); + boost::optional<NR::Rect> eraserBbox = acid->getBounds(NR::identity()); NR::Rect bounds = (*eraserBbox) * desktop->doc2dt(); std::vector<SPItem*> remainingItems; GSList* toWorkOn = 0; @@ -765,7 +765,7 @@ set_to_accumulated(SPEraserContext *dc) for (GSList *i = toWorkOn ; i ; i = i->next ) { SPItem *item = SP_ITEM(i->data); if ( eraserMode ) { - NR::Maybe<NR::Rect> bbox = item->getBounds(NR::identity()); + boost::optional<NR::Rect> bbox = item->getBounds(NR::identity()); if (bbox && bbox->intersects(*eraserBbox)) { Inkscape::XML::Node* dup = dc->repr->duplicate(xml_doc); dc->repr->parent()->appendChild(dup); |