A simple layout document as to what, why and how is cppification.

[inkscape.git] / src / sp-item.cpp

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index e5f8eade1581a9aee91dde05b0ab42de2b6e114f..fc605516d51ce3be39976d8788373881434ebb86 100644 (file)
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -296,7 +296,7 @@ SPItem::setExplicitlyHidden(bool const val) {
 void
 SPItem::setCenter(Geom::Point object_centre) {
     // for getBounds() to work
-    sp_document_ensure_up_to_date(SP_OBJECT_DOCUMENT(this));
+    SP_OBJECT_DOCUMENT(this)->ensure_up_to_date();
 
     Geom::OptRect bbox = getBounds(i2d_affine());
     if (bbox) {
@@ -321,7 +321,7 @@ bool SPItem::isCenterSet() {
 
 Geom::Point SPItem::getCenter() const {
     // for getBounds() to work
-    sp_document_ensure_up_to_date(SP_OBJECT_DOCUMENT(this));
+    SP_OBJECT_DOCUMENT(this)->ensure_up_to_date();
 
     Geom::OptRect bbox = getBounds(i2d_affine());
     if (bbox) {
@@ -405,16 +405,16 @@ void SPItem::lowerToBottom() {
 void
 SPItem::sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    sp_object_read_attr(object, "style");
-    sp_object_read_attr(object, "transform");
-    sp_object_read_attr(object, "clip-path");
-    sp_object_read_attr(object, "mask");
-    sp_object_read_attr(object, "sodipodi:insensitive");
-    sp_object_read_attr(object, "sodipodi:nonprintable");
-    sp_object_read_attr(object, "inkscape:transform-center-x");
-    sp_object_read_attr(object, "inkscape:transform-center-y");
-    sp_object_read_attr(object, "inkscape:connector-avoid");
-    sp_object_read_attr(object, "inkscape:connection-points");
+    object->readAttr( "style");
+    object->readAttr( "transform");
+    object->readAttr( "clip-path");
+    object->readAttr( "mask");
+    object->readAttr( "sodipodi:insensitive");
+    object->readAttr( "sodipodi:nonprintable");
+    object->readAttr( "inkscape:transform-center-x");
+    object->readAttr( "inkscape:transform-center-y");
+    object->readAttr( "inkscape:connector-avoid");
+    object->readAttr( "inkscape:connection-points");
 
     if (((SPObjectClass *) (SPItemClass::static_parent_class))->build) {
         (* ((SPObjectClass *) (SPItemClass::static_parent_class))->build)(object, document, repr);
@@ -563,7 +563,7 @@ SPItem::clip_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item)
         SPItemView *v;
         /* Hide clippath */
         for (v = item->display; v != NULL; v = v->next) {
-            sp_clippath_hide(SP_CLIPPATH(old_clip), NR_ARENA_ITEM_GET_KEY(v->arenaitem));
+            SP_CLIPPATH(old_clip)->sp_clippath_hide(NR_ARENA_ITEM_GET_KEY(v->arenaitem));
             nr_arena_item_set_clip(v->arenaitem, NULL);
         }
     }
@@ -574,12 +574,12 @@ SPItem::clip_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item)
             if (!v->arenaitem->key) {
                 NR_ARENA_ITEM_SET_KEY(v->arenaitem, SPItem::display_key_new(3));
             }
-            NRArenaItem *ai = sp_clippath_show(SP_CLIPPATH(clip),
+            NRArenaItem *ai = SP_CLIPPATH(clip)->sp_clippath_show(
                                                NR_ARENA_ITEM_ARENA(v->arenaitem),
                                                NR_ARENA_ITEM_GET_KEY(v->arenaitem));
             nr_arena_item_set_clip(v->arenaitem, ai);
             nr_arena_item_unref(ai);
-            sp_clippath_set_bbox(SP_CLIPPATH(clip), NR_ARENA_ITEM_GET_KEY(v->arenaitem), &bbox);
+            SP_CLIPPATH(clip)->sp_clippath_set_bbox(NR_ARENA_ITEM_GET_KEY(v->arenaitem), &bbox);
             SP_OBJECT(clip)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
         }
     }
@@ -636,7 +636,7 @@ SPItem::sp_item_update(SPObject *object, SPCtx *ctx, guint flags)
             item->invoke_bbox( &bbox, Geom::identity(), TRUE);
             if (clip_path) {
                 for (SPItemView *v = item->display; v != NULL; v = v->next) {
-                    sp_clippath_set_bbox(clip_path, NR_ARENA_ITEM_GET_KEY(v->arenaitem), &bbox);
+                    clip_path->sp_clippath_set_bbox(NR_ARENA_ITEM_GET_KEY(v->arenaitem), &bbox);
                 }
             }
             if (mask) {
@@ -683,7 +683,7 @@ SPItem::sp_item_write(SPObject *const object, Inkscape::XML::Document *xml_doc,
         Inkscape::XML::Node *crepr;
         GSList *l;
         l = NULL;
-        for (child = sp_object_first_child(object); child != NULL; child = SP_OBJECT_NEXT(child) ) {
+        for (child = object->first_child(); child != NULL; child = SP_OBJECT_NEXT(child) ) {
             if (!SP_IS_TITLE(child) && !SP_IS_DESC(child)) continue;
             crepr = child->updateRepr(xml_doc, NULL, flags);
             if (crepr) l = g_slist_prepend (l, crepr);
@@ -694,7 +694,7 @@ SPItem::sp_item_write(SPObject *const object, Inkscape::XML::Document *xml_doc,
             l = g_slist_remove (l, l->data);
         }
     } else {
-        for (child = sp_object_first_child(object) ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
+        for (child = object->first_child() ; child != NULL; child = SP_OBJECT_NEXT(child) ) {
             if (!SP_IS_TITLE(child) && !SP_IS_DESC(child)) continue;
             child->updateRepr(flags);
         }
@@ -846,7 +846,7 @@ SPItem::invoke_bbox_full( Geom::OptRect &bbox, Geom::Matrix const &transform, un
         }
         if (this->clip_ref->getObject()) {
             NRRect b;
-            sp_clippath_get_bbox(SP_CLIPPATH(this->clip_ref->getObject()), &b, transform, flags);
+            SP_CLIPPATH(this->clip_ref->getObject())->sp_clippath_get_bbox(&b, transform, flags);
             nr_rect_d_intersect (&temp_bbox, &temp_bbox, &b);
         }
     }
@@ -899,7 +899,7 @@ SPItem::invoke_bbox_full( NRRect *bbox, Geom::Matrix const &transform, unsigned
     // unless this is geometric bbox, crop the bbox by clip path, if any
     if ((SPItem::BBoxType) flags != SPItem::GEOMETRIC_BBOX && this->clip_ref->getObject()) {
         NRRect b;
-        sp_clippath_get_bbox(SP_CLIPPATH(this->clip_ref->getObject()), &b, transform, flags);
+        SP_CLIPPATH(this->clip_ref->getObject())->sp_clippath_get_bbox(&b, transform, flags);
         nr_rect_d_intersect (&this_bbox, &this_bbox, &b);
     }
 
@@ -921,7 +921,7 @@ unsigned SPItem::pos_in_parent()
     SPObject *object = SP_OBJECT(this);
 
     unsigned pos=0;
-    for ( SPObject *iter = sp_object_first_child(parent) ; iter ; iter = SP_OBJECT_NEXT(iter)) {
+    for ( SPObject *iter = parent->first_child() ; iter ; iter = SP_OBJECT_NEXT(iter)) {
         if ( iter == object ) {
             return pos;
         }
@@ -1125,14 +1125,14 @@ SPItem::invoke_show(NRArena *arena, unsigned key, unsigned flags)
             int clip_key = NR_ARENA_ITEM_GET_KEY(display->arenaitem);
 
             // Show and set clip
-            NRArenaItem *ac = sp_clippath_show(cp, arena, clip_key);
+            NRArenaItem *ac = cp->sp_clippath_show(arena, clip_key);
             nr_arena_item_set_clip(ai, ac);
             nr_arena_item_unref(ac);
 
             // Update bbox, in case the clip uses bbox units
             NRRect bbox;
             invoke_bbox( &bbox, Geom::identity(), TRUE);
-            sp_clippath_set_bbox(SP_CLIPPATH(cp), clip_key, &bbox);
+            SP_CLIPPATH(cp)->sp_clippath_set_bbox(clip_key, &bbox);
             SP_OBJECT(cp)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
         }
         if (mask_ref->getObject()) {
@@ -1179,7 +1179,7 @@ SPItem::invoke_hide(unsigned key)
         SPItemView *next = v->next;
         if (v->key == key) {
             if (clip_ref->getObject()) {
-                sp_clippath_hide(clip_ref->getObject(), NR_ARENA_ITEM_GET_KEY(v->arenaitem));
+                (clip_ref->getObject())->sp_clippath_hide(NR_ARENA_ITEM_GET_KEY(v->arenaitem));
                 nr_arena_item_set_clip(v->arenaitem, NULL);
             }
             if (mask_ref->getObject()) {
@@ -1405,8 +1405,8 @@ SPItem::adjust_livepatheffect (Geom::Matrix const &postmul, bool set)
 void
 SPItem::doWriteTransform(Inkscape::XML::Node *repr, Geom::Matrix const &transform, Geom::Matrix const *adv, bool compensate)
 {
-    g_return_if_fail(this != NULL);
-    g_return_if_fail(SP_IS_ITEM(this));
+    //g_return_if_fail(this != NULL);
+    //g_return_if_fail(SP_IS_ITEM(this));
     g_return_if_fail(repr != NULL);
 
     // calculate the relative transform, if not given by the adv attribute
@@ -1571,7 +1571,7 @@ Geom::Matrix SPItem::i2d_affine() const
 
     Geom::Matrix const ret( i2doc_affine()
                           * Geom::Scale(1, -1)
-                          * Geom::Translate(0, sp_document_height(SP_OBJECT_DOCUMENT(this))) );
+                          * Geom::Translate(0, SP_OBJECT_DOCUMENT(this)->getHeight()) );
     return ret;
 }
 
@@ -1584,7 +1584,7 @@ void SPItem::set_i2d_affine(Geom::Matrix const &i2dt)
     if (SP_OBJECT_PARENT(this)) {
         dt2p = static_cast<SPItem *>(SP_OBJECT_PARENT(this))->i2d_affine().inverse();
     } else {
-        dt2p = ( Geom::Translate(0, -sp_document_height(SP_OBJECT_DOCUMENT(this)))
+        dt2p = ( Geom::Translate(0, -SP_OBJECT_DOCUMENT(this)->getHeight())
                  * Geom::Scale(1, -1) );
     }
 
@@ -1669,7 +1669,7 @@ sp_item_repr_compare_position(SPItem *first, SPItem *second)
 SPItem *
 sp_item_first_item_child (SPObject *obj)
 {
-    for ( SPObject *iter = sp_object_first_child(obj) ; iter ; iter = SP_OBJECT_NEXT(iter)) {
+    for ( SPObject *iter = obj->first_child() ; iter ; iter = SP_OBJECT_NEXT(iter)) {
         if (SP_IS_ITEM (iter))
             return SP_ITEM (iter);
     }