Finished cleanup of outdated SP_OBJECT_REPR C macro.

(bzr r10067)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/file.cpp b/src/file.cpp
index c041cb262..2816b0434 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -964,7 +964,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
         prevent_id_clashes(doc, in_doc);
 
         SPObject *in_defs = SP_DOCUMENT_DEFS(in_doc);
-        Inkscape::XML::Node *last_def = SP_OBJECT_REPR(in_defs)->lastChild();
+        Inkscape::XML::Node *last_def = in_defs->getRepr()->lastChild();
 
         SPCSSAttr *style = sp_css_attr_from_object(doc->getRoot());
 
@@ -1000,7 +1000,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
         SPObject *new_obj = NULL;
         for ( SPObject *child = doc->getRoot()->firstChild(); child; child = child->getNext() ) {
             if (SP_IS_ITEM(child)) {
-                Inkscape::XML::Node *newitem = SP_OBJECT_REPR(child)->duplicate(xml_in_doc);
+                Inkscape::XML::Node *newitem = child->getRepr()->duplicate(xml_in_doc);
 
                 // convert layers to groups, and make sure they are unlocked
                 // FIXME: add "preserve layers" mode where each layer from
@@ -1013,15 +1013,15 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
             }
 
             // don't lose top-level defs or style elements
-            else if (SP_OBJECT_REPR(child)->type() == Inkscape::XML::ELEMENT_NODE) {
-                const gchar *tag = SP_OBJECT_REPR(child)->name();
+            else if (child->getRepr()->type() == Inkscape::XML::ELEMENT_NODE) {
+                const gchar *tag = child->getRepr()->name();
                 if (!strcmp(tag, "svg:defs")) {
                     for ( SPObject *x = child->firstChild(); x; x = x->getNext() ) {
-                        SP_OBJECT_REPR(in_defs)->addChild(SP_OBJECT_REPR(x)->duplicate(xml_in_doc), last_def);
+                        in_defs->getRepr()->addChild(x->getRepr()->duplicate(xml_in_doc), last_def);
                     }
                 }
                 else if (!strcmp(tag, "svg:style")) {
-                    in_doc->getRoot()->appendChildRepr(SP_OBJECT_REPR(child)->duplicate(xml_in_doc));
+                    in_doc->getRoot()->appendChildRepr(child->getRepr()->duplicate(xml_in_doc));
                 }
             }
         }