NR::Maybe => boost::optional

[inkscape.git] / src / display / nr-arena-item.h

diff --git a/src/display/nr-arena-item.h b/src/display/nr-arena-item.h
index 6ca1564a171a718e9e78553fa43d86fd43740939..b95fc5e72081610a25a9abedf85dfa6e9afff6d1 100644 (file)
--- a/src/display/nr-arena-item.h
+++ b/src/display/nr-arena-item.h
@@ -64,7 +64,7 @@
 struct NRGC {
     NRGC(NRGC const *p) : parent(p) {}
     NRGC const *parent;
-    NRMatrix transform;
+    NR::Matrix transform;
 };
 
 struct NRArenaItem : public NRObject {
@@ -91,9 +91,9 @@ struct NRArenaItem : public NRObject {
     NRRectL bbox;
     /* BBox in item coordinates - this should be a bounding box as
      * specified in SVG standard. Required by filters. */
-    NR::Maybe<NR::Rect> item_bbox;
+    boost::optional<NR::Rect> item_bbox;
     /* Our affine */
-    NRMatrix *transform;
+    NR::Matrix *transform;
     /* Clip item */
     NRArenaItem *clip;
     /* Mask item */
@@ -170,14 +170,14 @@ NRArenaItem *nr_arena_item_unparent (NRArenaItem *item);
 void nr_arena_item_append_child (NRArenaItem *parent, NRArenaItem *child);
 
 void nr_arena_item_set_transform(NRArenaItem *item, NR::Matrix const &transform);
-void nr_arena_item_set_transform(NRArenaItem *item, NRMatrix const *transform);
+void nr_arena_item_set_transform(NRArenaItem *item, NR::Matrix const *transform);
 void nr_arena_item_set_opacity (NRArenaItem *item, double opacity);
 void nr_arena_item_set_sensitive (NRArenaItem *item, unsigned int sensitive);
 void nr_arena_item_set_visible (NRArenaItem *item, unsigned int visible);
 void nr_arena_item_set_clip (NRArenaItem *item, NRArenaItem *clip);
 void nr_arena_item_set_mask (NRArenaItem *item, NRArenaItem *mask);
 void nr_arena_item_set_order (NRArenaItem *item, int order);
-void nr_arena_item_set_item_bbox (NRArenaItem *item, NR::Maybe<NR::Rect> &bbox);
+void nr_arena_item_set_item_bbox (NRArenaItem *item, boost::optional<NR::Rect> &bbox);
 
 NRPixBlock *nr_arena_item_get_background (NRArenaItem const *item, int depth = 0);