diff options
| author | Ted Gould <ted@gould.cx> | 2008-11-21 05:24:08 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-11-21 05:24:08 +0000 |
| commit | 44a3a78fb6a3863c0c7f3c1193837337e68a67e4 (patch) | |
| tree | 1722ee5ec6f88c881cd4124923354b3c1311501b /src/libnr/nr-rect.cpp | |
| parent | Merge from trunk (diff) | |
| download | inkscape-44a3a78fb6a3863c0c7f3c1193837337e68a67e4.tar.gz inkscape-44a3a78fb6a3863c0c7f3c1193837337e68a67e4.zip | |
Merge from fe-moved
(bzr r6891)
Diffstat (limited to 'src/libnr/nr-rect.cpp')
| -rw-r--r-- | src/libnr/nr-rect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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)); } |