From 44a3a78fb6a3863c0c7f3c1193837337e68a67e4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 20 Nov 2008 23:24:08 -0600
Subject: Merge from fe-moved

(bzr r6891)
---
 src/libnr/nr-rect.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libnr/nr-rect.cpp')

diff --git a/src/libnr/nr-rect.cpp b/src/libnr/nr-rect.cpp
index 620782996..1e1f36104 100644
--- a/src/libnr/nr-rect.cpp
+++ b/src/libnr/nr-rect.cpp
@@ -28,7 +28,7 @@ NRRect::NRRect(boost::optional<NR::Rect> const &rect) {
     }
 }
 
-NRRect::NRRect(boost::optional<Geom::Rect> const &rect) {
+NRRect::NRRect(Geom::OptRect const &rect) {
     if (rect) {
         x0 = rect->min()[Geom::X];
         y0 = rect->min()[Geom::Y];
@@ -47,9 +47,9 @@ boost::optional<NR::Rect> NRRect::upgrade() const {
     }
 }
 
-boost::optional<Geom::Rect> NRRect::upgrade_2geom() const {
+Geom::OptRect NRRect::upgrade_2geom() const {
     if (nr_rect_d_test_empty_ptr(this)) {
-        return boost::optional<Geom::Rect>();
+        return Geom::OptRect();
     } else {
         return Geom::Rect(Geom::Point(x0, y0), Geom::Point(x1, y1));
     }
-- 
cgit v1.2.3