(cppcheck and janitorial tasks:) C-style casting to C++-style casting

(bzr r10939)

5 files changed, 16 insertions, 16 deletions

diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 7659b1688..ea9f5e5cd 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -106,7 +106,7 @@ sp_selection_layout_widget_update(SPWidget *spw, Inkscape::Selection *sel)
 static void
 sp_selection_layout_widget_modify_selection(SPWidget *spw, Inkscape::Selection *selection, guint flags, gpointer data)
 {
-    SPDesktop *desktop = (SPDesktop *) data;
+    SPDesktop *desktop = static_cast<SPDesktop *>(data);
     if ((sp_desktop_selection(desktop) == selection) // only respond to changes in our desktop
         && (flags & (SP_OBJECT_MODIFIED_FLAG        |
                      SP_OBJECT_PARENT_MODIFIED_FLAG |
@@ -119,7 +119,7 @@ sp_selection_layout_widget_modify_selection(SPWidget *spw, Inkscape::Selection *
 static void
 sp_selection_layout_widget_change_selection(SPWidget *spw, Inkscape::Selection *selection, gpointer data)
 {
-    SPDesktop *desktop = (SPDesktop *) data;
+    SPDesktop *desktop = static_cast<SPDesktop *>(data);
     if (sp_desktop_selection(desktop) == selection) { // only respond to changes in our desktop
         gboolean setActive = (selection && !selection->isEmpty());
         std::vector<GtkAction*> *contextActions = reinterpret_cast<std::vector<GtkAction*> *>(g_object_get_data(G_OBJECT(spw), "contextActions"));
@@ -330,7 +330,7 @@ static void toggle_stroke( GtkToggleAction* act, gpointer data )
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
     prefs->setBool("/options/transform/stroke", active);
-    SPDesktop *desktop = (SPDesktop *)data;
+    SPDesktop *desktop = static_cast<SPDesktop *>(data);
     if ( active ) {
         desktop->messageStack()->flash(Inkscape::INFORMATION_MESSAGE, _("Now <b>stroke width</b> is <b>scaled</b> when objects are scaled."));
     } else {
@@ -343,7 +343,7 @@ static void toggle_corners( GtkToggleAction* act, gpointer data)
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
     prefs->setBool("/options/transform/rectcorners", active);
-    SPDesktop *desktop = (SPDesktop *)data;
+    SPDesktop *desktop = static_cast<SPDesktop *>(data);
     if ( active ) {
         desktop->messageStack()->flash(Inkscape::INFORMATION_MESSAGE, _("Now <b>rounded rectangle corners</b> are <b>scaled</b> when rectangles are scaled."));
     } else {
@@ -356,7 +356,7 @@ static void toggle_gradient( GtkToggleAction *act, gpointer data )
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
     prefs->setBool("/options/transform/gradient", active);
-    SPDesktop *desktop = (SPDesktop *)data;
+    SPDesktop *desktop = static_cast<SPDesktop *>(data);
     if ( active ) {
         desktop->messageStack()->flash(Inkscape::INFORMATION_MESSAGE, _("Now <b>gradients</b> are <b>transformed</b> along with their objects when those are transformed (moved, scaled, rotated, or skewed)."));
     } else {
@@ -369,7 +369,7 @@ static void toggle_pattern( GtkToggleAction* act, gpointer data )
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
     prefs->setInt("/options/transform/pattern", active);
-    SPDesktop *desktop = (SPDesktop *)data;
+    SPDesktop *desktop = static_cast<SPDesktop *>(data);
     if ( active ) {
         desktop->messageStack()->flash(Inkscape::INFORMATION_MESSAGE, _("Now <b>patterns</b> are <b>transformed</b> along with their objects when those are transformed (moved, scaled, rotated, or skewed)."));
     } else {
diff --git a/src/widgets/sp-color-gtkselector.cpp b/src/widgets/sp-color-gtkselector.cpp
index a205abab8..5766e84c0 100644
--- a/src/widgets/sp-color-gtkselector.cpp
+++ b/src/widgets/sp-color-gtkselector.cpp
@@ -155,6 +155,6 @@ void ColorGtkselector::_gtkChanged( GtkColorSelection *colorselection, SPColorGt
 
 //     g_message( "*****  _gtkChanged   %04x %04x %04x", color.red, color.green, color.blue );
 
-    ColorGtkselector* gtkInst = (ColorGtkselector*)(SP_COLOR_SELECTOR(gtksel)->base);
+    ColorGtkselector* gtkInst = static_cast<ColorGtkselector *>(SP_COLOR_SELECTOR(gtksel)->base);
     gtkInst->_updateInternals( ourColor, static_cast< gfloat > (alpha) / 65535.0, gtk_color_selection_is_adjusting(colorselection) );
 }
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 3bd88f7c2..d2868d24b 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -815,7 +815,7 @@ void ColorICCSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorICC
     g_message( "/^^^^^^^^^  %p::_adjustmentChanged()", cs );
 #endif // DEBUG_LCMS
 
-     ColorICCSelector* iccSelector = (ColorICCSelector*)(SP_COLOR_SELECTOR(cs)->base);
+     ColorICCSelector* iccSelector = static_cast<ColorICCSelector*>(SP_COLOR_SELECTOR(cs)->base);
      if (iccSelector->_updating) {
          return;
      }
diff --git a/src/widgets/sp-color-scales.cpp b/src/widgets/sp-color-scales.cpp
index eaf81f240..262e199e9 100644
--- a/src/widgets/sp-color-scales.cpp
+++ b/src/widgets/sp-color-scales.cpp
@@ -547,7 +547,7 @@ void ColorScales::_adjustmentAnyChanged( GtkAdjustment *adjustment, SPColorScale
 void ColorScales::_sliderAnyGrabbed( SPColorSlider *slider, SPColorScales *cs )
 {
     (void)slider;
-    ColorScales* scales = (ColorScales*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorScales* scales = static_cast<ColorScales*>(SP_COLOR_SELECTOR(cs)->base);
 	if (!scales->_dragging) {
 		scales->_dragging = TRUE;
         scales->_grabbed();
@@ -558,7 +558,7 @@ void ColorScales::_sliderAnyGrabbed( SPColorSlider *slider, SPColorScales *cs )
 void ColorScales::_sliderAnyReleased( SPColorSlider *slider, SPColorScales *cs )
 {
     (void)slider;
-    ColorScales* scales = (ColorScales*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorScales* scales = static_cast<ColorScales*>(SP_COLOR_SELECTOR(cs)->base);
 	if (scales->_dragging) {
 		scales->_dragging = FALSE;
         scales->_released();
@@ -569,14 +569,14 @@ void ColorScales::_sliderAnyReleased( SPColorSlider *slider, SPColorScales *cs )
 void ColorScales::_sliderAnyChanged( SPColorSlider *slider, SPColorScales *cs )
 {
     (void)slider;
-    ColorScales* scales = (ColorScales*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorScales* scales = static_cast<ColorScales*>(SP_COLOR_SELECTOR(cs)->base);
 
     scales->_recalcColor( TRUE );
 }
 
 void ColorScales::_adjustmentChanged( SPColorScales *cs, guint channel )
 {
-	ColorScales* scales = (ColorScales*)(SP_COLOR_SELECTOR(cs)->base);
+	ColorScales* scales = static_cast<ColorScales*>(SP_COLOR_SELECTOR(cs)->base);
 	if (scales->_updating) return;
 
 	scales->_updating = TRUE;
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index 66e42e6f4..7baafb4b3 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -290,7 +290,7 @@ void ColorWheelSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorW
         gtk_adjustment_set_value( adjustment, floor (value * upper + 0.5) );
     }
 
-    ColorWheelSelector* wheelSelector = (ColorWheelSelector*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorWheelSelector* wheelSelector = static_cast<ColorWheelSelector*>(SP_COLOR_SELECTOR(cs)->base);
     if (wheelSelector->_updating) return;
 
     wheelSelector->_updating = TRUE;
@@ -304,7 +304,7 @@ void ColorWheelSelector::_adjustmentChanged( GtkAdjustment *adjustment, SPColorW
 void ColorWheelSelector::_sliderGrabbed( SPColorSlider *slider, SPColorWheelSelector *cs )
 {
     (void)slider;
-    ColorWheelSelector* wheelSelector = (ColorWheelSelector*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorWheelSelector* wheelSelector = static_cast<ColorWheelSelector*>(SP_COLOR_SELECTOR(cs)->base);
     if (!wheelSelector->_dragging) {
         wheelSelector->_dragging = TRUE;
         wheelSelector->_grabbed();
@@ -317,7 +317,7 @@ void ColorWheelSelector::_sliderGrabbed( SPColorSlider *slider, SPColorWheelSele
 void ColorWheelSelector::_sliderReleased( SPColorSlider *slider, SPColorWheelSelector *cs )
 {
     (void)slider;
-    ColorWheelSelector* wheelSelector = (ColorWheelSelector*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorWheelSelector* wheelSelector = static_cast<ColorWheelSelector*>(SP_COLOR_SELECTOR(cs)->base);
     if (wheelSelector->_dragging) {
         wheelSelector->_dragging = FALSE;
         wheelSelector->_released();
@@ -330,7 +330,7 @@ void ColorWheelSelector::_sliderReleased( SPColorSlider *slider, SPColorWheelSel
 void ColorWheelSelector::_sliderChanged( SPColorSlider *slider, SPColorWheelSelector *cs )
 {
     (void)slider;
-    ColorWheelSelector* wheelSelector = (ColorWheelSelector*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorWheelSelector* wheelSelector = static_cast<ColorWheelSelector*>(SP_COLOR_SELECTOR(cs)->base);
 
     preserve_icc(&wheelSelector->_color, cs);
     wheelSelector->_updateInternals( wheelSelector->_color, ColorScales::getScaled( wheelSelector->_adj ), wheelSelector->_dragging );