diff options
| author | MenTaLguY <mental@rydia.net> | 2007-03-04 02:08:21 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2007-03-04 02:08:21 +0000 |
| commit | 4f7fe42548e3f91dffc8df220c04f16911497346 (patch) | |
| tree | e72476964c14896870222829d38e55f387ed3995 /src/select-context.cpp | |
| parent | remove debug messages that sneaked in (diff) | |
| download | inkscape-4f7fe42548e3f91dffc8df220c04f16911497346.tar.gz inkscape-4f7fe42548e3f91dffc8df220c04f16911497346.zip | |
make conversions away from NR::Maybe explicit
(bzr r2530)
Diffstat (limited to 'src/select-context.cpp')
| -rw-r--r-- | src/select-context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/select-context.cpp b/src/select-context.cpp index 5d8babe57..e1649e34f 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -229,7 +229,7 @@ sp_select_context_abort(SPEventContext *event_context) } } else { NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing()) { + if (b) { Inkscape::Rubberband::get()->stop(); rb_escaped = 1; SP_EVENT_CONTEXT(sc)->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selection canceled.")); @@ -567,12 +567,12 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) sc->item = NULL; } else { NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle(); - if (b != NR::Nothing() && !within_tolerance) { + if (b && !within_tolerance) { // this was a rubberband drag Inkscape::Rubberband::get()->stop(); seltrans->resetState(); // find out affected items: - GSList *items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, b.assume()); + GSList *items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, *b); if (event->button.state & GDK_SHIFT_MASK) { // with shift, add to selection selection->addList (items); |