Pass removing some outdated C-macro use.

(bzr r10059)

16 files changed, 160 insertions, 163 deletions

diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index 72a479ca4..0c74a8f7e 100644
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
@@ -209,21 +209,21 @@ void
 box3d_side_position_set (Box3DSide *side) {
     box3d_side_set_shape (SP_SHAPE (side));
 
-    /* This call is responsible for live update of the sides during the initial drag */
-    SP_OBJECT(side)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    // This call is responsible for live update of the sides during the initial drag
+    side->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
 box3d_side_set_shape (SPShape *shape)
 {
     Box3DSide *side = SP_BOX3D_SIDE (shape);
-    if (!SP_OBJECT_DOCUMENT(side)->root) {
+    if (!side->document->root) {
         // avoid a warning caused by sp_document_height() (which is called from sp_item_i2d_affine() below)
         // when reading a file containing 3D boxes
         return;
     }
 
-    SPObject *parent = SP_OBJECT(side)->parent;
+    SPObject *parent = side->parent;
     if (!SP_IS_BOX3D(parent)) {
         g_warning ("Parent of 3D box side is not a 3D box.\n");
         return;
@@ -306,12 +306,12 @@ box3d_side_compute_corner_ids(Box3DSide *side, unsigned int corners[4]) {
 
 Persp3D *
 box3d_side_perspective(Box3DSide *side) {
-    return SP_BOX3D(SP_OBJECT(side)->parent)->persp_ref->getObject();
+    return SP_BOX3D(side->parent)->persp_ref->getObject();
 }
 
 Inkscape::XML::Node *box3d_side_convert_to_path(Box3DSide *side) {
     // TODO: Copy over all important attributes (see sp_selected_item_to_curved_repr() for an example)
-    SPDocument *doc = SP_OBJECT_DOCUMENT(side);
+    SPDocument *doc = side->document;
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
 
     Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
diff --git a/src/box3d.cpp b/src/box3d.cpp
index cc3280150..a1ac84f14 100644
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -105,11 +105,10 @@ static void
 box3d_init(SPBox3D *box)
 {
     box->persp_href = NULL;
-    box->persp_ref = new Persp3DReference(SP_OBJECT(box));
+    box->persp_ref = new Persp3DReference(box);
 }
 
-static void
-box3d_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+static void box3d_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
     if (((SPObjectClass *) (parent_class))->build) {
         ((SPObjectClass *) (parent_class))->build(object, document, repr);
@@ -125,15 +124,14 @@ box3d_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 
     // TODO: Create/link to the correct perspective
 
-    SPDocument *doc = SP_OBJECT_DOCUMENT(box);
-    if (!doc)
-        return;
-
-    box->persp_ref->changedSignal().connect(sigc::bind(sigc::ptr_fun(box3d_ref_changed), box));
+    SPDocument *doc = box->document;
+    if ( doc ) {
+        box->persp_ref->changedSignal().connect(sigc::bind(sigc::ptr_fun(box3d_ref_changed), box));
 
-    object->readAttr( "inkscape:perspectiveID" );
-    object->readAttr( "inkscape:corner0" );
-    object->readAttr( "inkscape:corner7" );
+        object->readAttr( "inkscape:perspectiveID" );
+        object->readAttr( "inkscape:corner0" );
+        object->readAttr( "inkscape:corner7" );
+    }
 }
 
 /**
@@ -168,7 +166,7 @@ box3d_release(SPObject *object)
         // by the following code and then again by the redo mechanism! Perhaps we should perform
         // deletion of the perspective from another location "outside" the undo/redo mechanism?
         if (persp->perspective_impl->boxes.empty()) {
-            SPDocument *doc = SP_OBJECT_DOCUMENT(box);
+            SPDocument *doc = box->document;
             persp->deleteObject();
             doc->setCurrentPersp3D(persp3d_document_first_persp(doc));
         }
@@ -283,7 +281,7 @@ static Inkscape::XML::Node * box3d_write(SPObject *object, Inkscape::XML::Docume
             repr->setAttribute("inkscape:perspectiveID", box->persp_href);
         } else {
             /* box is not yet linked to a perspective; use the document's current perspective */
-            SPDocument *doc = SP_OBJECT_DOCUMENT(object);
+            SPDocument *doc = object->document;
             if (box->persp_ref->getURI()) {
                 gchar *uri_string = box->persp_ref->getURI()->toString();
                 repr->setAttribute("inkscape:perspectiveID", uri_string);
@@ -1344,7 +1342,7 @@ box3d_switch_perspectives(SPBox3D *box, Persp3D *old_persp, Persp3D *new_persp,
    the original box and deletes the latter */
 SPGroup *box3d_convert_to_group(SPBox3D *box)
 {
-    SPDocument *doc = SP_OBJECT_DOCUMENT(box);
+    SPDocument *doc = box->document;
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
 
     // remember position of the box
@@ -1369,7 +1367,7 @@ SPGroup *box3d_convert_to_group(SPBox3D *box)
     }
 
     // add the new group to the box's parent and set remembered position
-    SPObject *parent = SP_OBJECT_PARENT(box);
+    SPObject *parent = box->parent;
     parent->appendChild(grepr);
     grepr->setPosition(pos);
     grepr->setAttribute("style", style);
@@ -1378,7 +1376,7 @@ SPGroup *box3d_convert_to_group(SPBox3D *box)
     if (clip_path)
        grepr->setAttribute("clip-path", clip_path);
 
-    SP_OBJECT(box)->deleteObject(true);
+    box->deleteObject(true);
 
     grepr->setAttribute("id", id);
 
diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index e08a416d3..f06ebab88 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -283,7 +283,7 @@ void ColorProfile::set( SPObject *object, unsigned key, gchar const *value )
                     //LCMSAPI cmsHPROFILE   LCMSEXPORT cmsOpenProfileFromMem(LPVOID MemPtr, DWORD dwSize);
 
                     // Try to open relative
-                    SPDocument *doc = SP_OBJECT_DOCUMENT(object);
+                    SPDocument *doc = object->document;
                     if (!doc) {
                         doc = SP_ACTIVE_DOCUMENT;
                         g_warning("object has no document.  using active");
diff --git a/src/conditions.cpp b/src/conditions.cpp
index d35f18cf1..21218831a 100644
--- a/src/conditions.cpp
+++ b/src/conditions.cpp
@@ -103,7 +103,7 @@ static bool evaluateSystemLanguage(SPItem const *item, gchar const *value) {
     if (language_codes.empty())
         return false;
 
-    SPDocument *document = SP_OBJECT_DOCUMENT(item);
+    SPDocument *document = item->document;
     Glib::ustring document_language = document->getLanguage();
 
     if (document_language.size() == 0)
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 410090e22..4c6139672 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -75,13 +75,12 @@ SPAvoidRef::~SPAvoidRef()
 
 void SPAvoidRef::setAvoid(char const *value)
 {
-    if (SP_OBJECT_IS_CLONED(item)) {
-        // Don't keep avoidance information for cloned objects.
-        return;
-    }
-    new_setting = false;
-    if (value && (strcmp(value, "true") == 0)) {
-        new_setting = true;
+    // Don't keep avoidance information for cloned objects.
+    if ( !item->cloned ) {
+        new_setting = false;
+        if (value && (strcmp(value, "true") == 0)) {
+            new_setting = true;
+        }
     }
 }
 
@@ -194,7 +193,7 @@ void SPAvoidRef::setConnectionPoints(gchar const *value)
 
 void SPAvoidRef::setConnectionPointsAttrUndoable(const gchar* value, const gchar* action)
 {
-    SPDocument* doc = SP_OBJECT_DOCUMENT(item);
+    SPDocument* doc = item->document;
 
     item->setAttribute( "inkscape:connection-points", value, 0 );
     item->updateRepr();
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 71c865879..b458827f0 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -453,7 +453,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                 case GDK_KP_Delete:
                 case GDK_BackSpace:
                 {
-                    SPDocument *doc = SP_OBJECT_DOCUMENT(guide);
+                    SPDocument *doc = guide->document;
                     sp_guide_remove(guide);
                     DocumentUndo::done(doc, SP_VERB_NONE, _("Delete guide"));
                     ret = TRUE;
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 8a4122e78..b5e7cdd33 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -185,7 +185,7 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas, Inkscape::UI::View::EditWid
     namedview = nv;
     canvas = aCanvas;
 
-    SPDocument *document = SP_OBJECT_DOCUMENT (namedview);
+    SPDocument *document = namedview->document;
     /* Kill flicker */
     document->ensureUpToDate();
 
@@ -532,9 +532,9 @@ SPObject *SPDesktop::layerForObject(SPObject *object) {
     g_return_val_if_fail(object != NULL, NULL);
 
     SPObject *root=currentRoot();
-    object = SP_OBJECT_PARENT(object);
+    object = object->parent;
     while ( object && object != root && !isLayer(object) ) {
-        object = SP_OBJECT_PARENT(object);
+        object = object->parent;
     }
     return object;
 }
@@ -1686,7 +1686,7 @@ _reconstruction_finish (SPDesktop * desktop)
     if (desktop->_reconstruction_old_layer_id == NULL)
         return;
 
-    SPObject * newLayer = SP_OBJECT_DOCUMENT(desktop->namedview)->getObjectById(desktop->_reconstruction_old_layer_id);
+    SPObject * newLayer = desktop->namedview->document->getObjectById(desktop->_reconstruction_old_layer_id);
     if (newLayer != NULL)
         desktop->setCurrentLayer(newLayer);
 
diff --git a/src/document.cpp b/src/document.cpp
index a473daa3c..2a9ad9144 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -267,7 +267,7 @@ unsigned long SPDocument::serial() const {
 
 void SPDocument::queueForOrphanCollection(SPObject *object) {
     g_return_if_fail(object != NULL);
-    g_return_if_fail(SP_OBJECT_DOCUMENT(object) == this);
+    g_return_if_fail(object->document == this);
 
     sp_object_ref(object, NULL);
     _collection_queue = g_slist_prepend(_collection_queue, object);
@@ -550,7 +550,7 @@ void SPDocument::setWidth(gdouble width, const SPUnit *unit)
             root->viewBox.x1 = root->viewBox.x0 + (root->width.computed / old_computed) * (root->viewBox.x1 - root->viewBox.x0);
     }
 
-    SP_OBJECT (root)->updateRepr();
+    root->updateRepr();
 }
 
 void SPDocument::setHeight(gdouble height, const SPUnit *unit)
@@ -576,7 +576,7 @@ void SPDocument::setHeight(gdouble height, const SPUnit *unit)
             root->viewBox.y1 = root->viewBox.y0 + (root->height.computed / old_computed) * (root->viewBox.y1 - root->viewBox.y0);
     }
 
-    SP_OBJECT (root)->updateRepr();
+    root->updateRepr();
 }
 
 gdouble SPDocument::getHeight() const
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp
index a245e1c89..446009e1d 100644
--- a/src/filters/componenttransfer-funcnode.cpp
+++ b/src/filters/componenttransfer-funcnode.cpp
@@ -183,14 +183,13 @@ sp_fefuncnode_build(SPObject *object, SPDocument *document, Inkscape::XML::Node
 /**
  * Drops any allocated memory.
  */
-static void
-sp_fefuncnode_release(SPObject *object)
+static void sp_fefuncnode_release(SPObject *object)
 {
     //SPFeFuncNode *fefuncnode = SP_FEFUNCNODE(object);
 
-    if (SP_OBJECT_DOCUMENT(object)) {
-        /* Unregister ourselves */
-        SP_OBJECT_DOCUMENT(object)->removeResource("fefuncnode", SP_OBJECT(object));
+    if ( object->document ) {
+        // Unregister ourselves
+        object->document->removeResource("fefuncnode", object);
     }
 
 //TODO: release resources here
@@ -313,7 +312,7 @@ sp_fefuncnode_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XM
     SPFeFuncNode *fefuncnode = SP_FEFUNCNODE(object);
 
     if (!repr) {
-        repr = SP_OBJECT_REPR(object)->duplicate(doc);
+        repr = object->getRepr()->duplicate(doc);
     }
 
     (void)fefuncnode;
diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp
index 2207bc8e4..88c2a21ff 100644
--- a/src/filters/distantlight.cpp
+++ b/src/filters/distantlight.cpp
@@ -115,9 +115,9 @@ sp_fedistantlight_release(SPObject *object)
 {
     //SPFeDistantLight *fedistantlight = SP_FEDISTANTLIGHT(object);
 
-    if (SP_OBJECT_DOCUMENT(object)) {
-        /* Unregister ourselves */
-        SP_OBJECT_DOCUMENT(object)->removeResource("fedistantlight", SP_OBJECT(object));
+    if ( object->document ) {
+        // Unregister ourselves
+        object->document->removeResource("fedistantlight", object);
     }
 
 //TODO: release resources here
@@ -206,7 +206,7 @@ sp_fedistantlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape
     SPFeDistantLight *fedistantlight = SP_FEDISTANTLIGHT(object);
 
     if (!repr) {
-        repr = SP_OBJECT_REPR(object)->duplicate(doc);
+        repr = object->getRepr()->duplicate(doc);
     }
 
     if (fedistantlight->azimuth_set)
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index c9eebcb18..28b3ee165 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -119,9 +119,9 @@ sp_fepointlight_release(SPObject *object)
 {
     //SPFePointLight *fepointlight = SP_FEPOINTLIGHT(object);
 
-    if (SP_OBJECT_DOCUMENT(object)) {
-        /* Unregister ourselves */
-        SP_OBJECT_DOCUMENT(object)->removeResource("fepointlight", SP_OBJECT(object));
+    if ( object->document ) {
+        // Unregister ourselves
+        object->document->removeResource("fepointlight", object);
     }
 
 //TODO: release resources here
@@ -229,7 +229,7 @@ sp_fepointlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::
     SPFePointLight *fepointlight = SP_FEPOINTLIGHT(object);
 
     if (!repr) {
-        repr = SP_OBJECT_REPR(object)->duplicate(doc);
+        repr = object->getRepr()->duplicate(doc);
     }
 
     if (fepointlight->x_set)
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index dac9b87e7..b6753a1f1 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -134,9 +134,9 @@ sp_fespotlight_release(SPObject *object)
 {
     //SPFeSpotLight *fespotlight = SP_FESPOTLIGHT(object);
 
-    if (SP_OBJECT_DOCUMENT(object)) {
-        /* Unregister ourselves */
-        SP_OBJECT_DOCUMENT(object)->removeResource("fespotlight", SP_OBJECT(object));
+    if ( object->document ) {
+        // Unregister ourselves
+        object->document->removeResource("fespotlight", object);
     }
 
 //TODO: release resources here
@@ -332,7 +332,7 @@ sp_fespotlight_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::X
     SPFeSpotLight *fespotlight = SP_FESPOTLIGHT(object);
 
     if (!repr) {
-        repr = SP_OBJECT_REPR(object)->duplicate(doc);
+        repr = object->getRepr()->duplicate(doc);
     }
 
     if (fespotlight->x_set)
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index d99a57208..86b63855b 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -81,9 +81,9 @@ SPGradient *sp_gradient_ensure_vector_normalized(SPGradient *gr)
 
     /* If gr hrefs some other gradient, remove the href */
     if (gr->ref->getObject()) {
-        /* We are hrefing someone, so require flattening */
-        SP_OBJECT(gr)->updateRepr(SP_OBJECT_WRITE_EXT | SP_OBJECT_WRITE_ALL);
-        sp_gradient_repr_set_link(SP_OBJECT_REPR(gr), NULL);
+        // We are hrefing someone, so require flattening
+        gr->updateRepr(SP_OBJECT_WRITE_EXT | SP_OBJECT_WRITE_ALL);
+        sp_gradient_repr_set_link(gr->getRepr(), NULL);
     }
 
     /* Everything is OK, set state flag */
@@ -124,7 +124,7 @@ static SPGradient *sp_gradient_get_private_normalized(SPDocument *document, SPGr
     sp_gradient_repr_set_link(repr, vector);
 
     /* Append the new private gradient to defs */
-    SP_OBJECT_REPR(defs)->appendChild(repr);
+    defs->getRepr()->appendChild(repr);
     Inkscape::GC::release(repr);
 
     // get corresponding object
@@ -145,7 +145,7 @@ guint count_gradient_hrefs(SPObject *o, SPGradient *gr)
 
     guint i = 0;
 
-    SPStyle *style = SP_OBJECT_STYLE(o);
+    SPStyle *style = o->style;
     if (style
         && style->fill.isPaintserver()
         && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style))
@@ -193,7 +193,7 @@ SPGradient *sp_gradient_fork_private_if_necessary(SPGradient *gr, SPGradient *ve
     // texts.
     SPObject *user = o;
     while (SP_IS_TSPAN(user)) {
-        user = SP_OBJECT_PARENT(user);
+        user = user->parent;
     }
 
     // Check the number of uses of the gradient within this object;
@@ -202,17 +202,17 @@ SPGradient *sp_gradient_fork_private_if_necessary(SPGradient *gr, SPGradient *ve
         // check vector
         if ( gr != vector && gr->ref->getObject() != vector ) {
             /* our href is not the vector, and vector is different from gr; relink */
-            sp_gradient_repr_set_link(SP_OBJECT_REPR(gr), vector);
+            sp_gradient_repr_set_link(gr->getRepr(), vector);
         }
         return gr;
     }
 
-    SPDocument *doc = SP_OBJECT_DOCUMENT(gr);
+    SPDocument *doc = gr->document;
     SPObject *defs = SP_DOCUMENT_DEFS(doc);
 
     if ((gr->hasStops()) ||
         (gr->state != SP_GRADIENT_STATE_UNKNOWN) ||
-        (SP_OBJECT_PARENT(gr) != SP_OBJECT(defs)) ||
+        (gr->parent != SP_OBJECT(defs)) ||
         (gr->hrefcount > 1)) {
         // we have to clone a fresh new private gradient for the given vector
 
@@ -220,8 +220,8 @@ SPGradient *sp_gradient_fork_private_if_necessary(SPGradient *gr, SPGradient *ve
         SPGradient *gr_new = sp_gradient_get_private_normalized(doc, vector, type);
 
         // copy all the attributes to it
-        Inkscape::XML::Node *repr_new = SP_OBJECT_REPR(gr_new);
-        Inkscape::XML::Node *repr = SP_OBJECT_REPR(gr);
+        Inkscape::XML::Node *repr_new = gr_new->getRepr();
+        Inkscape::XML::Node *repr = gr->getRepr();
         repr_new->setAttribute("gradientUnits", repr->attribute("gradientUnits"));
         repr_new->setAttribute("gradientTransform", repr->attribute("gradientTransform"));
         repr_new->setAttribute("spreadMethod", repr->attribute("spreadMethod"));
@@ -255,11 +255,11 @@ SPGradient *sp_gradient_fork_vector_if_necessary(SPGradient *gr)
         return gr;
 
     if (gr->hrefcount > 1) {
-        SPDocument *doc = SP_OBJECT_DOCUMENT(gr);
+        SPDocument *doc = gr->document;
         Inkscape::XML::Document *xml_doc = doc->getReprDoc();
 
-        Inkscape::XML::Node *repr = SP_OBJECT_REPR (gr)->duplicate(xml_doc);
-        SP_OBJECT_REPR (SP_DOCUMENT_DEFS (doc))->addChild(repr, NULL);
+        Inkscape::XML::Node *repr = gr->getRepr()->duplicate(xml_doc);
+        SP_DOCUMENT_DEFS(doc)->getRepr()->addChild(repr, NULL);
         SPGradient *gr_new = (SPGradient *) doc->getObjectByRepr(repr);
         gr_new = sp_gradient_ensure_vector_normalized (gr_new);
         Inkscape::GC::release(repr);
@@ -279,7 +279,7 @@ SPGradient *sp_gradient_get_forked_vector_if_necessary(SPGradient *gradient, boo
     SPGradient *vector = gradient->getVector(force_vector);
     vector = sp_gradient_fork_vector_if_necessary (vector);
     if ( gradient != vector && gradient->ref->getObject() != vector ) {
-        sp_gradient_repr_set_link(SP_OBJECT_REPR(gradient), vector);
+        sp_gradient_repr_set_link(gradient->getRepr(), vector);
     }
     return vector;
 }
@@ -295,10 +295,10 @@ SPGradient *sp_gradient_reset_to_userspace(SPGradient *gr, SPItem *item)
 #ifdef SP_GR_VERBOSE
     g_message("sp_gradient_reset_to_userspace(%p, %p)", gr, item);
 #endif
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(gr);
+    Inkscape::XML::Node *repr = gr->getRepr();
 
     // calculate the bbox of the item
-    SP_OBJECT_DOCUMENT(item)->ensureUpToDate();
+    item->document->ensureUpToDate();
     Geom::OptRect bbox = item->getBounds(Geom::identity()); // we need "true" bbox without item_i2d_affine
 
     if (!bbox)
@@ -324,7 +324,7 @@ SPGradient *sp_gradient_reset_to_userspace(SPGradient *gr, SPItem *item)
         gr->gradientTransform = squeeze;
         {
             gchar *c=sp_svg_transform_write(gr->gradientTransform);
-            SP_OBJECT_REPR(gr)->setAttribute("gradientTransform", c);
+            gr->getRepr()->setAttribute("gradientTransform", c);
             g_free(c);
         }
     } else {
@@ -357,14 +357,14 @@ SPGradient *sp_gradient_convert_to_userspace(SPGradient *gr, SPItem *item, gchar
 
     // First, fork it if it is shared
     gr = sp_gradient_fork_private_if_necessary(gr, gr->getVector(),
-                                               SP_IS_RADIALGRADIENT(gr) ? SP_GRADIENT_TYPE_RADIAL : SP_GRADIENT_TYPE_LINEAR, SP_OBJECT(item));
+                                               SP_IS_RADIALGRADIENT(gr) ? SP_GRADIENT_TYPE_RADIAL : SP_GRADIENT_TYPE_LINEAR, item);
 
     if (gr->getUnits() == SP_GRADIENT_UNITS_OBJECTBOUNDINGBOX) {
 
-        Inkscape::XML::Node *repr = SP_OBJECT_REPR(gr);
+        Inkscape::XML::Node *repr = gr->getRepr();
 
         // calculate the bbox of the item
-        SP_OBJECT_DOCUMENT(item)->ensureUpToDate();
+        item->document->ensureUpToDate();
         Geom::Affine bbox2user;
         Geom::OptRect bbox = item->getBounds(Geom::identity()); // we need "true" bbox without item_i2d_affine
         if ( bbox ) {
@@ -403,7 +403,7 @@ SPGradient *sp_gradient_convert_to_userspace(SPGradient *gr, SPItem *item, gchar
         gr->gradientTransform = skew;
         {
             gchar *c=sp_svg_transform_write(gr->gradientTransform);
-            SP_OBJECT_REPR(gr)->setAttribute("gradientTransform", c);
+            gr->getRepr()->setAttribute("gradientTransform", c);
             g_free(c);
         }
 
@@ -454,10 +454,11 @@ SPGradient *sp_gradient_convert_to_userspace(SPGradient *gr, SPItem *item, gchar
     // from sp_item_adjust_paint_recursive); however text and all its children should all
     // refer to one gradient, hence the recursive call for text (because we can't/don't
     // want to access tspans and set gradients on them separately)
-    if (SP_IS_TEXT(item))
-        sp_style_set_property_url(SP_OBJECT(item), property, SP_OBJECT(gr), true);
-    else
-        sp_style_set_property_url(SP_OBJECT(item), property, SP_OBJECT(gr), false);
+    if (SP_IS_TEXT(item)) {
+        sp_style_set_property_url(item, property, gr, true);
+    } else {
+        sp_style_set_property_url(item, property, gr, false);
+    }
 
     return gr;
 }
@@ -475,7 +476,7 @@ void sp_gradient_transform_multiply(SPGradient *gradient, Geom::Affine postmul,
     gradient->gradientTransform_set = TRUE;
 
     gchar *c=sp_svg_transform_write(gradient->gradientTransform);
-    SP_OBJECT_REPR(gradient)->setAttribute("gradientTransform", c);
+    gradient->getRepr()->setAttribute("gradientTransform", c);
     g_free(c);
 }
 
@@ -549,12 +550,12 @@ SPStop *sp_vector_add_stop(SPGradient *vector, SPStop* prev_stop, SPStop* next_s
 #endif
 
     Inkscape::XML::Node *new_stop_repr = NULL;
-    new_stop_repr = SP_OBJECT_REPR(prev_stop)->duplicate(SP_OBJECT_REPR(vector)->document());
-    SP_OBJECT_REPR(vector)->addChild(new_stop_repr, SP_OBJECT_REPR(prev_stop));
+    new_stop_repr = prev_stop->getRepr()->duplicate(vector->getRepr()->document());
+    vector->getRepr()->addChild(new_stop_repr, prev_stop->getRepr());
 
-    SPStop *newstop = (SPStop *) SP_OBJECT_DOCUMENT(vector)->getObjectByRepr(new_stop_repr);
+    SPStop *newstop = reinterpret_cast<SPStop *>(vector->document->getObjectByRepr(new_stop_repr));
     newstop->offset = offset;
-    sp_repr_set_css_double( SP_OBJECT_REPR(newstop), "offset", (double)offset);
+    sp_repr_set_css_double( newstop->getRepr(), "offset", (double)offset);
     guint32 const c1 = sp_stop_get_rgba32(prev_stop);
     guint32 const c2 = sp_stop_get_rgba32(next_stop);
     guint32 cnew = average_color (c1, c2, (offset - prev_stop->offset) / (next_stop->offset - prev_stop->offset));
@@ -563,7 +564,7 @@ SPStop *sp_vector_add_stop(SPGradient *vector, SPStop* prev_stop, SPStop* next_s
     sp_svg_write_color (c, sizeof(c), cnew);
     gdouble opacity = (gdouble) SP_RGBA32_A_F (cnew);
     os << "stop-color:" << c << ";stop-opacity:" << opacity <<";";
-    SP_OBJECT_REPR (newstop)->setAttribute("style", os.str().c_str());
+    newstop->getRepr()->setAttribute("style", os.str().c_str());
     Inkscape::GC::release(new_stop_repr);
 
     return newstop;
@@ -678,7 +679,7 @@ void sp_item_gradient_stop_set_style(SPItem *item, guint point_type, guint point
 
     vector = sp_gradient_fork_vector_if_necessary (vector);
     if ( gradient != vector && gradient->ref->getObject() != vector ) {
-        sp_gradient_repr_set_link(SP_OBJECT_REPR(gradient), vector);
+        sp_gradient_repr_set_link(gradient->getRepr(), vector);
     }
 
     switch (point_type) {
@@ -688,7 +689,7 @@ void sp_item_gradient_stop_set_style(SPItem *item, guint point_type, guint point
         {
             SPStop *first = vector->getFirstStop();
             if (first) {
-                sp_repr_css_change (SP_OBJECT_REPR (first), stop, "style");
+                sp_repr_css_change(first->getRepr(), stop, "style");
             }
         }
         break;
@@ -699,7 +700,7 @@ void sp_item_gradient_stop_set_style(SPItem *item, guint point_type, guint point
         {
             SPStop *last = sp_last_stop (vector);
             if (last) {
-                sp_repr_css_change (SP_OBJECT_REPR (last), stop, "style");
+                sp_repr_css_change(last->getRepr(), stop, "style");
             }
         }
         break;
@@ -710,7 +711,7 @@ void sp_item_gradient_stop_set_style(SPItem *item, guint point_type, guint point
         {
             SPStop *stopi = sp_get_stop_i (vector, point_i);
             if (stopi) {
-                sp_repr_css_change (SP_OBJECT_REPR (stopi), stop, "style");
+                sp_repr_css_change(stopi->getRepr(), stop, "style");
             }
         }
         break;
@@ -735,22 +736,22 @@ void sp_item_gradient_reverse_vector(SPItem *item, bool fill_or_stroke)
 
     vector = sp_gradient_fork_vector_if_necessary (vector);
     if ( gradient != vector && gradient->ref->getObject() != vector ) {
-        sp_gradient_repr_set_link(SP_OBJECT_REPR(gradient), vector);
+        sp_gradient_repr_set_link(gradient->getRepr(), vector);
     }
 
     GSList *child_reprs = NULL;
     GSList *child_objects = NULL;
     std::vector<double> offsets;
     for ( SPObject *child = vector->firstChild(); child; child = child->getNext()) {
-        child_reprs = g_slist_prepend (child_reprs, SP_OBJECT_REPR(child));
+        child_reprs = g_slist_prepend (child_reprs, child->getRepr());
         child_objects = g_slist_prepend (child_objects, child);
-        offsets.push_back(sp_repr_get_double_attribute(SP_OBJECT_REPR(child), "offset", 0));
+        offsets.push_back(sp_repr_get_double_attribute(child->getRepr(), "offset", 0));
     }
 
     GSList *child_copies = NULL;
     for (GSList *i = child_reprs; i != NULL; i = i->next) {
         Inkscape::XML::Node *repr = (Inkscape::XML::Node *) i->data;
-        Inkscape::XML::Document *xml_doc = SP_OBJECT_REPR(vector)->document();
+        Inkscape::XML::Document *xml_doc = vector->getRepr()->document();
         child_copies = g_slist_append (child_copies, repr->duplicate(xml_doc));
     }
 
@@ -796,7 +797,7 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
     p *= (gradient->gradientTransform).inverse();
     // now p is in gradient's original coordinates
 
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(gradient);
+    Inkscape::XML::Node *repr = gradient->getRepr();
 
     if (SP_IS_LINEARGRADIENT(gradient)) {
         SPLinearGradient *lg = SP_LINEARGRADIENT(gradient);
@@ -816,7 +817,7 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
                     sp_repr_set_svg_double(repr, "x1", lg->x1.computed);
                     sp_repr_set_svg_double(repr, "y1", lg->y1.computed);
                 } else {
-                    SP_OBJECT (gradient)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+                    gradient->requestModified(SP_OBJECT_MODIFIED_FLAG);
                 }
                 break;
             case POINT_LG_END:
@@ -834,7 +835,7 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
                     sp_repr_set_svg_double(repr, "x2", lg->x2.computed);
                     sp_repr_set_svg_double(repr, "y2", lg->y2.computed);
                 } else {
-                    SP_OBJECT (gradient)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+                    gradient->requestModified(SP_OBJECT_MODIFIED_FLAG);
                 }
                 break;
             case POINT_LG_MID:
@@ -847,9 +848,9 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
                 SPStop* stopi = sp_get_stop_i(vector, point_i);
                 stopi->offset = offset;
                 if (write_repr) {
-                    sp_repr_set_css_double(SP_OBJECT_REPR(stopi), "offset", stopi->offset);
+                    sp_repr_set_css_double(stopi->getRepr(), "offset", stopi->offset);
                 } else {
-                    SP_OBJECT (stopi)->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+                    stopi->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
                 }
             }
             break;
@@ -879,7 +880,7 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
                     sp_repr_set_svg_double(repr, "cx", rg->cx.computed);
                     sp_repr_set_svg_double(repr, "cy", rg->cy.computed);
                 } else {
-                    SP_OBJECT (gradient)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+                    gradient->requestModified(SP_OBJECT_MODIFIED_FLAG);
                 }
                 break;
             case POINT_RG_FOCUS:
@@ -889,7 +890,7 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
                     sp_repr_set_svg_double(repr, "fx", rg->fx.computed);
                     sp_repr_set_svg_double(repr, "fy", rg->fy.computed);
                 } else {
-                    SP_OBJECT (gradient)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+                    gradient->requestModified(SP_OBJECT_MODIFIED_FLAG);
                 }
                 break;
             case POINT_RG_R1:
@@ -941,9 +942,9 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
                 SPStop* stopi = sp_get_stop_i(vector, point_i);
                 stopi->offset = offset;
                 if (write_repr) {
-                    sp_repr_set_css_double(SP_OBJECT_REPR(stopi), "offset", stopi->offset);
+                    sp_repr_set_css_double(stopi->getRepr(), "offset", stopi->offset);
                 } else {
-                    SP_OBJECT (stopi)->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+                    stopi->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
                 }
                 break;
             }
@@ -957,9 +958,9 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
                 SPStop* stopi = sp_get_stop_i(vector, point_i);
                 stopi->offset = offset;
                 if (write_repr) {
-                    sp_repr_set_css_double(SP_OBJECT_REPR(stopi), "offset", stopi->offset);
+                    sp_repr_set_css_double(stopi->getRepr(), "offset", stopi->offset);
                 } else {
-                    SP_OBJECT (stopi)->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+                    stopi->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
                 }
                 break;
         }
@@ -969,10 +970,10 @@ void sp_item_gradient_set_coords(SPItem *item, guint point_type, guint point_i,
             gradient->gradientTransform_set = TRUE;
             if (write_repr) {
                 gchar *s=sp_svg_transform_write(gradient->gradientTransform);
-                SP_OBJECT_REPR(gradient)->setAttribute("gradientTransform", s);
+                gradient->getRepr()->setAttribute("gradientTransform", s);
                 g_free(s);
             } else {
-                SP_OBJECT (gradient)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+                gradient->requestModified(SP_OBJECT_MODIFIED_FLAG);
             }
         }
     }
@@ -1064,7 +1065,7 @@ Geom::Point sp_item_gradient_get_coords(SPItem *item, guint point_type, guint po
     }
 
     if (SP_GRADIENT(gradient)->getUnits() == SP_GRADIENT_UNITS_OBJECTBOUNDINGBOX) {
-        SP_OBJECT_DOCUMENT(item)->ensureUpToDate();
+        item->document->ensureUpToDate();
         Geom::OptRect bbox = item->getBounds(Geom::identity()); // we need "true" bbox without item_i2d_affine
         if (bbox) {
             p *= Geom::Affine(bbox->dimensions()[Geom::X], 0,
@@ -1094,7 +1095,7 @@ SPGradient *sp_item_set_gradient(SPItem *item, SPGradient *gr, SPGradientType ty
     g_return_val_if_fail(SP_IS_GRADIENT(gr), NULL);
     g_return_val_if_fail(gr->state == SP_GRADIENT_STATE_VECTOR, NULL);
 
-    SPStyle *style = SP_OBJECT_STYLE(item);
+    SPStyle *style = item->style;
     g_assert(style != NULL);
 
     SPPaintServer *ps = NULL;
@@ -1109,20 +1110,20 @@ SPGradient *sp_item_set_gradient(SPItem *item, SPGradient *gr, SPGradientType ty
         /* Current fill style is the gradient of the required type */
         SPGradient *current = SP_GRADIENT(ps);
 
-        //g_message("hrefcount %d   count %d\n", current->hrefcount, count_gradient_hrefs(SP_OBJECT(item), current));
+        //g_message("hrefcount %d   count %d\n", current->hrefcount, count_gradient_hrefs(item, current));
 
         if (!current->isSwatch()
             && (current->hrefcount == 1 ||
-            current->hrefcount == count_gradient_hrefs(SP_OBJECT(item), current))) {
+            current->hrefcount == count_gradient_hrefs(item, current))) {
 
             // current is private and it's either used once, or all its uses are by children of item;
             // so just change its href to vector
 
             if ( current != gr && current->getVector() != gr ) {
-                /* href is not the vector */
-                sp_gradient_repr_set_link(SP_OBJECT_REPR(current), gr);
+                // href is not the vector
+                sp_gradient_repr_set_link(current->getRepr(), gr);
             }
-            SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+            item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
             return current;
 
         } else {
@@ -1137,19 +1138,19 @@ SPGradient *sp_item_set_gradient(SPItem *item, SPGradient *gr, SPGradientType ty
 
                 /* We have to change object style here; recursive because this is used from
                  * fill&stroke and must work for groups etc. */
-                sp_style_set_property_url(SP_OBJECT(item), is_fill? "fill" : "stroke", SP_OBJECT(normalized), true);
+                sp_style_set_property_url(item, is_fill? "fill" : "stroke", normalized, true);
             }
-            SP_OBJECT(item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+            item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
             return normalized;
         }
 
     } else {
         /* Current fill style is not a gradient or wrong type, so construct everything */
-        SPGradient *constructed = sp_gradient_get_private_normalized(SP_OBJECT_DOCUMENT(item), gr, type);
+        SPGradient *constructed = sp_gradient_get_private_normalized(item->document, gr, type);
         constructed = sp_gradient_reset_to_userspace(constructed, item);
-        sp_style_set_property_url(SP_OBJECT(item), ( is_fill ? "fill" : "stroke" ), SP_OBJECT(constructed), true);
-        SP_OBJECT(item)->requestDisplayUpdate(( SP_OBJECT_MODIFIED_FLAG |
-                                                SP_OBJECT_STYLE_MODIFIED_FLAG ));
+        sp_style_set_property_url(item, ( is_fill ? "fill" : "stroke" ), constructed, true);
+        item->requestDisplayUpdate(( SP_OBJECT_MODIFIED_FLAG |
+                                     SP_OBJECT_STYLE_MODIFIED_FLAG ));
         return constructed;
     }
 }
@@ -1216,7 +1217,7 @@ SPGradient *sp_document_default_gradient_vector( SPDocument *document, SPColor c
         addStop( repr, colorStr, 0, "1" );
     }
 
-    SP_OBJECT_REPR(defs)->addChild(repr, NULL);
+    defs->getRepr()->addChild(repr, NULL);
     Inkscape::GC::release(repr);
 
     /* fixme: This does not look like nice */
@@ -1237,11 +1238,11 @@ SPGradient *sp_gradient_vector_for_object( SPDocument *const doc, SPDesktop *con
                                            SPObject *const o, bool const is_fill, bool singleStop )
 {
     SPColor color;
-    if (o == NULL || SP_OBJECT_STYLE(o) == NULL) {
+    if ( (o == NULL) || (o->style == NULL) ) {
         color = sp_desktop_get_color(desktop, is_fill);
     } else {
         // take the color of the object
-        SPStyle const &style = *SP_OBJECT_STYLE(o);
+        SPStyle const &style = *(o->style);
         SPIPaint const &paint = ( is_fill
                                   ? style.fill
                                   : style.stroke );
diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp
index d37e9b022..b98ae09fc 100644
--- a/src/gradient-context.cpp
+++ b/src/gradient-context.cpp
@@ -377,9 +377,9 @@ sp_gradient_context_add_stops_between_selected_stops (SPGradientContext *rc)
         SPStop *this_stop = (SPStop *) i->data;
         SPStop *next_stop = (SPStop *) j->data;
         gfloat offset = 0.5*(this_stop->offset + next_stop->offset);
-        SPObject *parent = SP_OBJECT_PARENT(this_stop);
+        SPObject *parent = this_stop->parent;
         if (SP_IS_GRADIENT (parent)) {
-            doc = SP_OBJECT_DOCUMENT (parent);
+            doc = parent->document;
             sp_vector_add_stop (SP_GRADIENT (parent), this_stop, next_stop, offset);
             SP_GRADIENT(parent)->ensureVector();
         }
@@ -448,9 +448,9 @@ sp_gradient_simplify(SPGradientContext *rc, double tolerance)
 
     for (i = todel; i != NULL; i = i->next) {
         SPStop *stop = (SPStop*) i->data;
-        doc = SP_OBJECT_DOCUMENT (stop);
-        Inkscape::XML::Node * parent = SP_OBJECT_REPR(stop)->parent();
-        parent->removeChild(SP_OBJECT_REPR(stop));
+        doc = stop->document;
+        Inkscape::XML::Node * parent = stop->getRepr()->parent();
+        parent->removeChild( stop->getRepr() );
     }
 
     if (g_slist_length(todel) > 0) {
@@ -524,7 +524,7 @@ sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event)
                     SPGradientType new_type = (SPGradientType) prefs->getInt("/tools/gradient/newgradient", SP_GRADIENT_TYPE_LINEAR);
                     guint new_fill = prefs->getInt("/tools/gradient/newfillorstroke", 1);
 
-                    SPGradient *vector = sp_gradient_vector_for_object(sp_desktop_document(desktop), desktop,                                                                                   SP_OBJECT (item), new_fill);
+                    SPGradient *vector = sp_gradient_vector_for_object(sp_desktop_document(desktop), desktop, item, new_fill);
 
                     SPGradient *priv = sp_item_set_gradient(item, vector, new_type, new_fill);
                     sp_gradient_reset_to_userspace(priv, item);
@@ -902,7 +902,7 @@ static void sp_gradient_drag(SPGradientContext &rc, Geom::Point const pt, guint
         for (GSList const *i = selection->itemList(); i != NULL; i = i->next) {
 
             //FIXME: see above
-            sp_repr_css_change_recursive(SP_OBJECT_REPR(i->data), css, "style");
+            sp_repr_css_change_recursive(SP_OBJECT(i->data)->getRepr(), css, "style");
 
             sp_item_set_gradient(SP_ITEM(i->data), vector, (SPGradientType) type, fill_or_stroke);
 
@@ -913,7 +913,7 @@ static void sp_gradient_drag(SPGradientContext &rc, Geom::Point const pt, guint
                 sp_item_gradient_set_coords (SP_ITEM(i->data), POINT_RG_CENTER, 0, rc.origin, fill_or_stroke, true, false);
                 sp_item_gradient_set_coords (SP_ITEM(i->data), POINT_RG_R1, 0, pt, fill_or_stroke, true, false);
             }
-            SP_OBJECT (i->data)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            SP_OBJECT(i->data)->requestModified(SP_OBJECT_MODIFIED_FLAG);
         }
         if (ec->_grdrag) {
             ec->_grdrag->updateDraggers();
diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index fe8297286..8f7effe43 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -450,7 +450,7 @@ GrDrag::dropColor(SPItem */*item*/, gchar const *c, Geom::Point p)
                     SPCSSAttr *css = sp_repr_css_attr_new ();
                     sp_repr_css_set_property( css, "stop-color", stopIsNull ? 0 : toUse.c_str() );
                     sp_repr_css_set_property( css, "stop-opacity", "1" );
-                    sp_repr_css_change (SP_OBJECT_REPR (stop), css, "style");
+                    sp_repr_css_change(stop->getRepr(), css, "style");
                     return true;
                 }
             }
@@ -960,7 +960,7 @@ gr_knot_clicked_handler(SPKnot */*knot*/, guint state, gpointer data)
                     SPStop *next = stop->getNextStop();
                     if (next) {
                         next->offset = 0;
-                        sp_repr_set_css_double (SP_OBJECT_REPR (next), "offset", 0);
+                        sp_repr_set_css_double(next->getRepr(), "offset", 0);
                     }
                 }
                 break;
@@ -972,7 +972,7 @@ gr_knot_clicked_handler(SPKnot */*knot*/, guint state, gpointer data)
                     SPStop *prev = stop->getPrevStop();
                     if (prev) {
                         prev->offset = 1;
-                        sp_repr_set_css_double (SP_OBJECT_REPR (prev), "offset", 1);
+                        sp_repr_set_css_double(prev->getRepr(), "offset", 1);
                     }
                 }
                 break;
@@ -983,8 +983,8 @@ gr_knot_clicked_handler(SPKnot */*knot*/, guint state, gpointer data)
                 break;
             }
 
-            SP_OBJECT_REPR(gradient)->removeChild(SP_OBJECT_REPR(stop));
-            DocumentUndo::done(SP_OBJECT_DOCUMENT (gradient), SP_VERB_CONTEXT_GRADIENT,
+            gradient->getRepr()->removeChild(stop->getRepr());
+            DocumentUndo::done(gradient->document, SP_VERB_CONTEXT_GRADIENT,
                                _("Delete gradient stop"));
         }
     } else {
@@ -1745,7 +1745,7 @@ GrDrag::updateLines ()
 
         SPItem *item = SP_ITEM(i->data);
 
-        SPStyle *style = SP_OBJECT_STYLE (item);
+        SPStyle *style = item->style;
 
         if (style && (style->fill.isPaintserver())) {
             SPPaintServer *server = item->style->getFillPaintServer();
@@ -2038,14 +2038,14 @@ GrDrag::deleteSelected (bool just_one)
     }
     while (midstoplist) {
         SPStop *stop = (SPStop*) midstoplist->data;
-        document = SP_OBJECT_DOCUMENT (stop);
-        Inkscape::XML::Node * parent = SP_OBJECT_REPR(stop)->parent();
-        parent->removeChild(SP_OBJECT_REPR(stop));
+        document = stop->document;
+        Inkscape::XML::Node * parent = stop->getRepr()->parent();
+        parent->removeChild(stop->getRepr());
         midstoplist = g_slist_remove(midstoplist, stop);
     }
     while (endstoplist) {
         StructStopInfo *stopinfo  = (StructStopInfo*) endstoplist->data;
-        document = SP_OBJECT_DOCUMENT (stopinfo->spstop);
+        document = stopinfo->spstop->document;
 
         // 2 is the minimum, cannot delete more than that without deleting the whole vector
         // cannot use vector->vector.stops.size() because the vector might be invalidated by deletion of a midstop
@@ -2062,7 +2062,7 @@ GrDrag::deleteSelected (bool just_one)
             switch (stopinfo->draggable->point_type) {
                 case POINT_LG_BEGIN:
                     {
-                        SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+                        stopinfo->vector->getRepr()->removeChild(stopinfo->spstop->getRepr());
 
                         SPLinearGradient *lg = SP_LINEARGRADIENT(stopinfo->gradient);
                         Geom::Point oldbegin = Geom::Point (lg->x1.computed, lg->y1.computed);
@@ -2073,25 +2073,25 @@ GrDrag::deleteSelected (bool just_one)
                         lg->x1.computed = newbegin[Geom::X];
                         lg->y1.computed = newbegin[Geom::Y];
 
-                        Inkscape::XML::Node *repr = SP_OBJECT_REPR(stopinfo->gradient);
+                        Inkscape::XML::Node *repr = stopinfo->gradient->getRepr();
                         sp_repr_set_svg_double(repr, "x1", lg->x1.computed);
                         sp_repr_set_svg_double(repr, "y1", lg->y1.computed);
                         stop->offset = 0;
-                        sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", 0);
+                        sp_repr_set_css_double(stop->getRepr(), "offset", 0);
 
                         // iterate through midstops to set new offset values such that they won't move on canvas.
                         SPStop *laststop = sp_last_stop(stopinfo->vector);
                         stop = stop->getNextStop();
                         while ( stop != laststop ) {
                             stop->offset = (stop->offset - offset)/(1 - offset);
-                            sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", stop->offset);
+                            sp_repr_set_css_double(stop->getRepr(), "offset", stop->offset);
                             stop = stop->getNextStop();
                         }
                     }
                     break;
                 case POINT_LG_END:
                     {
-                        SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+                        stopinfo->vector->getRepr()->removeChild(stopinfo->spstop->getRepr());
 
                         SPLinearGradient *lg = SP_LINEARGRADIENT(stopinfo->gradient);
                         Geom::Point begin = Geom::Point (lg->x1.computed, lg->y1.computed);
@@ -2102,18 +2102,18 @@ GrDrag::deleteSelected (bool just_one)
                         lg->x2.computed = newend[Geom::X];
                         lg->y2.computed = newend[Geom::Y];
 
-                        Inkscape::XML::Node *repr = SP_OBJECT_REPR(stopinfo->gradient);
+                        Inkscape::XML::Node *repr = stopinfo->gradient->getRepr();
                         sp_repr_set_svg_double(repr, "x2", lg->x2.computed);
                         sp_repr_set_svg_double(repr, "y2", lg->y2.computed);
                         laststop->offset = 1;
-                        sp_repr_set_css_double (SP_OBJECT_REPR (laststop), "offset", 1);
+                        sp_repr_set_css_double(laststop->getRepr(), "offset", 1);
 
                         // iterate through midstops to set new offset values such that they won't move on canvas.
                         SPStop *stop = stopinfo->vector->getFirstStop();
                         stop = stop->getNextStop();
                         while ( stop != laststop ) {
                             stop->offset = stop->offset / offset;
-                            sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", stop->offset);
+                            sp_repr_set_css_double(stop->getRepr(), "offset", stop->offset);
                             stop = stop->getNextStop();
                         }
                     }
@@ -2123,14 +2123,14 @@ GrDrag::deleteSelected (bool just_one)
                         SPStop *newfirst = stopinfo->spstop->getNextStop();
                         if (newfirst) {
                             newfirst->offset = 0;
-                            sp_repr_set_css_double (SP_OBJECT_REPR (newfirst), "offset", 0);
+                            sp_repr_set_css_double(newfirst->getRepr(), "offset", 0);
                         }
-                        SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+                        stopinfo->vector->getRepr()->removeChild(stopinfo->spstop->getRepr());
                     }
                     break;
                 case POINT_RG_R1:
                 case POINT_RG_R2:
-                        SP_OBJECT_REPR(stopinfo->vector)->removeChild(SP_OBJECT_REPR(stopinfo->spstop));
+                    stopinfo->vector->getRepr()->removeChild(stopinfo->spstop->getRepr());
 
                         SPRadialGradient *rg = SP_RADIALGRADIENT(stopinfo->gradient);
                         double oldradius = rg->r.computed;
@@ -2139,17 +2139,17 @@ GrDrag::deleteSelected (bool just_one)
                         double newradius = offset * oldradius;
                         rg->r.computed = newradius;
 
-                        Inkscape::XML::Node *repr = SP_OBJECT_REPR(rg);
+                        Inkscape::XML::Node *repr = rg->getRepr();
                         sp_repr_set_svg_double(repr, "r", rg->r.computed);
                         laststop->offset = 1;
-                        sp_repr_set_css_double (SP_OBJECT_REPR (laststop), "offset", 1);
+                        sp_repr_set_css_double(laststop->getRepr(), "offset", 1);
 
                         // iterate through midstops to set new offset values such that they won't move on canvas.
                         SPStop *stop = stopinfo->vector->getFirstStop();
                         stop = stop->getNextStop();
                         while ( stop != laststop ) {
                             stop->offset = stop->offset / offset;
-                            sp_repr_set_css_double (SP_OBJECT_REPR (stop), "offset", stop->offset);
+                            sp_repr_set_css_double(stop->getRepr(), "offset", stop->offset);
                             stop = stop->getNextStop();
                         }
                         break;
@@ -2160,8 +2160,8 @@ GrDrag::deleteSelected (bool just_one)
             SPCSSAttr *css = sp_repr_css_attr_new ();
 
             // stopinfo->spstop is the selected stop
-            Inkscape::XML::Node *unselectedrepr = SP_OBJECT_REPR(stopinfo->vector)->firstChild();
-            if (unselectedrepr == SP_OBJECT_REPR(stopinfo->spstop) ) {
+            Inkscape::XML::Node *unselectedrepr = stopinfo->vector->getRepr()->firstChild();
+            if (unselectedrepr == stopinfo->spstop->getRepr() ) {
                 unselectedrepr = unselectedrepr->next();
             }
 
@@ -2183,7 +2183,7 @@ GrDrag::deleteSelected (bool just_one)
                 sp_repr_css_attr_unref (stopcss);
             }
 
-            sp_repr_css_change (SP_OBJECT_REPR (stopinfo->draggable->item), css, "style");
+            sp_repr_css_change(stopinfo->draggable->item->getRepr(), css, "style");
             sp_repr_css_attr_unref (css);
         }
 
diff --git a/src/sp-root.cpp b/src/sp-root.cpp
index 61b5fda5b..5b0bf4cde 100644
--- a/src/sp-root.cpp
+++ b/src/sp-root.cpp
@@ -567,7 +567,7 @@ sp_root_modified(SPObject *object, guint flags)
 
     /* fixme: (Lauris) */
     if (!object->parent && (flags & SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
-        SP_OBJECT_DOCUMENT(root)->emitResizedSignal(root->width.computed, root->height.computed);
+        root->document->emitResizedSignal(root->width.computed, root->height.computed);
     }
 }