From 4fa4b9a1359131d861470376a34750211cf1a1ae Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 19 Jan 2017 20:54:24 +0100 Subject: remove use of boost::optional to define "undefined" Canvas::Rect, and use Rect::empty instead. This commit includes Rect::operator bool() which might be a candidate for removal in a future commit, in an attempt to make the meaning clearer --- libs/canvas/widget.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/canvas/widget.cc') diff --git a/libs/canvas/widget.cc b/libs/canvas/widget.cc index d29abed259..db43a68119 100644 --- a/libs/canvas/widget.cc +++ b/libs/canvas/widget.cc @@ -82,15 +82,15 @@ Widget::render (Rect const & area, Cairo::RefPtr context) const return; } - Rect self = item_to_window (_bounding_box.get()); - boost::optional r = self.intersection (area); + Rect self = item_to_window (_bounding_box); + Rect r = self.intersection (area); if (!r) { std::cerr << "no intersection\n"; return; } - Rect draw = r.get (); + Rect draw = r; cairo_rectangle_t crect; crect.x = draw.x0; crect.y = draw.y0; -- cgit v1.2.3