Merge from fe-moved

(bzr r6891)

3 files changed, 8 insertions, 8 deletions

diff --git a/src/libnr/nr-convert2geom.h b/src/libnr/nr-convert2geom.h
index 7b501cddc..b7cbd7ee8 100644
--- a/src/libnr/nr-convert2geom.h
+++ b/src/libnr/nr-convert2geom.h
@@ -45,8 +45,8 @@ inline NR::Rect from_2geom(Geom::Rect const & rect2geom) {
     NR::Rect rect(rect2geom.min(), rect2geom.max());
     return rect;
 }
-inline boost::optional<Geom::Rect> to_2geom(boost::optional<NR::Rect> const & rect) {
-    boost::optional<Geom::Rect> rect2geom;
+inline Geom::OptRect to_2geom(boost::optional<NR::Rect> const & rect) {
+    Geom::OptRect rect2geom;
     if (!rect) {
         return rect2geom;
     }
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));
     }
diff --git a/src/libnr/nr-rect.h b/src/libnr/nr-rect.h
index 83f780efd..c074b0034 100644
--- a/src/libnr/nr-rect.h
+++ b/src/libnr/nr-rect.h
@@ -244,9 +244,9 @@ struct NRRect {
     explicit NRRect(boost::optional<NR::Rect> const &rect);
     operator boost::optional<NR::Rect>() const { return upgrade(); }
     boost::optional<NR::Rect> upgrade() const;
-    explicit NRRect(boost::optional<Geom::Rect> const &rect);
-    operator boost::optional<Geom::Rect>() const { return upgrade_2geom(); }
-    boost::optional<Geom::Rect> upgrade_2geom() const;
+    explicit NRRect(Geom::OptRect const &rect);
+    operator Geom::OptRect() const { return upgrade_2geom(); }
+    Geom::OptRect upgrade_2geom() const;
 
     NR::Coord x0, y0, x1, y1;
 };