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

[inkscape.git] / src / color-profile-test.h

diff --git a/src/color-profile-test.h b/src/color-profile-test.h
index 42893039a070b5e82274334964920a41b8b9f066..4b679e5b7e1eeff0dea1d1c035e49e9550085d97 100644 (file)
--- a/src/color-profile-test.h
+++ b/src/color-profile-test.h
@@ -25,7 +25,7 @@ public:
     {
         if ( _doc )
         {
-            sp_document_unref( _doc );
+            _doc->doUnref();
         }
     }
 
@@ -80,7 +80,7 @@ public:
 
         for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) {
             std::string descr(cases[i].attr);
-            sp_object_set(SP_OBJECT(prof), SP_ATTR_RENDERING_INTENT, cases[i].attr);
+            SP_OBJECT(prof)->setKeyValue( SP_ATTR_RENDERING_INTENT, cases[i].attr);
             TSM_ASSERT_EQUALS( descr, prof->rendering_intent, (guint)cases[i].intVal );
         }
 
@@ -99,13 +99,13 @@ public:
         SP_OBJECT(prof)->document = _doc;
 
         for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) {
-            sp_object_set(SP_OBJECT(prof), SP_ATTR_LOCAL, cases[i]);
+            SP_OBJECT(prof)->setKeyValue( SP_ATTR_LOCAL, cases[i]);
             TS_ASSERT( prof->local );
             if ( prof->local ) {
                 TS_ASSERT_EQUALS( std::string(prof->local), std::string(cases[i]) );
             }
         }
-        sp_object_set(SP_OBJECT(prof), SP_ATTR_LOCAL, NULL);
+        SP_OBJECT(prof)->setKeyValue( SP_ATTR_LOCAL, NULL);
         TS_ASSERT_EQUALS( prof->local, (gchar*)0 );
 
         g_object_unref(prof);
@@ -123,13 +123,13 @@ public:
         SP_OBJECT(prof)->document = _doc;
 
         for ( size_t i = 0; i < G_N_ELEMENTS( cases ); i++ ) {
-            sp_object_set(SP_OBJECT(prof), SP_ATTR_NAME, cases[i]);
+            SP_OBJECT(prof)->setKeyValue( SP_ATTR_NAME, cases[i]);
             TS_ASSERT( prof->name );
             if ( prof->name ) {
                 TS_ASSERT_EQUALS( std::string(prof->name), std::string(cases[i]) );
             }
         }
-        sp_object_set(SP_OBJECT(prof), SP_ATTR_NAME, NULL);
+        SP_OBJECT(prof)->setKeyValue( SP_ATTR_NAME, NULL);
         TS_ASSERT_EQUALS( prof->name, (gchar*)0 );
 
         g_object_unref(prof);