Pass removing some outdated C-macro use.

(bzr r10059)

4 files changed, 17 insertions, 18 deletions

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)