X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-style-elem-test.h;h=7021be13de836a1d1cc2d0075b00928aa0e3e3ce;hb=2f0897fe50112b5e8ec11e37949077e5fd72fc38;hp=0eaf12e3388b23b30096df988ad564f1819f1094;hpb=09c8c7fa1c6b421402c2f6c9ebd80cc778f217c8;p=inkscape.git

diff --git a/src/sp-style-elem-test.h b/src/sp-style-elem-test.h
index 0eaf12e33..7021be13d 100644
--- 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();
         }
     }
 
@@ -31,9 +30,9 @@ public:
     {
         SPStyleElem *style_elem = static_cast<SPStyleElem *>(g_object_new(SP_TYPE_STYLE_ELEM, NULL));
         if ( style_elem ) {
-            UTEST_ASSERT(!style_elem->is_css);
-            UTEST_ASSERT(style_elem->media.print);
-            UTEST_ASSERT(style_elem->media.screen);
+            TS_ASSERT(!style_elem->is_css);
+            TS_ASSERT(style_elem->media.print);
+            TS_ASSERT(style_elem->media.screen);
             g_object_unref(style_elem);
 
             dst = new SPStyleElemTest();
@@ -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);
@@ -74,17 +73,17 @@ public:
     void testWrite()
     {
         TS_ASSERT( _doc );
-        TS_ASSERT( sp_document_repr_doc(_doc) );
-        if ( !sp_document_repr_doc(_doc) ) {
+        TS_ASSERT( _doc->getReprDoc() );
+        if ( !_doc->getReprDoc() ) {
             return; // evil early return
         }
 
         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");
-        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);
+        SP_OBJECT(style_elem)->setKeyValue( SP_ATTR_TYPE, "text/css");
+        Inkscape::XML::Node *repr = _doc->getReprDoc()->createElement("svg:style");
+        SP_OBJECT(style_elem)->updateRepr(_doc->getReprDoc(), repr, SP_OBJECT_WRITE_ALL);
         {
             gchar const *typ = repr->attribute("type");
             TS_ASSERT( typ != NULL );
@@ -100,15 +99,15 @@ public:
     void testBuild()
     {
         TS_ASSERT( _doc );
-        TS_ASSERT( sp_document_repr_doc(_doc) );
-        if ( !sp_document_repr_doc(_doc) ) {
+        TS_ASSERT( _doc->getReprDoc() );
+        if ( !_doc->getReprDoc() ) {
             return; // evil early return
         }
 
         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");
+        Inkscape::XML::Node *const repr = _doc->getReprDoc()->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 );
@@ -128,17 +127,17 @@ public:
     void testReadContent()
     {
         TS_ASSERT( _doc );
-        TS_ASSERT( sp_document_repr_doc(_doc) );
-        if ( !sp_document_repr_doc(_doc) ) {
+        TS_ASSERT( _doc->getReprDoc() );
+        if ( !_doc->getReprDoc() ) {
             return; // evil early return
         }
 
         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");
+        Inkscape::XML::Node *const repr = _doc->getReprDoc()->createElement("svg:style");
         repr->setAttribute("type", "text/css");
-        Inkscape::XML::Node *const content_repr = sp_document_repr_doc(_doc)->createTextNode(".myclass { }");
+        Inkscape::XML::Node *const content_repr = _doc->getReprDoc()->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);
@@ -163,4 +162,4 @@ public:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :