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

[inkscape.git] / src / sp-style-elem-test.h

diff --git a/src/sp-style-elem-test.h b/src/sp-style-elem-test.h
index 0c01136f6af47df3d97b86a4efc73af5215210db..53362d3e374096a3ad1e8bef63757a7135a26810 100644 (file)
--- a/src/sp-style-elem-test.h
+++ b/src/sp-style-elem-test.h
@@ -1,4 +1,3 @@
-
 #ifndef SEEN_SP_STYLE_ELEM_TEST_H
 #define SEEN_SP_STYLE_ELEM_TEST_H
 
@@ -23,7 +22,7 @@ public:
     {
         if ( _doc )
         {
-            sp_document_unref( _doc );
+            _doc->doUnref();
         }
     }
 
@@ -56,16 +55,16 @@ public:
         SPStyleElem *style_elem = static_cast<SPStyleElem *>(g_object_new(SP_TYPE_STYLE_ELEM, NULL));
         SP_OBJECT(style_elem)->document = _doc;
 
-        sp_object_set(SP_OBJECT(style_elem), SP_ATTR_TYPE, "something unrecognized");
+        SP_OBJECT(style_elem)->setKeyValue( SP_ATTR_TYPE, "something unrecognized");
         TS_ASSERT( !style_elem->is_css );
 
-        sp_object_set(SP_OBJECT(style_elem), SP_ATTR_TYPE, "text/css");
+        SP_OBJECT(style_elem)->setKeyValue( SP_ATTR_TYPE, "text/css");
         TS_ASSERT( style_elem->is_css );
 
-        sp_object_set(SP_OBJECT(style_elem), SP_ATTR_TYPE, "atext/css");
+        SP_OBJECT(style_elem)->setKeyValue( SP_ATTR_TYPE, "atext/css");
         TS_ASSERT( !style_elem->is_css );
 
-        sp_object_set(SP_OBJECT(style_elem), SP_ATTR_TYPE, "text/cssx");
+        SP_OBJECT(style_elem)->setKeyValue( SP_ATTR_TYPE, "text/cssx");
         TS_ASSERT( !style_elem->is_css );
 
         g_object_unref(style_elem);
@@ -82,7 +81,7 @@ public:
         SPStyleElem *style_elem = SP_STYLE_ELEM(g_object_new(SP_TYPE_STYLE_ELEM, NULL));
         SP_OBJECT(style_elem)->document = _doc;
 
-        sp_object_set(SP_OBJECT(style_elem), SP_ATTR_TYPE, "text/css");
+        SP_OBJECT(style_elem)->setKeyValue( SP_ATTR_TYPE, "text/css");
         Inkscape::XML::Node *repr = sp_document_repr_doc(_doc)->createElement("svg:style");
         SP_OBJECT(style_elem)->updateRepr(sp_document_repr_doc(_doc), repr, SP_OBJECT_WRITE_ALL);
         {
@@ -108,7 +107,7 @@ public:
         SPStyleElem &style_elem = *SP_STYLE_ELEM(g_object_new(SP_TYPE_STYLE_ELEM, NULL));
         Inkscape::XML::Node *const repr = sp_document_repr_doc(_doc)->createElement("svg:style");
         repr->setAttribute("type", "text/css");
-        sp_object_invoke_build(&style_elem, _doc, repr, false);
+        (&style_elem)->invoke_build( _doc, repr, false);
         TS_ASSERT( style_elem.is_css );
         TS_ASSERT( style_elem.media.print );
         TS_ASSERT( style_elem.media.screen );
@@ -138,7 +137,7 @@ public:
         repr->setAttribute("type", "text/css");
         Inkscape::XML::Node *const content_repr = sp_document_repr_doc(_doc)->createTextNode(".myclass { }");
         repr->addChild(content_repr, NULL);
-        sp_object_invoke_build(&style_elem, _doc, repr, false);
+        (&style_elem)->invoke_build(_doc, repr, false);
         TS_ASSERT( style_elem.is_css );
         TS_ASSERT( _doc->style_cascade );
         CRStyleSheet const *const stylesheet = cr_cascade_get_sheet(_doc->style_cascade, ORIGIN_AUTHOR);