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

[inkscape.git] / src / marker.cpp

diff --git a/src/marker.cpp b/src/marker.cpp
index 376b4fa28ca08ee27fa7dd19d828dad58023e14d..0ec92a1ff2147b00573ad9703e86d10a7628083c 100644 (file)
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -1,11 +1,10 @@
-#define __MARKER_C__
-
 /*
  * SVG <marker> implementation
  *
  * Authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Bryce Harrington <bryce@bryceharrington.org>
+ *   Abhishek Sharma
  *
  * Copyright (C) 1999-2003 Lauris Kaplinski
  *               2004-2006 Bryce Harrington
@@ -141,14 +140,14 @@ sp_marker_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *re
        group = (SPGroup *) object;
        marker = (SPMarker *) object;
 
-       object->readAttr( "markerUnits");
-       object->readAttr( "refX");
-       object->readAttr( "refY");
-       object->readAttr( "markerWidth");
-       object->readAttr( "markerHeight");
-       object->readAttr( "orient");
-       object->readAttr( "viewBox");
-       object->readAttr( "preserveAspectRatio");
+       object->readAttr( "markerUnits" );
+       object->readAttr( "refX" );
+       object->readAttr( "refY" );
+       object->readAttr( "markerWidth" );
+       object->readAttr( "markerHeight" );
+       object->readAttr( "orient" );
+       object->readAttr( "viewBox" );
+       object->readAttr( "preserveAspectRatio" );
 
        if (((SPObjectClass *) parent_class)->build)
                ((SPObjectClass *) parent_class)->build (object, document, repr);
@@ -711,11 +710,10 @@ sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destro
     delete view;
 }
 
-const gchar *
-generate_marker (GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Matrix /*transform*/, Geom::Matrix move)
+const gchar *generate_marker(GSList *reprs, Geom::Rect bounds, SPDocument *document, Geom::Matrix /*transform*/, Geom::Matrix move)
 {
-    Inkscape::XML::Document *xml_doc = sp_document_repr_doc(document);
-    Inkscape::XML::Node *defsrepr = SP_OBJECT_REPR (SP_DOCUMENT_DEFS (document));
+    Inkscape::XML::Document *xml_doc = document->getReprDoc();
+    Inkscape::XML::Node *defsrepr = SP_DOCUMENT_DEFS(document)->getRepr();
 
     Inkscape::XML::Node *repr = xml_doc->createElement("svg:marker");