ColorSlider coding style

(bzr r13341.6.32)

5 files changed, 62 insertions, 52 deletions

diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index fc64fad6f..711942e28 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -76,7 +76,7 @@ ColorSlider::ColorSlider(Gtk::Adjustment* adjustment)
     _b1 = 0xa0;
     _bmask = 0x08;
 
-    set_adjustment(adjustment);
+    setAdjustment(adjustment);
 }
 
 ColorSlider::~ColorSlider() {
@@ -95,7 +95,7 @@ ColorSlider::~ColorSlider() {
 void ColorSlider::on_realize() {
     set_realized();
 
-    if(!_refGdkWindow)
+    if(!_gdk_window)
     {
       GdkWindowAttr attributes;
       gint attributes_mask;
@@ -126,10 +126,10 @@ void ColorSlider::on_realize() {
       attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 #endif
 
-      _refGdkWindow = Gdk::Window::create(get_parent_window(), &attributes,
+      _gdk_window = Gdk::Window::create(get_parent_window(), &attributes,
               attributes_mask);
-      set_window(_refGdkWindow);
-      _refGdkWindow->set_user_data(gobj());
+      set_window(_gdk_window);
+      _gdk_window->set_user_data(gobj());
 
 #if !GTK_CHECK_VERSION(3,0,0)
       style_attach();
@@ -138,7 +138,7 @@ void ColorSlider::on_realize() {
 }
 
 void ColorSlider::on_unrealize() {
-    _refGdkWindow.reset();
+    _gdk_window.reset();
 
     Gtk::Widget::on_unrealize();
 }
@@ -147,7 +147,7 @@ void ColorSlider::on_size_allocate(Gtk::Allocation& allocation) {
     set_allocation(allocation);
 
     if (get_realized()) {
-        _refGdkWindow->move_resize(allocation.get_x(), allocation.get_y(),
+        _gdk_window->move_resize(allocation.get_x(), allocation.get_y(),
                 allocation.get_width(), allocation.get_height());
     }
 }
@@ -192,7 +192,7 @@ bool ColorSlider::on_expose_event(GdkEventExpose* event) {
     bool result = false;
 
     if (get_is_drawable()) {
-        Cairo::RefPtr<Cairo::Context> cr = _refGdkWindow->create_cairo_context();
+        Cairo::RefPtr<Cairo::Context> cr = _gdk_window->create_cairo_context();
         result = on_draw(cr);
     }
     return result;
@@ -218,7 +218,7 @@ bool ColorSlider::on_button_press_event(GdkEventButton *event) {
 
 #if GTK_CHECK_VERSION(3,0,0)
         gdk_device_grab(gdk_event_get_device(reinterpret_cast<GdkEvent *>(event)),
-                _refGdkWindow->gobj(),
+                _gdk_window->gobj(),
                 GDK_OWNERSHIP_NONE,
                 FALSE,
                 static_cast<GdkEventMask>(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK),
@@ -272,9 +272,9 @@ bool ColorSlider::on_motion_notify_event(GdkEventMotion *event) {
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-void ColorSlider::set_adjustment(Glib::RefPtr<Gtk::Adjustment> adjustment) {
+void ColorSlider::setAdjustment(Glib::RefPtr<Gtk::Adjustment> adjustment) {
 #else
-void ColorSlider::set_adjustment(Gtk::Adjustment *adjustment) {
+void ColorSlider::setAdjustment(Gtk::Adjustment *adjustment) {
 #endif
     if (!adjustment) {
 #if GTK_CHECK_VERSION(3,0,0)
@@ -298,21 +298,21 @@ void ColorSlider::set_adjustment(Gtk::Adjustment *adjustment) {
 
         _adjustment = adjustment;
         _adjustment_changed_connection = _adjustment->signal_changed().connect(
-                sigc::mem_fun(this, &ColorSlider::_on_adjustment_changed));
+                sigc::mem_fun(this, &ColorSlider::_onAdjustmentChanged));
         _adjustment_value_changed_connection = _adjustment->signal_value_changed().connect(
-                sigc::mem_fun(this, &ColorSlider::_on_adjustment_value_changed));
+                sigc::mem_fun(this, &ColorSlider::_onAdjustmentValueChanged));
 
         _value = ColorScales::getScaled(_adjustment->gobj());
 
-        _on_adjustment_changed();
+        _onAdjustmentChanged();
     }
 }
 
-void ColorSlider::_on_adjustment_changed() {
+void ColorSlider::_onAdjustmentChanged() {
     queue_draw();
 }
 
-void ColorSlider::_on_adjustment_value_changed() {
+void ColorSlider::_onAdjustmentValueChanged() {
     if (_value != ColorScales::getScaled( _adjustment->gobj() )) {
         gint cx, cy, cw, ch;
 #if GTK_CHECK_VERSION(3,0,0)
@@ -346,7 +346,7 @@ void ColorSlider::_on_adjustment_value_changed() {
     }
 }
 
-void ColorSlider::set_colors(guint32 start, guint32 mid, guint32 end) {
+void ColorSlider::setColors(guint32 start, guint32 mid, guint32 end) {
     // Remove any map, if set
     _map = 0;
 
@@ -368,13 +368,13 @@ void ColorSlider::set_colors(guint32 start, guint32 mid, guint32 end) {
     queue_draw();
 }
 
-void ColorSlider::set_map(const guchar *map) {
+void ColorSlider::setMap(const guchar *map) {
     _map = const_cast<guchar *>(map);
 
     queue_draw();
 }
 
-void ColorSlider::set_background(guint dark, guint light, guint size) {
+void ColorSlider::setBackground(guint dark, guint light, guint size) {
     _b0 = dark;
     _b1 = light;
     _bmask = size;
diff --git a/src/ui/widget/color-slider.h b/src/ui/widget/color-slider.h
index bbc14afc9..ef54c84e6 100644
--- a/src/ui/widget/color-slider.h
+++ b/src/ui/widget/color-slider.h
@@ -1,6 +1,3 @@
-#ifndef __SP_COLOR_SLIDER_H__
-#define __SP_COLOR_SLIDER_H__
-
 /* Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *
@@ -9,6 +6,9 @@
  * This code is in public domain
  */
 
+#ifndef SEEN_COLOR_SLIDER_H
+#define SEEN_COLOR_SLIDER_H
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -40,16 +40,16 @@ public:
     ~ColorSlider();
 
 #if GTK_CHECK_VERSION(3,0,0)
-    void set_adjustment(Glib::RefPtr<Gtk::Adjustment> adjustment);
+    void setAdjustment(Glib::RefPtr<Gtk::Adjustment> adjustment);
 #else
-    void set_adjustment(Gtk::Adjustment *adjustment);
+    void setAdjustment(Gtk::Adjustment *adjustment);
 #endif
 
-    void set_colors(guint32 start, guint32 mid, guint32 end);
+    void setColors(guint32 start, guint32 mid, guint32 end);
 
-    void set_map(const guchar* map);
+    void setMap(const guchar* map);
 
-    void set_background(guint dark, guint light, guint size);
+    void setBackground(guint dark, guint light, guint size);
 
     sigc::signal<void> signal_grabbed;
     sigc::signal<void> signal_dragged;
@@ -76,8 +76,8 @@ protected:
 #endif
 
 private:
-    void _on_adjustment_changed();
-    void _on_adjustment_value_changed();
+    void _onAdjustmentChanged();
+    void _onAdjustmentValueChanged();
 
     bool _dragging;
 
@@ -98,7 +98,7 @@ private:
     gint _mapsize;
     guchar *_map;
 
-    Glib::RefPtr<Gdk::Window> _refGdkWindow;
+    Glib::RefPtr<Gdk::Window> _gdk_window;
 };
 
 }//namespace Widget
@@ -106,3 +106,13 @@ private:
 }//namespace Inkscape
 
 #endif
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 69818ba99..cd1586661 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -575,7 +575,7 @@ void ColorICCSelector::init()
 
     attachToGridOrTable(t, _impl->_slider->gobj(), 1, row, 1, 1, true);
 
-    _impl->_slider->set_colors(SP_RGBA32_F_COMPOSE( 1.0, 1.0, 1.0, 0.0 ),
+    _impl->_slider->setColors(SP_RGBA32_F_COMPOSE( 1.0, 1.0, 1.0, 0.0 ),
                                SP_RGBA32_F_COMPOSE( 1.0, 1.0, 1.0, 0.5 ),
                                SP_RGBA32_F_COMPOSE( 1.0, 1.0, 1.0, 1.0 ) );
 
@@ -906,7 +906,7 @@ void ColorICCSelectorImpl::_setProfile( SVGICCColor* profile )
                     _compUI[i]._slider->set_tooltip_text((i < things.size()) ?  things[i].tip.c_str() : "");
                     gtk_widget_set_tooltip_text( _compUI[i]._btn, (i < things.size()) ?  things[i].tip.c_str() : "" );
 
-                    _compUI[i]._slider->set_colors(SPColor(0.0, 0.0, 0.0).toRGBA32(0xff),
+                    _compUI[i]._slider->setColors(SPColor(0.0, 0.0, 0.0).toRGBA32(0xff),
                                                    SPColor(0.5, 0.5, 0.5).toRGBA32(0xff),
                                                    SPColor(1.0, 1.0, 1.0).toRGBA32(0xff) );
 /*
@@ -982,7 +982,7 @@ void ColorICCSelectorImpl::_updateSliders( gint ignore )
                         cmsHTRANSFORM trans = _prof->getTransfToSRGB8();
                         if ( trans ) {
                             cmsDoTransform( trans, scratch, _compUI[i]._map, 1024 );
-                            _compUI[i]._slider->set_map(_compUI[i]._map);
+                            _compUI[i]._slider->setMap(_compUI[i]._map);
                         }
                     }
                 }
@@ -997,7 +997,7 @@ void ColorICCSelectorImpl::_updateSliders( gint ignore )
     guint32 mid = _owner->_color.toRGBA32( 0x7f );
     guint32 end = _owner->_color.toRGBA32( 0xff );
 
-    _slider->set_colors(start, mid, end);
+    _slider->setColors(start, mid, end);
 }
 
 
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index d7466be98..3d9de650c 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -446,7 +446,7 @@ void ColorScales::setMode(SPColorScalesMode mode)
 		gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:"));
 		_s[3]->set_tooltip_text(_("Alpha (opacity)"));
 		gtk_widget_set_tooltip_text (_b[3], _("Alpha (opacity)"));
-		_s[0]->set_map(NULL);
+		_s[0]->setMap(NULL);
 		gtk_widget_hide (_l[4]);
 		_s[4]->hide();
 		gtk_widget_hide (_b[4]);
@@ -472,7 +472,7 @@ void ColorScales::setMode(SPColorScalesMode mode)
 		gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[3]), _("_A:"));
 		_s[3]->set_tooltip_text(_("Alpha (opacity)"));
 		gtk_widget_set_tooltip_text (_b[3], _("Alpha (opacity)"));
-		_s[0]->set_map((guchar *)(sp_color_scales_hue_map()));
+		_s[0]->setMap((guchar *)(sp_color_scales_hue_map()));
 		gtk_widget_hide (_l[4]);
 		_s[4]->hide();
 		gtk_widget_hide (_b[4]);
@@ -503,7 +503,7 @@ void ColorScales::setMode(SPColorScalesMode mode)
 		gtk_label_set_markup_with_mnemonic (GTK_LABEL (_l[4]), _("_A:"));
 		_s[4]->set_tooltip_text(_("Alpha (opacity)"));
 		gtk_widget_set_tooltip_text (_b[4], _("Alpha (opacity)"));
-		_s[0]->set_map(NULL);
+		_s[0]->setMap(NULL);
 		gtk_widget_show (_l[4]);
 		_s[4]->show();
 		gtk_widget_show (_b[4]);
@@ -625,25 +625,25 @@ void ColorScales::_updateSliders( guint channels )
 	case SP_COLOR_SCALES_MODE_RGB:
 		if ((channels != CSC_CHANNEL_R) && (channels != CSC_CHANNEL_A)) {
 			/* Update red */
-		    _s[0]->set_colors(SP_RGBA32_F_COMPOSE (0.0, getScaled(_a[1]), getScaled(_a[2]), 1.0),
+		    _s[0]->setColors(SP_RGBA32_F_COMPOSE (0.0, getScaled(_a[1]), getScaled(_a[2]), 1.0),
 							  SP_RGBA32_F_COMPOSE (0.5, getScaled(_a[1]), getScaled(_a[2]), 1.0),
 							  SP_RGBA32_F_COMPOSE (1.0, getScaled(_a[1]), getScaled(_a[2]), 1.0));
 		}
 		if ((channels != CSC_CHANNEL_G) && (channels != CSC_CHANNEL_A)) {
 			/* Update green */
-            _s[1]->set_colors(SP_RGBA32_F_COMPOSE(getScaled(_a[0]), 0.0, getScaled(_a[2]), 1.0),
+            _s[1]->setColors(SP_RGBA32_F_COMPOSE(getScaled(_a[0]), 0.0, getScaled(_a[2]), 1.0),
                               SP_RGBA32_F_COMPOSE(getScaled(_a[0]), 0.5, getScaled(_a[2]), 1.0),
                               SP_RGBA32_F_COMPOSE(getScaled(_a[0]), 1.0, getScaled(_a[2]), 1.0));
 		}
 		if ((channels != CSC_CHANNEL_B) && (channels != CSC_CHANNEL_A)) {
 			/* Update blue */
-		    _s[2]->set_colors(SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), 0.0, 1.0),
+		    _s[2]->setColors(SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), 0.0, 1.0),
                               SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), 0.5, 1.0),
                               SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), 1.0, 1.0));
 		}
 		if (channels != CSC_CHANNEL_A) {
 			/* Update alpha */
-		    _s[3]->set_colors(SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 0.0),
+		    _s[3]->setColors(SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 0.0),
                               SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 0.5),
                               SP_RGBA32_F_COMPOSE (getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 1.0));
 		}
@@ -655,7 +655,7 @@ void ColorScales::_updateSliders( guint channels )
 			sp_color_hsl_to_rgb_floatv (rgb0, getScaled(_a[0]), 0.0, getScaled(_a[2]));
 			sp_color_hsl_to_rgb_floatv (rgbm, getScaled(_a[0]), 0.5, getScaled(_a[2]));
 			sp_color_hsl_to_rgb_floatv (rgb1, getScaled(_a[0]), 1.0, getScaled(_a[2]));
-			_s[1]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
+			_s[1]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgbm[0], rgbm[1], rgbm[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgb1[0], rgb1[1], rgb1[2], 1.0));
 		}
@@ -664,14 +664,14 @@ void ColorScales::_updateSliders( guint channels )
 			sp_color_hsl_to_rgb_floatv (rgb0, getScaled(_a[0]), getScaled(_a[1]), 0.0);
 			sp_color_hsl_to_rgb_floatv (rgbm, getScaled(_a[0]), getScaled(_a[1]), 0.5);
 			sp_color_hsl_to_rgb_floatv (rgb1, getScaled(_a[0]), getScaled(_a[1]), 1.0);
-			_s[2]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
+			_s[2]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
 			                  SP_RGBA32_F_COMPOSE (rgbm[0], rgbm[1], rgbm[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgb1[0], rgb1[1], rgb1[2], 1.0));
 		}
 		if (channels != CSC_CHANNEL_A) {
 			/* Update alpha */
 			sp_color_hsl_to_rgb_floatv (rgb0, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]));
-			_s[3]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 0.0),
+			_s[3]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 0.0),
                               SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 0.5),
                               SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0));
 		}
@@ -682,7 +682,7 @@ void ColorScales::_updateSliders( guint channels )
 			sp_color_cmyk_to_rgb_floatv (rgb0, 0.0, getScaled(_a[1]), getScaled(_a[2]), getScaled(_a[3]));
 			sp_color_cmyk_to_rgb_floatv (rgbm, 0.5, getScaled(_a[1]), getScaled(_a[2]), getScaled(_a[3]));
 			sp_color_cmyk_to_rgb_floatv (rgb1, 1.0, getScaled(_a[1]), getScaled(_a[2]), getScaled(_a[3]));
-			_s[0]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
+			_s[0]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgbm[0], rgbm[1], rgbm[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgb1[0], rgb1[1], rgb1[2], 1.0));
 		}
@@ -691,7 +691,7 @@ void ColorScales::_updateSliders( guint channels )
 			sp_color_cmyk_to_rgb_floatv (rgb0, getScaled(_a[0]), 0.0, getScaled(_a[2]), getScaled(_a[3]));
 			sp_color_cmyk_to_rgb_floatv (rgbm, getScaled(_a[0]), 0.5, getScaled(_a[2]), getScaled(_a[3]));
 			sp_color_cmyk_to_rgb_floatv (rgb1, getScaled(_a[0]), 1.0, getScaled(_a[2]), getScaled(_a[3]));
-			_s[1]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
+			_s[1]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgbm[0], rgbm[1], rgbm[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgb1[0], rgb1[1], rgb1[2], 1.0));
 		}
@@ -700,7 +700,7 @@ void ColorScales::_updateSliders( guint channels )
 			sp_color_cmyk_to_rgb_floatv (rgb0, getScaled(_a[0]), getScaled(_a[1]), 0.0, getScaled(_a[3]));
 			sp_color_cmyk_to_rgb_floatv (rgbm, getScaled(_a[0]), getScaled(_a[1]), 0.5, getScaled(_a[3]));
 			sp_color_cmyk_to_rgb_floatv (rgb1, getScaled(_a[0]), getScaled(_a[1]), 1.0, getScaled(_a[3]));
-			_s[2]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
+			_s[2]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgbm[0], rgbm[1], rgbm[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgb1[0], rgb1[1], rgb1[2], 1.0));
 		}
@@ -709,14 +709,14 @@ void ColorScales::_updateSliders( guint channels )
 			sp_color_cmyk_to_rgb_floatv (rgb0, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 0.0);
 			sp_color_cmyk_to_rgb_floatv (rgbm, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 0.5);
 			sp_color_cmyk_to_rgb_floatv (rgb1, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), 1.0);
-			_s[3]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
+			_s[3]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgbm[0], rgbm[1], rgbm[2], 1.0),
                               SP_RGBA32_F_COMPOSE (rgb1[0], rgb1[1], rgb1[2], 1.0));
 		}
 		if (channels != CSC_CHANNEL_CMYKA) {
 			/* Update alpha */
 			sp_color_cmyk_to_rgb_floatv (rgb0, getScaled(_a[0]), getScaled(_a[1]), getScaled(_a[2]), getScaled(_a[3]));
-			_s[4]->set_colors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 0.0),
+			_s[4]->setColors(SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 0.0),
                               SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 0.5),
                               SP_RGBA32_F_COMPOSE (rgb0[0], rgb0[1], rgb0[2], 1.0));
 		}
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 15177377d..2b448e075 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -181,7 +181,7 @@ void ColorWheelSelector::init()
     gtk_table_attach(GTK_TABLE (t), _slider->gobj(), 1, 2, row, row + 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), GTK_FILL, XPAD, YPAD);
 #endif
 
-    _slider->set_colors(SP_RGBA32_F_COMPOSE (1.0, 1.0, 1.0, 0.0),
+    _slider->setColors(SP_RGBA32_F_COMPOSE (1.0, 1.0, 1.0, 0.0),
                         SP_RGBA32_F_COMPOSE (1.0, 1.0, 1.0, 0.5),
                         SP_RGBA32_F_COMPOSE (1.0, 1.0, 1.0, 1.0));
 
@@ -262,7 +262,7 @@ void ColorWheelSelector::_colorChanged()
     guint32 mid = _color.toRGBA32( 0x7f );
     guint32 end = _color.toRGBA32( 0xff );
 
-    _slider->set_colors(start, mid, end);
+    _slider->setColors(start, mid, end);
 
     ColorScales::setScaled(_adj, _alpha);
 
@@ -337,7 +337,7 @@ void ColorWheelSelector::_wheelChanged( GimpColorWheel *wheel, SPColorWheelSelec
     guint32 mid = color.toRGBA32( 0x7f );
     guint32 end = color.toRGBA32( 0xff );
 
-    wheelSelector->_slider->set_colors(start, mid, end);
+    wheelSelector->_slider->setColors(start, mid, end);
 
     wheelSelector->_preserve_icc(&color);
     wheelSelector->_updateInternals( color, wheelSelector->_alpha, gimp_color_wheel_is_adjusting(wheel) );