Finished cleanup of outdated SP_OBJECT_REPR C macro.

(bzr r10067)

13 files changed, 100 insertions, 76 deletions

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 1b98d7474..4f4f8a022 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -82,6 +82,7 @@
 #include "svg/svg-color.h"
 #include "sp-namedview.h"
 #include "snap.h"
+#include "persp3d.h"
 
 /// @brief Made up mimetype to represent Gdk::Pixbuf clipboard contents
 #define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
@@ -602,7 +603,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
         if (!SP_IS_ITEM(i->data)) {
             continue;
         }
-        Inkscape::XML::Node *obj = SP_OBJECT_REPR(i->data);
+        Inkscape::XML::Node *obj = reinterpret_cast<SPObject *>(i->data)->getRepr();
         Inkscape::XML::Node *obj_copy = _copyNode(obj, _doc, _root);
 
         // copy complete inherited style
@@ -628,7 +629,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
         // copy path effect from the first path
         if (SP_IS_OBJECT(sorted_items->data)) {
-            gchar const *effect = SP_OBJECT_REPR(sorted_items->data)->attribute("inkscape:path-effect");
+            gchar const *effect = reinterpret_cast<SPObject *>(sorted_items->data)->getRepr()->attribute("inkscape:path-effect");
             if (effect) {
                 _clipnode->setAttribute("inkscape:path-effect", effect);
             }
@@ -677,7 +678,7 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
         SPShape *shape = SP_SHAPE (item);
         for (int i = 0 ; i < SP_MARKER_LOC_QTY ; i++) {
             if (shape->marker[i]) {
-                _copyNode(SP_OBJECT_REPR(SP_OBJECT(shape->marker[i])), _doc, _defs);
+                _copyNode(shape->marker[i]->getRepr(), _doc, _defs);
             }
         }
     }
@@ -689,14 +690,14 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
             {
                 LivePathEffectObject *lpeobj = (*it)->lpeobject;
                 if (lpeobj) {
-                    _copyNode(SP_OBJECT_REPR(SP_OBJECT(lpeobj)), _doc, _defs);
+                    _copyNode(lpeobj->getRepr(), _doc, _defs);
                 }
             }
         }
     }
     // For 3D boxes, copy perspectives
     if (SP_IS_BOX3D(item)) {
-        _copyNode(SP_OBJECT_REPR(SP_OBJECT(box3d_get_perspective(SP_BOX3D(item)))), _doc, _defs);
+        _copyNode(box3d_get_perspective(SP_BOX3D(item))->getRepr(), _doc, _defs);
     }
     // Copy text paths
     if (SP_IS_TEXT_TEXTPATH(item)) {
@@ -704,14 +705,14 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
     }
     // Copy clipping objects
     if (item->clip_ref->getObject()) {
-        _copyNode(SP_OBJECT_REPR(item->clip_ref->getObject()), _doc, _defs);
+        _copyNode(item->clip_ref->getObject()->getRepr(), _doc, _defs);
     }
     // Copy mask objects
     if (item->mask_ref->getObject()) {
         SPObject *mask = item->mask_ref->getObject();
-        _copyNode(SP_OBJECT_REPR(mask), _doc, _defs);
+        _copyNode(mask->getRepr(), _doc, _defs);
         // recurse into the mask for its gradients etc.
-        for (SPObject *o = SP_OBJECT(mask)->children ; o != NULL ; o = o->next) {
+        for (SPObject *o = mask->children ; o != NULL ; o = o->next) {
             if (SP_IS_ITEM(o)) {
                 _copyUsedDefs(SP_ITEM(o));
             }
@@ -721,12 +722,12 @@ void ClipboardManagerImpl::_copyUsedDefs(SPItem *item)
     if (style->getFilter()) {
         SPObject *filter = style->getFilter();
         if (SP_IS_FILTER(filter)) {
-            _copyNode(SP_OBJECT_REPR(filter), _doc, _defs);
+            _copyNode(filter->getRepr(), _doc, _defs);
         }
     }
 
     // recurse
-    for (SPObject *o = SP_OBJECT(item)->children ; o != NULL ; o = o->next) {
+    for (SPObject *o = item->children ; o != NULL ; o = o->next) {
         if (SP_IS_ITEM(o)) {
             _copyUsedDefs(SP_ITEM(o));
         }
@@ -741,7 +742,7 @@ void ClipboardManagerImpl::_copyGradient(SPGradient *gradient)
 {
     while (gradient) {
         // climb up the refs, copying each one in the chain
-        _copyNode(SP_OBJECT_REPR(gradient), _doc, _defs);
+        _copyNode(gradient->getRepr(), _doc, _defs);
         gradient = gradient->ref->getObject();
     }
 }
@@ -754,7 +755,7 @@ void ClipboardManagerImpl::_copyPattern(SPPattern *pattern)
 {
     // climb up the references, copying each one in the chain
     while (pattern) {
-        _copyNode(SP_OBJECT_REPR(pattern), _doc, _defs);
+        _copyNode(pattern->getRepr(), _doc, _defs);
 
         // items in the pattern may also use gradients and other patterns, so recurse
         for ( SPObject *child = pattern->firstChild() ; child ; child = child->getNext() ) {
@@ -777,7 +778,7 @@ void ClipboardManagerImpl::_copyTextPath(SPTextPath *tp)
     if (!path) {
         return;
     }
-    Inkscape::XML::Node *path_node = SP_OBJECT_REPR(path);
+    Inkscape::XML::Node *path_node = path->getRepr();
 
     // Do not copy the text path to defs if it's already copied
     if (sp_repr_lookup_child(_root, "id", path_node->attribute("id"))) {
@@ -813,7 +814,7 @@ void ClipboardManagerImpl::_pasteDocument(SPDesktop *desktop, SPDocument *clipdo
 {
     SPDocument *target_document = sp_desktop_document(desktop);
     Inkscape::XML::Node *root = clipdoc->getReprRoot();
-    Inkscape::XML::Node *target_parent = SP_OBJECT_REPR(desktop->currentLayer());
+    Inkscape::XML::Node *target_parent = desktop->currentLayer()->getRepr();
     Inkscape::XML::Document *target_xmldoc = target_document->getReprDoc();
 
     // copy definitions
@@ -893,7 +894,7 @@ void ClipboardManagerImpl::_pasteDefs(SPDesktop *desktop, SPDocument *clipdoc)
     SPDocument *target_document = sp_desktop_document(desktop);
     Inkscape::XML::Node *root = clipdoc->getReprRoot();
     Inkscape::XML::Node *defs = sp_repr_lookup_name(root, "svg:defs", 1);
-    Inkscape::XML::Node *target_defs = SP_OBJECT_REPR(SP_DOCUMENT_DEFS(target_document));
+    Inkscape::XML::Node *target_defs = SP_DOCUMENT_DEFS(target_document)->getRepr();
     Inkscape::XML::Document *target_xmldoc = target_document->getReprDoc();
 
     prevent_id_clashes(clipdoc, target_document);
@@ -1253,7 +1254,7 @@ void ClipboardManagerImpl::_createInternalClipboard()
     if ( _clipboardSPDoc == NULL ) {
         _clipboardSPDoc = SPDocument::createNewDoc(NULL, false, true);
         //g_assert( _clipboardSPDoc != NULL );
-        _defs = SP_OBJECT_REPR(SP_DOCUMENT_DEFS(_clipboardSPDoc));
+        _defs = SP_DOCUMENT_DEFS(_clipboardSPDoc)->getRepr();
         _doc = _clipboardSPDoc->getReprDoc();
         _root = _clipboardSPDoc->getReprRoot();
 
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index a8a0fa191..08479275b 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -85,7 +85,7 @@ DocumentMetadata::init()
 {
     update();
 
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop()));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
     repr->addListener (&_repr_events, this);
 
     show_all_children();
@@ -93,7 +93,7 @@ DocumentMetadata::init()
 
 DocumentMetadata::~DocumentMetadata()
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop()));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
     repr->removeListenerByData (this);
 
     for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); it++)
@@ -211,7 +211,7 @@ DocumentMetadata::update()
 void 
 DocumentMetadata::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *)
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->addListener (&_repr_events, this);
     update();
 }
@@ -219,7 +219,7 @@ DocumentMetadata::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *)
 void 
 DocumentMetadata::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->addListener(&_repr_events, this);
     update();
 }
@@ -227,7 +227,7 @@ DocumentMetadata::_handleActivateDesktop(Inkscape::Application *, SPDesktop *des
 void
 DocumentMetadata::_handleDeactivateDesktop(Inkscape::Application *, SPDesktop *desktop)
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->removeListenerByData(this);
 }
 
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 16212bef7..0c001da4b 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -143,9 +143,9 @@ DocumentProperties::init()
 {
     update();
 
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop()));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
     repr->addListener (&_repr_events, this);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(getDesktop())->root);
+    Inkscape::XML::Node *root = sp_desktop_document(getDesktop())->root->getRepr();
     root->addListener (&_repr_events, this);
 
     show_all_children();
@@ -154,9 +154,9 @@ DocumentProperties::init()
 
 DocumentProperties::~DocumentProperties()
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(getDesktop()));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
     repr->removeListenerByData (this);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(getDesktop())->root);
+    Inkscape::XML::Node *root = sp_desktop_document(getDesktop())->root->getRepr();
     root->removeListenerByData (this);
 }
 
@@ -439,7 +439,9 @@ DocumentProperties::populate_linked_profiles_box()
 {
     _LinkedProfilesListStore->clear();
     const GSList *current = SP_ACTIVE_DOCUMENT->getResourceList( "iccprofile" );
-    if (current) _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
+    if (current) {
+        _emb_profiles_observer.set(SP_OBJECT(current->data)->parent);
+    }
     while ( current ) {
         SPObject* obj = SP_OBJECT(current->data);
         Inkscape::ColorProfile* prof = reinterpret_cast<Inkscape::ColorProfile*>(obj);
@@ -807,7 +809,7 @@ DocumentProperties::update()
     double const doc_w_px = sp_desktop_document(dt)->getWidth();
     double const doc_h_px = sp_desktop_document(dt)->getHeight();
     _page_sizer.setDim (doc_w_px, doc_h_px);
-    _page_sizer.updateFitMarginsUI(SP_OBJECT_REPR(nv));
+    _page_sizer.updateFitMarginsUI(nv->getRepr());
 
     //-----------------------------------------------------------guide page
 
@@ -873,9 +875,9 @@ DocumentProperties::on_response (int id)
 void
 DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *document)
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->addListener(&_repr_events, this);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(document->root);
+    Inkscape::XML::Node *root = document->root->getRepr();
     root->addListener(&_repr_events, this);
     update();
 }
@@ -883,9 +885,9 @@ DocumentProperties::_handleDocumentReplaced(SPDesktop* desktop, SPDocument *docu
 void
 DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *desktop)
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->addListener(&_repr_events, this);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(desktop)->root);
+    Inkscape::XML::Node *root = sp_desktop_document(desktop)->root->getRepr();
     root->addListener(&_repr_events, this);
     update();
 }
@@ -893,9 +895,9 @@ DocumentProperties::_handleActivateDesktop(Inkscape::Application *, SPDesktop *d
 void
 DocumentProperties::_handleDeactivateDesktop(Inkscape::Application *, SPDesktop *desktop)
 {
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(desktop));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(desktop)->getRepr();
     repr->removeListenerByData(this);
-    Inkscape::XML::Node *root = SP_OBJECT_REPR(sp_desktop_document(desktop)->root);
+    Inkscape::XML::Node *root = sp_desktop_document(desktop)->root->getRepr();
     root->removeListenerByData(this);
 }
 
@@ -934,7 +936,7 @@ void
 DocumentProperties::onNewGrid()
 {
     SPDesktop *dt = getDesktop();
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(dt)->getRepr();
     SPDocument *doc = sp_desktop_document(dt);
 
     Glib::ustring typestring = _grids_combo_gridtype.get_active_text();
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index b6d6a0319..bdae14c62 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -142,15 +142,18 @@ Find::~Find()
 bool
 Find::item_id_match (SPItem *item, const gchar *id, bool exact)
 {
-    if (SP_OBJECT_REPR (item) == NULL)
+    if (item->getRepr() == NULL) {
         return false;
+    }
 
-    if (SP_IS_STRING(item)) // SPStrings have "on demand" ids which are useless for searching
+    if (SP_IS_STRING(item)) { // SPStrings have "on demand" ids which are useless for searching
         return false;
+    }
 
-    const gchar *item_id = (SP_OBJECT_REPR (item))->attribute("id");
-    if (item_id == NULL)
+    const gchar *item_id = item->getRepr()->attribute("id");
+    if (item_id == NULL) {
         return false;
+    }
 
     if (exact) {
         return ((bool) !strcmp(item_id, id));
@@ -163,8 +166,9 @@ Find::item_id_match (SPItem *item, const gchar *id, bool exact)
 bool
 Find::item_text_match (SPItem *item, const gchar *text, bool exact)
 {
-    if (SP_OBJECT_REPR (item) == NULL)
+    if (item->getRepr() == NULL) {
         return false;
+    }
 
     if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) {
         const gchar *item_text = sp_te_get_string_multiline (item);
@@ -186,12 +190,14 @@ Find::item_text_match (SPItem *item, const gchar *text, bool exact)
 bool
 Find::item_style_match (SPItem *item, const gchar *text, bool exact)
 {
-    if (SP_OBJECT_REPR (item) == NULL)
+    if (item->getRepr() == NULL) {
         return false;
+    }
 
-    const gchar *item_text = (SP_OBJECT_REPR (item))->attribute("style");
-    if (item_text == NULL)
+    const gchar *item_text = item->getRepr()->attribute("style");
+    if (item_text == NULL) {
         return false;
+    }
 
     if (exact) {
         return ((bool) !strcmp(item_text, text));
@@ -200,18 +206,18 @@ Find::item_style_match (SPItem *item, const gchar *text, bool exact)
     }
 }
 
-bool
-Find::item_attr_match (SPItem *item, const gchar *name, bool exact)
+bool Find::item_attr_match(SPItem *item, const gchar *name, bool exact)
 {
-    if (SP_OBJECT_REPR (item) == NULL)
-        return false;
-
-    if (exact) {
-        const gchar *attr_value = (SP_OBJECT_REPR (item))->attribute(name);
-        return ((bool) (attr_value != NULL));
-    } else {
-        return SP_OBJECT_REPR (item)->matchAttributeName(name);
+    bool result = false;
+    if (item->getRepr()) {
+        if (exact) {
+            const gchar *attr_value = item->getRepr()->attribute(name);
+            result =  (attr_value != NULL);
+        } else {
+            result = item->getRepr()->matchAttributeName(name);
+        }
     }
+    return result;
 }
 
 
@@ -342,17 +348,20 @@ Find::all_items (SPObject *r, GSList *l, bool hidden, bool locked)
 {
     SPDesktop *desktop = getDesktop();
 
-    if (SP_IS_DEFS(r))
+    if (SP_IS_DEFS(r)) {
         return l; // we're not interested in items in defs
+    }
 
-    if (!strcmp (SP_OBJECT_REPR (r)->name(), "svg:metadata"))
+    if (!strcmp(r->getRepr()->name(), "svg:metadata")) {
         return l; // we're not interested in metadata
+    }
 
     for (SPObject *child = r->firstChild(); child; child = child->getNext()) {
-        if (SP_IS_ITEM (child) && !SP_OBJECT_IS_CLONED (child) && !desktop->isLayer(SP_ITEM(child))) {
-                if ((hidden || !desktop->itemIsHidden(SP_ITEM(child))) && (locked || !SP_ITEM(child)->isLocked())) {
-                    l = g_slist_prepend (l, child);
-                }
+        if (SP_IS_ITEM(child) && !child->cloned && !desktop->isLayer(SP_ITEM(child))) {
+            SPItem *item = reinterpret_cast<SPItem *>(child);
+            if ((hidden || !desktop->itemIsHidden(item)) && (locked || !item->isLocked())) {
+                l = g_slist_prepend (l, child);
+            }
         }
         l = all_items (child, l, hidden, locked);
     }
@@ -365,9 +374,10 @@ Find::all_selection_items (Inkscape::Selection *s, GSList *l, SPObject *ancestor
     SPDesktop *desktop = getDesktop();
 
     for (GSList *i = (GSList *) s->itemList(); i != NULL; i = i->next) {
-        if (SP_IS_ITEM (i->data) && !SP_OBJECT_IS_CLONED (i->data) && !desktop->isLayer(SP_ITEM(i->data))) {
-            if (!ancestor || ancestor->isAncestorOf(SP_OBJECT (i->data))) {
-                if ((hidden || !desktop->itemIsHidden(SP_ITEM(i->data))) && (locked || !SP_ITEM(i->data)->isLocked())) {
+        if (SP_IS_ITEM (i->data) && !reinterpret_cast<SPItem *>(i->data)->cloned && !desktop->isLayer(SP_ITEM(i->data))) {
+            SPItem *item = reinterpret_cast<SPItem *>(i->data);
+            if (!ancestor || ancestor->isAncestorOf(item)) {
+                if ((hidden || !desktop->itemIsHidden(item)) && (locked || !item->isLocked())) {
                     l = g_slist_prepend (l, i->data);
                 }
             }
@@ -524,3 +534,14 @@ Find::squeeze_window()
 } // namespace UI
 } // namespace Inkscape
 
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index a7f914327..2d1b5ae39 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -114,7 +114,7 @@ void SvgFontsDialog::AttrEntry::on_attr_changed(){
 
     const gchar* name = (const gchar*)sp_attribute_name(this->attr);
     if(name && o) {
-        SP_OBJECT_REPR(o)->setAttribute((const gchar*) name, this->entry.get_text().c_str());
+        o->getRepr()->setAttribute((const gchar*) name, this->entry.get_text().c_str());
         o->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
 
         Glib::ustring undokey = "svgfonts:";
@@ -438,7 +438,7 @@ SPGlyph *new_glyph(SPDocument* document, SPFont *font, const int count)
     repr->setAttribute("glyph-name", os.str().c_str());
 
     // Append the new glyph node to the current font
-    SP_OBJECT_REPR(font)->appendChild(repr);
+    font->getRepr()->appendChild(repr);
     Inkscape::GC::release(repr);
 
     // get corresponding object
@@ -732,7 +732,7 @@ void SvgFontsDialog::add_kerning_pair(){
     repr->setAttribute("k", "0");
 
     // Append the new hkern node to the current font
-    SP_OBJECT_REPR(get_selected_spfont())->appendChild(repr);
+    get_selected_spfont()->getRepr()->appendChild(repr);
     Inkscape::GC::release(repr);
 
     // get corresponding object
@@ -797,7 +797,7 @@ SPFont *new_font(SPDocument *document)
     repr->setAttribute("horiz-adv-x", "1024");
 
     // Append the new font node to defs
-    SP_OBJECT_REPR(defs)->appendChild(repr);
+    defs->getRepr()->appendChild(repr);
 
     //create a missing glyph
     Inkscape::XML::Node *fontface;
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 8ae81d528..b0a39bd0e 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -316,7 +316,7 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
 
              for (; current_row != NULL; current_row = current_row->next) {
                  SPItem *item=SP_ITEM(current_row->data);
-                 Inkscape::XML::Node *repr = SP_OBJECT_REPR(item);
+                 Inkscape::XML::Node *repr = item->getRepr();
                  Geom::OptRect b = item->getBounds(item->i2doc_affine());
                  Geom::Point min;
                  if (b) {
diff --git a/src/ui/widget/attr-widget.h b/src/ui/widget/attr-widget.h
index b9924a2ef..7b9c35ab7 100644
--- a/src/ui/widget/attr-widget.h
+++ b/src/ui/widget/attr-widget.h
@@ -149,7 +149,7 @@ protected:
     {
         const gchar* name = (const gchar*)sp_attribute_name(_attr);
         if(name && o) {
-            const gchar* val = SP_OBJECT_REPR(o)->attribute(name);
+            const gchar* val = o->getRepr()->attribute(name);
             return val;
         }
         return 0;
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index f7cb6f145..f306b9eea 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -422,7 +422,7 @@ PageSizer::setDim (double w, double h, bool changeList)
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
         Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
-		SP_GROUP(SP_ROOT(doc->root))->translateChildItems(vert_offset);
+        SP_GROUP(SP_ROOT(doc->root))->translateChildItems(vert_offset);
         DocumentUndo::done(doc, SP_VERB_NONE, _("Set page size"));
     }
 
@@ -538,8 +538,8 @@ PageSizer::fire_fit_canvas_to_selection_or_drawing()
     SPNamedView *nv;
     Inkscape::XML::Node *nv_repr;
     if ((doc = sp_desktop_document(SP_ACTIVE_DESKTOP))
-            && (nv = sp_document_namedview(doc, 0))
-            && (nv_repr = SP_OBJECT_REPR(nv))) {
+        && (nv = sp_document_namedview(doc, 0))
+        && (nv_repr = nv->getRepr())) {
         sp_repr_set_svg_double(nv_repr, "fit-margin-top", _marginTop.getValue());
         sp_repr_set_svg_double(nv_repr, "fit-margin-left", _marginLeft.getValue());
         sp_repr_set_svg_double(nv_repr, "fit-margin-right", _marginRight.getValue());
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index c68e8348b..c2580013a 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -344,7 +344,7 @@ RegisteredColorPicker::on_changed (guint32 rgba)
         SPDesktop *dt = SP_ACTIVE_DESKTOP;
         if (!dt)
             return;
-        local_repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
+        local_repr = sp_desktop_namedview(dt)->getRepr();
         local_doc = sp_desktop_document(dt);
     }
 
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index 9c3ecb5e6..560c63dd4 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -101,7 +101,7 @@ protected:
         if (!local_repr) {
             // no repr specified, use active desktop's namedview's repr
             SPDesktop* dt = SP_ACTIVE_DESKTOP;
-            local_repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
+            local_repr = reinterpret_cast<SPObject *>(sp_desktop_namedview(dt))->getRepr();
             local_doc = sp_desktop_document(dt);
         }
 
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index 1a6455ca0..a220a54ad 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -102,7 +102,7 @@ Ruler::on_button_press_event(GdkEventButton *evb)
 {
     g_assert(_dt);
     Geom::Point const &event_dt = get_event_dt();
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR(_dt->namedview);
+    Inkscape::XML::Node *repr = _dt->namedview->getRepr();
 
     if (evb->button == 1) {
         _dragging = true;
@@ -153,7 +153,7 @@ Ruler::on_button_release_event(GdkEventButton *evb)
             repr->setAttribute("orientation", _horiz_f ? "horizontal" : "vertical");
             double const guide_pos_dt = event_dt[ _horiz_f ? Geom::Y : Geom::X ];
             sp_repr_set_svg_double(repr, "position", guide_pos_dt);
-            SP_OBJECT_REPR(_dt->namedview)->appendChild(repr);
+            _dt->namedview->getRepr()->appendChild(repr);
             Inkscape::GC::release(repr);
             DocumentUndo::done(sp_desktop_document(_dt), SP_VERB_NONE, 
                                /* TODO: annotate */ "ruler.cpp:157");
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index e7d8ac5a3..50476dc65 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -950,7 +950,7 @@ SelectedStyle::update()
             if (paint->set && paint->isPaintserver()) {
                 SPPaintServer *server = (i == SS_FILL)? SP_STYLE_FILL_SERVER (query) : SP_STYLE_STROKE_SERVER (query);
                 if ( server ) {
-                    Inkscape::XML::Node *srepr = SP_OBJECT_REPR(server);
+                    Inkscape::XML::Node *srepr = server->getRepr();
                     _paintserver_id[i] += "url(#";
                     _paintserver_id[i] += srepr->attribute("id");
                     _paintserver_id[i] += ")";
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index cc179ddbc..51e0a262f 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -189,7 +189,7 @@ ToleranceSlider::update (double val)
     SPDocument *doc = sp_desktop_document(dt);
     bool saved = DocumentUndo::getUndoSensitive(doc);
     DocumentUndo::setUndoSensitive(doc, false);
-    Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt));
+    Inkscape::XML::Node *repr = sp_desktop_namedview(dt)->getRepr();
     repr->setAttribute(_key.c_str(), os.str().c_str());
     DocumentUndo::setUndoSensitive(doc, saved);