Finished cleanup of outated SP_OBJECT_DOCUMENT C macro.

(bzr r10060)

3 files changed, 16 insertions, 16 deletions

diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index c544d1999..8e50897e8 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -278,20 +278,20 @@ sp_item_create_link(GtkMenuItem *menuitem, SPItem *item)
 
     Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
     Inkscape::XML::Node *repr = xml_doc->createElement("svg:a");
-    SP_OBJECT_REPR(SP_OBJECT_PARENT(item))->addChild(repr, SP_OBJECT_REPR(item));
-    SPObject *object = SP_OBJECT_DOCUMENT(item)->getObjectByRepr(repr);
+    item->parent->getRepr()->addChild(repr, item->getRepr());
+    SPObject *object = item->document->getObjectByRepr(repr);
     g_return_if_fail(SP_IS_ANCHOR(object));
 
-    const char *id = SP_OBJECT_REPR(item)->attribute("id");
-    Inkscape::XML::Node *child = SP_OBJECT_REPR(item)->duplicate(xml_doc);
-    SP_OBJECT(item)->deleteObject(false);
+    const char *id = item->getRepr()->attribute("id");
+    Inkscape::XML::Node *child = item->getRepr()->duplicate(xml_doc);
+    item->deleteObject(false);
     repr->addChild(child, NULL);
     child->setAttribute("id", id);
 
     Inkscape::GC::release(repr);
     Inkscape::GC::release(child);
 
-    DocumentUndo::done(SP_OBJECT_DOCUMENT(object), SP_VERB_NONE,
+    DocumentUndo::done(object->document, SP_VERB_NONE,
                        _("Create link"));
 
     sp_object_attributes_dialog(object, "SPAnchor");
@@ -371,7 +371,7 @@ sp_anchor_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
 static void
 sp_anchor_link_properties(GtkMenuItem */*menuitem*/, SPAnchor *anchor)
 {
-    sp_object_attributes_dialog(SP_OBJECT(anchor), "Link");
+    sp_object_attributes_dialog(anchor, "Link");
 }
 
 static void
@@ -420,7 +420,7 @@ sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
     gtk_signal_connect(GTK_OBJECT(w), "activate", GTK_SIGNAL_FUNC(sp_image_image_edit), item);
     gtk_widget_show(w);
     gtk_menu_append(GTK_MENU(m), w);
-    Inkscape::XML::Node *ir = SP_OBJECT_REPR(object);
+    Inkscape::XML::Node *ir = object->getRepr();
     const gchar *href = ir->attribute("xlink:href");
     if ( (!href) || ((strncmp(href, "data:", 5) == 0)) ) {
         gtk_widget_set_sensitive( w, FALSE );
@@ -430,7 +430,7 @@ sp_image_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m)
 static void
 sp_image_image_properties(GtkMenuItem */*menuitem*/, SPAnchor *anchor)
 {
-    sp_object_attributes_dialog(SP_OBJECT(anchor), "Image");
+    sp_object_attributes_dialog(anchor, "Image");
 }
 
 static gchar* getImageEditorName() {
@@ -455,8 +455,8 @@ static gchar* getImageEditorName() {
 
 static void sp_image_image_edit(GtkMenuItem *menuitem, SPAnchor *anchor)
 {
-    SPObject* obj = SP_OBJECT(anchor);
-    Inkscape::XML::Node *ir = SP_OBJECT_REPR(obj);
+    SPObject* obj = anchor;
+    Inkscape::XML::Node *ir = obj->getRepr();
     const gchar *href = ir->attribute("xlink:href");
 
     GError* errThing = 0;
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 1ab0d51bc..bd9777048 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -109,7 +109,7 @@ void GuidelinePropertiesDialog::_onApply()
 
     sp_guide_moveto(*_guide, newpos, true);
 
-    DocumentUndo::done(SP_OBJECT_DOCUMENT(_guide), SP_VERB_NONE, 
+    DocumentUndo::done(_guide->document, SP_VERB_NONE, 
                        _("Set guide properties"));
 }
 
@@ -120,7 +120,7 @@ void GuidelinePropertiesDialog::_onOK()
 
 void GuidelinePropertiesDialog::_onDelete()
 {
-    SPDocument *doc = SP_OBJECT_DOCUMENT(_guide);
+    SPDocument *doc = _guide->document;
     sp_guide_remove(_guide);
     DocumentUndo::done(doc, SP_VERB_NONE, 
                        _("Delete guide"));
@@ -235,7 +235,7 @@ void GuidelinePropertiesDialog::_setup() {
     }
 
     {
-        Inkscape::XML::Node *repr = SP_OBJECT_REPR (_guide);
+        Inkscape::XML::Node *repr = _guide->getRepr();
         const gchar *guide_id = repr->attribute("id");
         gchar *label = g_strdup_printf(_("Guideline ID: %s"), guide_id);
         _label_name.set_label(label);
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index b507d9f9a..bb566fb7f 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -355,7 +355,7 @@ void IconPreviewPanel::refreshPreview()
                     GSList const *items = sel->itemList();
                     while ( items && !target ) {
                         SPItem* item = SP_ITEM( items->data );
-                        SPObject * obj = SP_OBJECT(item);
+                        SPObject * obj = item;
                         gchar const *id = obj->getId();
                         if ( id ) {
                             targetId = id;
@@ -427,7 +427,7 @@ void IconPreviewPanel::modeToggled()
 
 void IconPreviewPanel::renderPreview( SPObject* obj )
 {
-    SPDocument * doc = SP_OBJECT_DOCUMENT(obj);
+    SPDocument * doc = obj->document;
     gchar const * id = obj->getId();
     if ( !renderTimer ) {
         renderTimer = new Glib::Timer();