Merge and cleanup of GSoC C++-ification project.

(bzr r9945.1.1)

18 files changed, 133 insertions, 145 deletions

diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index 4c41184db..9a52d86f7 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEBLEND_CPP__
-
 /** \file
  * SVG <feBlend> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   Hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Niko Kiirala <niko@kiirala.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006,2007 authors
  *
@@ -103,8 +102,8 @@ sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "mode");
-    sp_object_read_attr(object, "in2");
+    object->readAttr( "mode" );
+    object->readAttr( "in2" );
 
     /* Unlike normal in, in2 is required attribute. Make sure, we can call
      * it by some name. */
@@ -202,8 +201,8 @@ sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags)
     SPFeBlend *blend = SP_FEBLEND(object);
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
-        sp_object_read_attr(object, "mode");
-        sp_object_read_attr(object, "in2");
+        object->readAttr( "mode" );
+        object->readAttr( "in2" );
     }
 
     /* Unlike normal in, in2 is required attribute. Make sure, we can call
@@ -213,7 +212,9 @@ sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags)
     {
         SPFilter *parent = SP_FILTER(object->parent);
         blend->in2 = sp_filter_primitive_name_previous_out(blend);
-        object->repr->setAttribute("in2", sp_filter_name_for_image(parent, blend->in2));
+
+        //XML Tree being used directly here while it shouldn't be.
+        object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, blend->in2));
     }
 
     if (((SPObjectClass *) feBlend_parent_class)->update) {
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index da1c91632..6018afe09 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -1,5 +1,3 @@
-#define __SP_FECOLORMATRIX_CPP__
-
 /** \file
  * SVG <feColorMatrix> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   Felipe Sanches <juca@members.fsf.org>
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2007 Felipe C. da S. Sanches
  * Copyright (C) 2006 Hugo Rodrigues
@@ -98,8 +97,8 @@ sp_feColorMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::No
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "type");
-    sp_object_read_attr(object, "values");
+    object->readAttr( "type" );
+    object->readAttr( "values" );
 }
 
 /**
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp
index 2fad81797..a245e1c89 100644
--- a/src/filters/componenttransfer-funcnode.cpp
+++ b/src/filters/componenttransfer-funcnode.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEFUNCNODE_CPP__
-
 /** \file
  * SVG <funcR>, <funcG>, <funcB> and <funcA> implementations.
  */
@@ -8,6 +6,7 @@
  *   Hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Niko Kiirala <niko@kiirala.com>
  *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006, 2007, 2008 Authors
  *
@@ -168,17 +167,17 @@ sp_fefuncnode_build(SPObject *object, SPDocument *document, Inkscape::XML::Node
     }
 
     //Read values of key attributes from XML nodes into object.
-    sp_object_read_attr(object, "type");
-    sp_object_read_attr(object, "tableValues");
-    sp_object_read_attr(object, "slope");
-    sp_object_read_attr(object, "intercept");
-    sp_object_read_attr(object, "amplitude");
-    sp_object_read_attr(object, "exponent");
-    sp_object_read_attr(object, "offset");
+    object->readAttr( "type" );
+    object->readAttr( "tableValues" );
+    object->readAttr( "slope" );
+    object->readAttr( "intercept" );
+    object->readAttr( "amplitude" );
+    object->readAttr( "exponent" );
+    object->readAttr( "offset" );
 
 
 //is this necessary?
-    sp_document_add_resource(document, "fefuncnode", object); //maybe feFuncR, fefuncG, feFuncB and fefuncA ?
+    document->addResource("fefuncnode", object); //maybe feFuncR, fefuncG, feFuncB and fefuncA ?
 }
 
 /**
@@ -191,7 +190,7 @@ sp_fefuncnode_release(SPObject *object)
 
     if (SP_OBJECT_DOCUMENT(object)) {
         /* Unregister ourselves */
-        sp_document_remove_resource(SP_OBJECT_DOCUMENT(object), "fefuncnode", SP_OBJECT(object));
+        SP_OBJECT_DOCUMENT(object)->removeResource("fefuncnode", SP_OBJECT(object));
     }
 
 //TODO: release resources here
@@ -296,8 +295,8 @@ sp_fefuncnode_update(SPObject *object, SPCtx *ctx, guint flags)
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         /* do something to trigger redisplay, updates? */
         //TODO
-        //sp_object_read_attr(object, "azimuth");
-        //sp_object_read_attr(object, "elevation");
+        //object->readAttr( "azimuth" );
+        //object->readAttr( "elevation" );
     }
 
     if (((SPObjectClass *) feFuncNode_parent_class)->update) {
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index f1d4a709b..c6ff4f5f2 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -1,5 +1,3 @@
-#define __SP_FECOMPONENTTRANSFER_CPP__
-
 /** \file
  * SVG <feComponentTransfer> implementation.
  *
@@ -7,6 +5,7 @@
 /*
  * Authors:
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *
@@ -100,7 +99,7 @@ sp_feComponentTransfer_build(SPObject *object, SPDocument *document, Inkscape::X
     /*LOAD ATTRIBUTES FROM REPR HERE*/
 
     //do we need this?
-    sp_document_add_resource(document, "feComponentTransfer", object);
+    document->addResource("feComponentTransfer", object);
 }
 
 static void sp_feComponentTransfer_children_modified(SPFeComponentTransfer *sp_componenttransfer)
diff --git a/src/filters/composite.cpp b/src/filters/composite.cpp
index 9398aeea7..c2b47c4c2 100644
--- a/src/filters/composite.cpp
+++ b/src/filters/composite.cpp
@@ -1,5 +1,3 @@
-#define __SP_FECOMPOSITE_CPP__
-
 /** \file
  * SVG <feComposite> implementation.
  *
@@ -7,6 +5,7 @@
 /*
  * Authors:
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *
@@ -101,14 +100,14 @@ sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node
 
     SPFeComposite *comp = SP_FECOMPOSITE(object);
 
-    sp_object_read_attr(object, "operator");
+    object->readAttr( "operator" );
     if (comp->composite_operator == COMPOSITE_ARITHMETIC) {
-        sp_object_read_attr(object, "k1");
-        sp_object_read_attr(object, "k2");
-        sp_object_read_attr(object, "k3");
-        sp_object_read_attr(object, "k4");
+        object->readAttr( "k1" );
+        object->readAttr( "k2" );
+        object->readAttr( "k3" );
+        object->readAttr( "k4" );
     }
-    sp_object_read_attr(object, "in2");
+    object->readAttr( "in2" );
 
     /* Unlike normal in, in2 is required attribute. Make sure, we can call
      * it by some name. */
@@ -240,7 +239,9 @@ sp_feComposite_update(SPObject *object, SPCtx *ctx, guint flags)
     {
         SPFilter *parent = SP_FILTER(object->parent);
         comp->in2 = sp_filter_primitive_name_previous_out(comp);
-        object->repr->setAttribute("in2", sp_filter_name_for_image(parent, comp->in2));
+
+		//XML Tree being used directly here while it shouldn't be.
+        object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, comp->in2));
     }
 
     if (((SPObjectClass *) feComposite_parent_class)->update) {
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 45c0a080e..3f1419967 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -1,5 +1,3 @@
-#define __SP_FECONVOLVEMATRIX_CPP__
-
 /** \file
  * SVG <feConvolveMatrix> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *
@@ -110,15 +109,15 @@ sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML:
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "order");
-    sp_object_read_attr(object, "kernelMatrix");
-    sp_object_read_attr(object, "divisor");
-    sp_object_read_attr(object, "bias");
-    sp_object_read_attr(object, "targetX");
-    sp_object_read_attr(object, "targetY");
-    sp_object_read_attr(object, "edgeMode");
-    sp_object_read_attr(object, "kernelUnitLength");
-    sp_object_read_attr(object, "preserveAlpha");
+    object->readAttr( "order" );
+    object->readAttr( "kernelMatrix" );
+    object->readAttr( "divisor" );
+    object->readAttr( "bias" );
+    object->readAttr( "targetX" );
+    object->readAttr( "targetY" );
+    object->readAttr( "edgeMode" );
+    object->readAttr( "kernelUnitLength" );
+    object->readAttr( "preserveAlpha" );
 }
 
 /**
diff --git a/src/filters/diffuselighting.cpp b/src/filters/diffuselighting.cpp
index ca7a8423c..95faa4a29 100644
--- a/src/filters/diffuselighting.cpp
+++ b/src/filters/diffuselighting.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEDIFFUSELIGHTING_CPP__
-
 /** \file
  * SVG <feDiffuseLighting> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Jean-Rene Reinhard <jr@komite.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *               2007 authors
@@ -118,10 +117,10 @@ sp_feDiffuseLighting_build(SPObject *object, SPDocument *document, Inkscape::XML
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "surfaceScale");
-    sp_object_read_attr(object, "diffuseConstant");
-    sp_object_read_attr(object, "kernelUnitLength");
-    sp_object_read_attr(object, "lighting-color");
+    object->readAttr( "surfaceScale" );
+    object->readAttr( "diffuseConstant" );
+    object->readAttr( "kernelUnitLength" );
+    object->readAttr( "lighting-color" );
     
 }
 
@@ -224,10 +223,10 @@ static void
 sp_feDiffuseLighting_update(SPObject *object, SPCtx *ctx, guint flags)
 {
     if (flags & (SP_OBJECT_MODIFIED_FLAG)) {
-        sp_object_read_attr(object, "surfaceScale");
-        sp_object_read_attr(object, "diffuseConstant");
-        sp_object_read_attr(object, "kernelUnit");
-        sp_object_read_attr(object, "lighting-color");
+        object->readAttr( "surfaceScale" );
+        object->readAttr( "diffuseConstant" );
+        object->readAttr( "kernelUnit" );
+        object->readAttr( "lighting-color" );
     }
 
     if (((SPObjectClass *) feDiffuseLighting_parent_class)->update) {
diff --git a/src/filters/displacementmap.cpp b/src/filters/displacementmap.cpp
index 956719d10..a6ad8b81a 100644
--- a/src/filters/displacementmap.cpp
+++ b/src/filters/displacementmap.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEDISPLACEMENTMAP_CPP__
-
 /** \file
  * SVG <feDisplacementMap> implementation.
  *
@@ -7,6 +5,7 @@
 /*
  * Authors:
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *
@@ -97,10 +96,10 @@ sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "scale");
-    sp_object_read_attr(object, "in2");
-    sp_object_read_attr(object, "xChannelSelector");
-    sp_object_read_attr(object, "yChannelSelector");
+    object->readAttr( "scale" );
+    object->readAttr( "in2" );
+    object->readAttr( "xChannelSelector" );
+    object->readAttr( "yChannelSelector" );
 
     /* Unlike normal in, in2 is required attribute. Make sure, we can call
      * it by some name. */
@@ -218,7 +217,9 @@ sp_feDisplacementMap_update(SPObject *object, SPCtx *ctx, guint flags)
     {
         SPFilter *parent = SP_FILTER(object->parent);
         disp->in2 = sp_filter_primitive_name_previous_out(disp);
-        object->repr->setAttribute("in2", sp_filter_name_for_image(parent, disp->in2));
+
+        //XML Tree being used directly here while it shouldn't be.
+        object->getRepr()->setAttribute("in2", sp_filter_name_for_image(parent, disp->in2));
     }
 
     if (((SPObjectClass *) feDisplacementMap_parent_class)->update) {
diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp
index ee366a23d..2207bc8e4 100644
--- a/src/filters/distantlight.cpp
+++ b/src/filters/distantlight.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEDISTANTLIGHT_CPP__
-
 /** \file
  * SVG <fedistantlight> implementation.
  */
@@ -8,6 +6,7 @@
  *   Hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Niko Kiirala <niko@kiirala.com>
  *   Jean-Rene Reinhard <jr@komite.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006,2007 Authors
  *
@@ -101,11 +100,11 @@ sp_fedistantlight_build(SPObject *object, SPDocument *document, Inkscape::XML::N
     }
 
     //Read values of key attributes from XML nodes into object.
-    sp_object_read_attr(object, "azimuth");
-    sp_object_read_attr(object, "elevation");
+    object->readAttr( "azimuth" );
+    object->readAttr( "elevation" );
 
 //is this necessary?
-    sp_document_add_resource(document, "fedistantlight", object);
+    document->addResource("fedistantlight", object);
 }
 
 /**
@@ -118,7 +117,7 @@ sp_fedistantlight_release(SPObject *object)
 
     if (SP_OBJECT_DOCUMENT(object)) {
         /* Unregister ourselves */
-        sp_document_remove_resource(SP_OBJECT_DOCUMENT(object), "fedistantlight", SP_OBJECT(object));
+        SP_OBJECT_DOCUMENT(object)->removeResource("fedistantlight", SP_OBJECT(object));
     }
 
 //TODO: release resources here
@@ -189,8 +188,8 @@ sp_fedistantlight_update(SPObject *object, SPCtx *ctx, guint flags)
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         /* do something to trigger redisplay, updates? */
-        sp_object_read_attr(object, "azimuth");
-        sp_object_read_attr(object, "elevation");
+        object->readAttr( "azimuth" );
+        object->readAttr( "elevation" );
     }
 
     if (((SPObjectClass *) feDistantLight_parent_class)->update) {
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index cf7ce662f..25780c1ae 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEFLOOD_CPP__
-
 /** \file
  * SVG <feFlood> implementation.
  *
@@ -7,6 +5,7 @@
 /*
  * Authors:
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *
@@ -96,8 +95,8 @@ sp_feFlood_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "flood-opacity");
-    sp_object_read_attr(object, "flood-color");
+    object->readAttr( "flood-opacity" );
+    object->readAttr( "flood-color" );
 }
 
 /**
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index 69a4b6018..bbe775c18 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEIMAGE_CPP__
-
 /** \file
  * SVG <feImage> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2007 Felipe Sanches
  * Copyright (C) 2006 Hugo Rodrigues
@@ -100,11 +99,11 @@ static void sp_feImage_build(SPObject *object, SPDocument *document, Inkscape::X
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
 
-    sp_object_read_attr(object, "x");
-    sp_object_read_attr(object, "y");
-    sp_object_read_attr(object, "width");
-    sp_object_read_attr(object, "height");
-    sp_object_read_attr(object, "xlink:href");
+    object->readAttr( "x" );
+    object->readAttr( "y" );
+    object->readAttr( "width" );
+    object->readAttr( "height" );
+    object->readAttr( "xlink:href" );
 
 }
 
diff --git a/src/filters/mergenode.cpp b/src/filters/mergenode.cpp
index 1f92df4d6..b7b06a94a 100644
--- a/src/filters/mergenode.cpp
+++ b/src/filters/mergenode.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEMERGENODE_CPP__
-
 /** \file
  * feMergeNode implementation. A feMergeNode contains the name of one
  * input image for feMerge.
@@ -8,6 +6,7 @@
  * Authors:
  *   Kees Cook <kees@outflux.net>
  *   Niko Kiirala <niko@kiirala.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2004,2007 authors
  *
@@ -84,7 +83,7 @@ sp_feMergeNode_init(SPFeMergeNode *feMergeNode)
 static void
 sp_feMergeNode_build(SPObject *object, SPDocument */*document*/, Inkscape::XML::Node */*repr*/)
 {
-    sp_object_read_attr(object, "in");
+    object->readAttr( "in" );
 }
 
 /**
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index 668f94c4c..7ae65c48d 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEMORPHOLOGY_CPP__
-
 /** \file
  * SVG <feMorphology> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   Felipe Sanches <juca@members.fsf.org>
  *   Hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *
@@ -97,8 +96,8 @@ sp_feMorphology_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "operator");
-    sp_object_read_attr(object, "radius");
+    object->readAttr( "operator" );
+    object->readAttr( "radius" );
 }
 
 /**
diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp
index 2db931650..48ee895dc 100644
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEOFFSET_CPP__
-
 /** \file
  * SVG <feOffset> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Niko Kiirala <niko@kiirala.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006,2007 authors
  *
@@ -96,8 +95,8 @@ sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *r
         ((SPObjectClass *) feOffset_parent_class)->build(object, document, repr);
     }
 
-    sp_object_read_attr(object, "dx");
-    sp_object_read_attr(object, "dy");
+    object->readAttr( "dx" );
+    object->readAttr( "dy" );
 }
 
 /**
@@ -151,8 +150,8 @@ static void
 sp_feOffset_update(SPObject *object, SPCtx *ctx, guint flags)
 {
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
-        sp_object_read_attr(object, "dx");
-        sp_object_read_attr(object, "dy");
+        object->readAttr( "dx" );
+        object->readAttr( "dy" );
     }
 
     if (((SPObjectClass *) feOffset_parent_class)->update) {
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index a4939023e..c9eebcb18 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -1,5 +1,3 @@
-#define __SP_FEPOINTLIGHT_CPP__
-
 /** \file
  * SVG <fepointlight> implementation.
  */
@@ -8,6 +6,7 @@
  *   Hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Niko Kiirala <niko@kiirala.com>
  *   Jean-Rene Reinhard <jr@komite.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006,2007 Authors
  *
@@ -104,12 +103,12 @@ sp_fepointlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
     }
 
     //Read values of key attributes from XML nodes into object.
-    sp_object_read_attr(object, "x");
-    sp_object_read_attr(object, "y");
-    sp_object_read_attr(object, "z");
+    object->readAttr( "x" );
+    object->readAttr( "y" );
+    object->readAttr( "z" );
 
 //is this necessary?
-    sp_document_add_resource(document, "fepointlight", object);
+    document->addResource("fepointlight", object);
 }
 
 /**
@@ -122,7 +121,7 @@ sp_fepointlight_release(SPObject *object)
 
     if (SP_OBJECT_DOCUMENT(object)) {
         /* Unregister ourselves */
-        sp_document_remove_resource(SP_OBJECT_DOCUMENT(object), "fepointlight", SP_OBJECT(object));
+        SP_OBJECT_DOCUMENT(object)->removeResource("fepointlight", SP_OBJECT(object));
     }
 
 //TODO: release resources here
@@ -211,9 +210,9 @@ sp_fepointlight_update(SPObject *object, SPCtx *ctx, guint flags)
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         /* do something to trigger redisplay, updates? */
-        sp_object_read_attr(object, "x");
-        sp_object_read_attr(object, "y");
-        sp_object_read_attr(object, "z");
+        object->readAttr( "x" );
+        object->readAttr( "y" );
+        object->readAttr( "z" );
     }
 
     if (((SPObjectClass *) fePointLight_parent_class)->update) {
diff --git a/src/filters/specularlighting.cpp b/src/filters/specularlighting.cpp
index 6ed540892..41eb38e61 100644
--- a/src/filters/specularlighting.cpp
+++ b/src/filters/specularlighting.cpp
@@ -1,5 +1,3 @@
-#define __SP_FESPECULARLIGHTING_CPP__
-
 /** \file
  * SVG <feSpecularLighting> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Jean-Rene Reinhard <jr@komite.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006 Hugo Rodrigues
  *               2007 authors
@@ -120,11 +119,11 @@ sp_feSpecularLighting_build(SPObject *object, SPDocument *document, Inkscape::XM
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "surfaceScale");
-    sp_object_read_attr(object, "specularConstant");
-    sp_object_read_attr(object, "specularExponent");
-    sp_object_read_attr(object, "kernelUnitLength");
-    sp_object_read_attr(object, "lighting-color");
+    object->readAttr( "surfaceScale" );
+    object->readAttr( "specularConstant" );
+    object->readAttr( "specularExponent" );
+    object->readAttr( "kernelUnitLength" );
+    object->readAttr( "lighting-color" );
     
 }
 
@@ -250,11 +249,11 @@ static void
 sp_feSpecularLighting_update(SPObject *object, SPCtx *ctx, guint flags)
 {
     if (flags & (SP_OBJECT_MODIFIED_FLAG)) {
-        sp_object_read_attr(object, "surfaceScale");
-        sp_object_read_attr(object, "specularConstant");
-        sp_object_read_attr(object, "specularExponent");
-        sp_object_read_attr(object, "kernelUnitLength");
-        sp_object_read_attr(object, "lighting-color");
+        object->readAttr( "surfaceScale" );
+        object->readAttr( "specularConstant" );
+        object->readAttr( "specularExponent" );
+        object->readAttr( "kernelUnitLength" );
+        object->readAttr( "lighting-color" );
     }
 
     if (((SPObjectClass *) feSpecularLighting_parent_class)->update) {
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index 6d1347975..dac9b87e7 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -1,5 +1,3 @@
-#define __SP_FESPOTLIGHT_CPP__
-
 /** \file
  * SVG <fespotlight> implementation.
  */
@@ -8,6 +6,7 @@
  *   Hugo Rodrigues <haa.rodrigues@gmail.com>
  *   Niko Kiirala <niko@kiirala.com>
  *   Jean-Rene Reinhard <jr@komite.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2006,2007 Authors
  *
@@ -114,17 +113,17 @@ sp_fespotlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node
     }
 
     //Read values of key attributes from XML nodes into object.
-    sp_object_read_attr(object, "x");
-    sp_object_read_attr(object, "y");
-    sp_object_read_attr(object, "z");
-    sp_object_read_attr(object, "pointsAtX");
-    sp_object_read_attr(object, "pointsAtY");
-    sp_object_read_attr(object, "pointsAtZ");
-    sp_object_read_attr(object, "specularExponent");
-    sp_object_read_attr(object, "limitingConeAngle");
+    object->readAttr( "x" );
+    object->readAttr( "y" );
+    object->readAttr( "z" );
+    object->readAttr( "pointsAtX" );
+    object->readAttr( "pointsAtY" );
+    object->readAttr( "pointsAtZ" );
+    object->readAttr( "specularExponent" );
+    object->readAttr( "limitingConeAngle" );
 
 //is this necessary?
-    sp_document_add_resource(document, "fespotlight", object);
+    document->addResource("fespotlight", object);
 }
 
 /**
@@ -137,7 +136,7 @@ sp_fespotlight_release(SPObject *object)
 
     if (SP_OBJECT_DOCUMENT(object)) {
         /* Unregister ourselves */
-        sp_document_remove_resource(SP_OBJECT_DOCUMENT(object), "fespotlight", SP_OBJECT(object));
+        SP_OBJECT_DOCUMENT(object)->removeResource("fespotlight", SP_OBJECT(object));
     }
 
 //TODO: release resources here
@@ -309,14 +308,14 @@ sp_fespotlight_update(SPObject *object, SPCtx *ctx, guint flags)
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         /* do something to trigger redisplay, updates? */
-        sp_object_read_attr(object, "x");
-        sp_object_read_attr(object, "y");
-        sp_object_read_attr(object, "z");
-        sp_object_read_attr(object, "pointsAtX");
-        sp_object_read_attr(object, "pointsAtY");
-        sp_object_read_attr(object, "pointsAtZ");
-        sp_object_read_attr(object, "specularExponent");
-        sp_object_read_attr(object, "limitingConeAngle");
+        object->readAttr( "x" );
+        object->readAttr( "y" );
+        object->readAttr( "z" );
+        object->readAttr( "pointsAtX" );
+        object->readAttr( "pointsAtY" );
+        object->readAttr( "pointsAtZ" );
+        object->readAttr( "specularExponent" );
+        object->readAttr( "limitingConeAngle" );
     }
 
     if (((SPObjectClass *) feSpotLight_parent_class)->update) {
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index 268eca643..739001311 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -1,5 +1,3 @@
-#define __SP_FETURBULENCE_CPP__
-
 /** \file
  * SVG <feTurbulence> implementation.
  *
@@ -8,6 +6,7 @@
  * Authors:
  *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
  *   hugo Rodrigues <haa.rodrigues@gmail.com>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2007 Felipe Sanches
  * Copyright (C) 2006 Hugo Rodrigues
@@ -100,11 +99,11 @@ sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Nod
     }
 
     /*LOAD ATTRIBUTES FROM REPR HERE*/
-    sp_object_read_attr(object, "baseFrequency");
-    sp_object_read_attr(object, "numOctaves");
-    sp_object_read_attr(object, "seed");
-    sp_object_read_attr(object, "stitchTiles");
-    sp_object_read_attr(object, "type");
+    object->readAttr( "baseFrequency" );
+    object->readAttr( "numOctaves" );
+    object->readAttr( "seed" );
+    object->readAttr( "stitchTiles" );
+    object->readAttr( "type" );
 }
 
 /**