SPObject c++ification finalized along with the beginning of XML Privatisation tweaks

(bzr r9546.1.6)

1 files changed, 66 insertions, 66 deletions

diff --git a/src/sp-font-face.cpp b/src/sp-font-face.cpp
index 20419a8e5..a5894f83a 100644
--- a/src/sp-font-face.cpp
+++ b/src/sp-font-face.cpp
@@ -403,39 +403,39 @@ static void sp_fontface_build(SPObject *object, SPDocument *document, Inkscape::
         ((SPObjectClass *) (parent_class))->build(object, document, repr);
     }
 
-    sp_object_read_attr(object, "font-family");
-    sp_object_read_attr(object, "font-style");
-    sp_object_read_attr(object, "font-variant");
-    sp_object_read_attr(object, "font-weight");
-    sp_object_read_attr(object, "font-stretch");
-    sp_object_read_attr(object, "font-size");
-    sp_object_read_attr(object, "unicode-range");
-    sp_object_read_attr(object, "units-per-em");
-    sp_object_read_attr(object, "panose-1");
-    sp_object_read_attr(object, "stem-v");
-    sp_object_read_attr(object, "stem-h");
-    sp_object_read_attr(object, "slope");
-    sp_object_read_attr(object, "cap-height");
-    sp_object_read_attr(object, "x-height");
-    sp_object_read_attr(object, "accent-height");
-    sp_object_read_attr(object, "ascent");
-    sp_object_read_attr(object, "descent");
-    sp_object_read_attr(object, "widths");
-    sp_object_read_attr(object, "bbox");
-    sp_object_read_attr(object, "ideographic");
-    sp_object_read_attr(object, "alphabetic");
-    sp_object_read_attr(object, "mathematical");
-    sp_object_read_attr(object, "ranging");
-    sp_object_read_attr(object, "v-ideogaphic");
-    sp_object_read_attr(object, "v-alphabetic");
-    sp_object_read_attr(object, "v-mathematical");
-    sp_object_read_attr(object, "v-hanging");
-    sp_object_read_attr(object, "underline-position");
-    sp_object_read_attr(object, "underline-thickness");
-    sp_object_read_attr(object, "strikethrough-position");
-    sp_object_read_attr(object, "strikethrough-thickness");
-    sp_object_read_attr(object, "overline-position");
-    sp_object_read_attr(object, "overline-thickness");
+    object->readAttr( "font-family");
+    object->readAttr( "font-style");
+    object->readAttr( "font-variant");
+    object->readAttr( "font-weight");
+    object->readAttr( "font-stretch");
+    object->readAttr( "font-size");
+    object->readAttr( "unicode-range");
+    object->readAttr( "units-per-em");
+    object->readAttr( "panose-1");
+    object->readAttr( "stem-v");
+    object->readAttr( "stem-h");
+    object->readAttr( "slope");
+    object->readAttr( "cap-height");
+    object->readAttr( "x-height");
+    object->readAttr( "accent-height");
+    object->readAttr( "ascent");
+    object->readAttr( "descent");
+    object->readAttr( "widths");
+    object->readAttr( "bbox");
+    object->readAttr( "ideographic");
+    object->readAttr( "alphabetic");
+    object->readAttr( "mathematical");
+    object->readAttr( "ranging");
+    object->readAttr( "v-ideogaphic");
+    object->readAttr( "v-alphabetic");
+    object->readAttr( "v-mathematical");
+    object->readAttr( "v-hanging");
+    object->readAttr( "underline-position");
+    object->readAttr( "underline-thickness");
+    object->readAttr( "strikethrough-position");
+    object->readAttr( "strikethrough-thickness");
+    object->readAttr( "overline-position");
+    object->readAttr( "overline-thickness");
 }
 
 static void sp_fontface_children_modified(SPFontFace */*sp_fontface*/)
@@ -780,39 +780,39 @@ static void
 sp_fontface_update(SPObject *object, SPCtx *ctx, guint flags)
 {
     if (flags & (SP_OBJECT_MODIFIED_FLAG)) {
-        sp_object_read_attr(object, "font-family");
-        sp_object_read_attr(object, "font-style");
-        sp_object_read_attr(object, "font-variant");
-        sp_object_read_attr(object, "font-weight");
-        sp_object_read_attr(object, "font-stretch");
-        sp_object_read_attr(object, "font-size");
-        sp_object_read_attr(object, "unicode-range");
-        sp_object_read_attr(object, "units-per-em");
-        sp_object_read_attr(object, "panose-1");
-        sp_object_read_attr(object, "stemv");
-        sp_object_read_attr(object, "stemh");
-        sp_object_read_attr(object, "slope");
-        sp_object_read_attr(object, "cap-height");
-        sp_object_read_attr(object, "x-height");
-        sp_object_read_attr(object, "accent-height");
-        sp_object_read_attr(object, "ascent");
-        sp_object_read_attr(object, "descent");
-        sp_object_read_attr(object, "widths");
-        sp_object_read_attr(object, "bbox");
-        sp_object_read_attr(object, "ideographic");
-        sp_object_read_attr(object, "alphabetic");
-        sp_object_read_attr(object, "mathematical");
-        sp_object_read_attr(object, "hanging");
-        sp_object_read_attr(object, "v-ideographic");
-        sp_object_read_attr(object, "v-alphabetic");
-        sp_object_read_attr(object, "v-mathematical");
-        sp_object_read_attr(object, "v-hanging");
-        sp_object_read_attr(object, "underline-position");
-        sp_object_read_attr(object, "underline-thickness");
-        sp_object_read_attr(object, "strikethrough-position");
-        sp_object_read_attr(object, "strikethrough-thickness");
-        sp_object_read_attr(object, "overline-position");
-        sp_object_read_attr(object, "overline-thickness");
+        object->readAttr( "font-family");
+        object->readAttr( "font-style");
+        object->readAttr( "font-variant");
+        object->readAttr( "font-weight");
+        object->readAttr( "font-stretch");
+        object->readAttr( "font-size");
+        object->readAttr( "unicode-range");
+        object->readAttr( "units-per-em");
+        object->readAttr( "panose-1");
+        object->readAttr( "stemv");
+        object->readAttr( "stemh");
+        object->readAttr( "slope");
+        object->readAttr( "cap-height");
+        object->readAttr( "x-height");
+        object->readAttr( "accent-height");
+        object->readAttr( "ascent");
+        object->readAttr( "descent");
+        object->readAttr( "widths");
+        object->readAttr( "bbox");
+        object->readAttr( "ideographic");
+        object->readAttr( "alphabetic");
+        object->readAttr( "mathematical");
+        object->readAttr( "hanging");
+        object->readAttr( "v-ideographic");
+        object->readAttr( "v-alphabetic");
+        object->readAttr( "v-mathematical");
+        object->readAttr( "v-hanging");
+        object->readAttr( "underline-position");
+        object->readAttr( "underline-thickness");
+        object->readAttr( "strikethrough-position");
+        object->readAttr( "strikethrough-thickness");
+        object->readAttr( "overline-position");
+        object->readAttr( "overline-thickness");
     }
 
     if (((SPObjectClass *) parent_class)->update) {