diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-08-05 22:40:31 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-08-05 22:40:31 +0000 |
| commit | 900577c7e71534ec32dcb4e0677a509a6e517b12 (patch) | |
| tree | 8d5b4c6201b0728bff338e89106d1a8c5a0b7fef /src/line-geometry.h | |
| parent | codedread's patch for bug 254850 (fixes handling of description field in Obje... (diff) | |
| download | inkscape-900577c7e71534ec32dcb4e0677a509a6e517b12.tar.gz inkscape-900577c7e71534ec32dcb4e0677a509a6e517b12.zip | |
NR::Maybe => boost::optional
(bzr r6569)
Diffstat (limited to 'src/line-geometry.h')
| -rw-r--r-- | src/line-geometry.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/line-geometry.h b/src/line-geometry.h index 5e3152c03..86ed9ee8a 100644 --- a/src/line-geometry.h +++ b/src/line-geometry.h @@ -14,7 +14,7 @@ #include "libnr/nr-point.h" #include "libnr/nr-point-fns.h" -#include "libnr/nr-maybe.h" +#include <boost/optional.hpp> #include "glib.h" #include "display/sp-ctrlline.h" #include "axis-manip.h" // FIXME: This is only for Box3D::epsilon; move that to a better location @@ -30,13 +30,13 @@ public: Line(Line const &line); virtual ~Line() {} Line &operator=(Line const &line); - virtual NR::Maybe<NR::Point> intersect(Line const &line); + virtual boost::optional<NR::Point> intersect(Line const &line); inline NR::Point direction () { return v_dir; } NR::Point closest_to(NR::Point const &pt); // returns the point on the line closest to pt friend inline std::ostream &operator<< (std::ostream &out_file, const Line &in_line); - NR::Maybe<NR::Point> intersection_with_viewbox (SPDesktop *desktop); + boost::optional<NR::Point> intersection_with_viewbox (SPDesktop *desktop); inline bool lie_on_same_side (NR::Point const &A, NR::Point const &B) { /* If A is a point in the plane and n is the normal vector of the line then the sign of dot(A, n) specifies the half-plane in which A lies. |