Refactoring SPColor to C++ and removing legacy CMYK implementation

(bzr r3753)

4 files changed, 13 insertions, 16 deletions

diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index 59f538ab9..ecc12b23a 100644
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -332,7 +332,7 @@ select_pen(PEMF_CALLBACK_DATA d, int index)
     r = SP_COLOR_U_TO_F( GetRValue(pEmr->lopn.lopnColor) );
     g = SP_COLOR_U_TO_F( GetGValue(pEmr->lopn.lopnColor) );
     b = SP_COLOR_U_TO_F( GetBValue(pEmr->lopn.lopnColor) );
-    sp_color_set_rgb_float( &(d->style.stroke.value.color), r,g,b );
+    d->style.stroke.value.color.set( r, g, b );
 
     d->style.stroke_linejoin.computed = 1;
 
@@ -420,7 +420,7 @@ select_extpen(PEMF_CALLBACK_DATA d, int index)
     g = SP_COLOR_U_TO_F( GetGValue(pEmr->elp.elpColor) );
     b = SP_COLOR_U_TO_F( GetBValue(pEmr->elp.elpColor) );
 
-    sp_color_set_rgb_float( &(d->style.stroke.value.color), r,g,b );
+    d->style.stroke.value.color.( r, g, b );
 
     d->stroke_set = true;
 }
@@ -442,7 +442,7 @@ select_brush(PEMF_CALLBACK_DATA d, int index)
         r = SP_COLOR_U_TO_F( GetRValue(pEmr->lb.lbColor) );
         g = SP_COLOR_U_TO_F( GetGValue(pEmr->lb.lbColor) );
         b = SP_COLOR_U_TO_F( GetBValue(pEmr->lb.lbColor) );
-        sp_color_set_rgb_float( &(d->style.fill.value.color), r,g,b );
+        d->style.fill.value.color.( r, g, b );
     }
 
     d->fill_set = true;
@@ -803,7 +803,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
                                 val = 255.0 / 255.0;
                                 break;
                         }
-                        sp_color_set_rgb_float( &(d->style.fill.value.color), val,val,val );
+                        d->style.fill.value.color.set( val, val, val );
 
                         d->fill_set = true;
                         break;
@@ -817,7 +817,7 @@ myEnhMetaFileProc(HDC hDC, HANDLETABLE *lpHTable, ENHMETARECORD *lpEMFR, int nOb
                         float val = index == BLACK_PEN ? 0 : 1;
                         d->style.stroke_dasharray_set = 0;
                         d->style.stroke_width.value = 1.0;
-                        sp_color_set_rgb_float( &(d->style.stroke.value.color), val,val,val );
+                        d->style.stroke.value.color.set( val, val, val );
 
                         d->stroke_set = true;
 
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index 61e3e593e..e233515c9 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -1559,8 +1559,7 @@ bool OdfOutput::processStyle(Writer &outs, SPItem *item,
     //## FILL
     if (style->fill.isColor())
         {
-        guint32 fillCol =
-            sp_color_get_rgba32_ualpha(&style->fill.value.color, 0);
+        guint32 fillCol = style->fill.value.color.toRGBA32( 0 );
         char buf[16];
         int r = (fillCol >> 24) & 0xff;
         int g = (fillCol >> 16) & 0xff;
@@ -1578,8 +1577,7 @@ bool OdfOutput::processStyle(Writer &outs, SPItem *item,
     //## STROKE
     if (style->stroke.isColor())
         {
-        guint32 strokeCol =
-            sp_color_get_rgba32_ualpha(&style->stroke.value.color, 0);
+        guint32 strokeCol = style->stroke.value.color.toRGBA32( 0 );
         char buf[16];
         int r = (strokeCol >> 24) & 0xff;
         int g = (strokeCol >> 16) & 0xff;
diff --git a/src/extension/paramcolor.cpp b/src/extension/paramcolor.cpp
index e051fc8dc..d31dc907c 100644
--- a/src/extension/paramcolor.cpp
+++ b/src/extension/paramcolor.cpp
@@ -86,14 +86,13 @@ ParamColor::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::sign
 {
 	_changeSignal = new sigc::signal<void>(*changeSignal);
 	Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4));
-	SPColorSelector* spColorSelector = (SPColorSelector*)sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK, SP_COLORSPACE_TYPE_RGB);
+	SPColorSelector* spColorSelector = (SPColorSelector*)sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK);
 	
 	ColorSelector* colorSelector = spColorSelector->base;
 	if (_value < 1) {
 		_value = 0xFF000000;
 	}
-	SPColor *color = new SPColor();
-	sp_color_set_rgb_rgba32(color, _value);
+	SPColor *color = new SPColor( _value );
 	float alpha = (_value & 0xff) / 255.0F;
     colorSelector->setColorAlpha(*color, alpha);
 
@@ -113,7 +112,7 @@ sp_color_param_changed(SPColorSelector *csel, GObject *obj)
 	float alpha = csel->base->getAlpha();
 
     ParamColor* ptr = (ParamColor*)obj;
-	ptr->set(sp_color_get_rgba32_falpha(&color, alpha), NULL, NULL);
+	ptr->set(color.toRGBA32( alpha ), NULL, NULL);
 	
 	ptr->_changeSignal->emit();
 }
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 3247224eb..9ee9b08cd 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -50,8 +50,8 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co
     _button_pinned(NULL),
     _param_preview(NULL),
     _param_pinned(NULL),
-    _effect(effect),
-    _signal_param_change(changeSignal)
+    _signal_param_change(changeSignal),
+    _effect(effect)
 {
     Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox());
     hbox->pack_start(*controls, true, true, 6);
@@ -156,7 +156,7 @@ PrefDialog::run (void) {
 
 void
 PrefDialog::setPreviewState (Glib::ustring state) {
-
+    (void)state;
 }
 
 void