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

(bzr r10939)

10 files changed, 38 insertions, 46 deletions

diff --git a/src/selcue.cpp b/src/selcue.cpp
index 676031802..9a2d105ae 100644
--- a/src/selcue.cpp
+++ b/src/selcue.cpp
@@ -77,7 +77,7 @@ void Inkscape::SelCue::_updateItemBboxes()
 
     int bcount = 0;
     for (GSList const *l = _selection->itemList(); l != NULL; l = l->next) {
-        SPItem *item = (SPItem *) l->data;
+        SPItem *item = static_cast<SPItem *>(l->data);
         SPCanvasItem* box = _item_bboxes[bcount ++];
 
         if (box) {
@@ -119,7 +119,7 @@ void Inkscape::SelCue::_newItemBboxes()
     int prefs_bbox = prefs->getBool("/tools/bounding_box");
     
     for (GSList const *l = _selection->itemList(); l != NULL; l = l->next) {
-        SPItem *item = (SPItem *) l->data;
+        SPItem *item = static_cast<SPItem *>(l->data);
 
         Geom::OptRect const b = (prefs_bbox == 0) ?
             item->desktopVisualBounds() : item->desktopGeometricBounds();
@@ -172,7 +172,7 @@ void Inkscape::SelCue::_newTextBaselines()
     _text_baselines.clear();
 
     for (GSList const *l = _selection->itemList(); l != NULL; l = l->next) {
-        SPItem *item = (SPItem *) l->data;
+        SPItem *item = static_cast<SPItem *>(l->data);
 
         SPCanvasItem* baseline_point = NULL;
         if (SP_IS_TEXT(item) || SP_IS_FLOWTEXT(item)) { // visualize baseline
diff --git a/src/sp-desc.cpp b/src/sp-desc.cpp
index bc7f600ae..bbc47ecbb 100644
--- a/src/sp-desc.cpp
+++ b/src/sp-desc.cpp
@@ -22,8 +22,7 @@ static Inkscape::XML::Node *sp_desc_write(SPObject *object, Inkscape::XML::Docum
 
 static SPObjectClass *desc_parent_class;
 
-GType
-sp_desc_get_type (void)
+GType sp_desc_get_type (void)
 {
     static GType desc_type = 0;
 
@@ -43,17 +42,15 @@ sp_desc_get_type (void)
     return desc_type;
 }
 
-static void
-sp_desc_class_init(SPDescClass *klass)
+static void sp_desc_class_init(SPDescClass *klass)
 {
-    SPObjectClass *sp_object_class = (SPObjectClass *) klass;
-    desc_parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);;
+    SPObjectClass *sp_object_class = (SPObjectClass *)(klass);
+    desc_parent_class = (SPObjectClass *)(g_type_class_ref(SP_TYPE_OBJECT));
 
     sp_object_class->write = sp_desc_write;
 }
 
-static void
-sp_desc_init(SPDesc */*desc*/)
+static void sp_desc_init(SPDesc */*desc*/)
 {
 }
 
@@ -66,8 +63,8 @@ static Inkscape::XML::Node *sp_desc_write(SPObject *object, Inkscape::XML::Docum
         repr = object->getRepr()->duplicate(doc);
     }
 
-    if (((SPObjectClass *) desc_parent_class)->write) {
-        ((SPObjectClass *) desc_parent_class)->write(object, doc, repr, flags);
+    if ((static_cast<SPObjectClass *>(desc_parent_class))->write) {
+        (static_cast<SPObjectClass *>(desc_parent_class))->write(object, doc, repr, flags);
     }
 
     return repr;
diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index c186c7fd9..b63a05b4b 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -39,8 +39,7 @@ static Inkscape::XML::Node *sp_filter_primitive_write(SPObject *object, Inkscape
 
 static SPObjectClass *filter_primitive_parent_class;
 
-GType
-sp_filter_primitive_get_type()
+GType sp_filter_primitive_get_type()
 {
     static GType filter_primitive_type = 0;
 
@@ -60,13 +59,11 @@ sp_filter_primitive_get_type()
     return filter_primitive_type;
 }
 
-static void
-sp_filter_primitive_class_init(SPFilterPrimitiveClass *klass)
+static void sp_filter_primitive_class_init(SPFilterPrimitiveClass *klass)
 {
-    //GObjectClass *gobject_class = (GObjectClass *)klass;
-    SPObjectClass *sp_object_class = (SPObjectClass *)klass;
+    SPObjectClass *sp_object_class = (SPObjectClass *)(klass);
 
-    filter_primitive_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
+    filter_primitive_parent_class = static_cast<SPObjectClass *>(g_type_class_peek_parent(klass));
 
     sp_object_class->build = sp_filter_primitive_build;
     sp_object_class->release = sp_filter_primitive_release;
@@ -79,8 +76,7 @@ sp_filter_primitive_class_init(SPFilterPrimitiveClass *klass)
     klass->build_renderer = NULL;
 }
 
-static void
-sp_filter_primitive_init(SPFilterPrimitive *filter_primitive)
+static void sp_filter_primitive_init(SPFilterPrimitive *filter_primitive)
 {
     filter_primitive->image_in = Inkscape::Filters::NR_FILTER_SLOT_NOT_SET;
     filter_primitive->image_out = Inkscape::Filters::NR_FILTER_SLOT_NOT_SET;
@@ -104,8 +100,8 @@ sp_filter_primitive_init(SPFilterPrimitive *filter_primitive)
 static void
 sp_filter_primitive_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) filter_primitive_parent_class)->build) {
-        ((SPObjectClass *) filter_primitive_parent_class)->build(object, document, repr);
+    if ((static_cast<SPObjectClass *>(filter_primitive_parent_class))->build) {
+        (static_cast<SPObjectClass *>(filter_primitive_parent_class))->build(object, document, repr);
     }
 
     object->readAttr( "in" );
@@ -119,12 +115,11 @@ sp_filter_primitive_build(SPObject *object, SPDocument *document, Inkscape::XML:
 /**
  * Drops any allocated memory.
  */
-static void
-sp_filter_primitive_release(SPObject *object)
+static void sp_filter_primitive_release(SPObject *object)
 {
     /* deal with our children and our selves here */
-    if (((SPObjectClass *) filter_primitive_parent_class)->release)
-        ((SPObjectClass *) filter_primitive_parent_class)->release(object);
+    if ((static_cast<SPObjectClass *>(filter_primitive_parent_class))->release)
+        (static_cast<SPObjectClass *>(filter_primitive_parent_class))->release(object);
 }
 
 /**
diff --git a/src/sp-filter-reference.h b/src/sp-filter-reference.h
index 168ec1c1d..5901dca07 100644
--- a/src/sp-filter-reference.h
+++ b/src/sp-filter-reference.h
@@ -13,7 +13,7 @@ public:
     SPFilterReference(SPDocument *doc) : URIReference(doc) {}
 
     SPFilter *getObject() const {
-        return (SPFilter *)URIReference::getObject();
+        return static_cast<SPFilter *>(URIReference::getObject());
     }
 
 protected:
diff --git a/src/sp-tref-reference.h b/src/sp-tref-reference.h
index 2d12437d9..10cc25121 100644
--- a/src/sp-tref-reference.h
+++ b/src/sp-tref-reference.h
@@ -37,7 +37,7 @@ public:
     }
 
     SPItem *getObject() const {
-        return (SPItem *)URIReference::getObject();
+        return static_cast<SPItem *>(URIReference::getObject());
     }
    
     void updateObserver();
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 );