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

(bzr r10952)

5 files changed, 34 insertions, 50 deletions

diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 78f705298..ad1642da8 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -148,20 +148,17 @@ void CairoRenderContext::font_data_free(gpointer data)
     }
 }
 
-CairoRenderer*
-CairoRenderContext::getRenderer(void) const
+CairoRenderer* CairoRenderContext::getRenderer(void) const
 {
     return _renderer;
 }
 
-CairoRenderState*
-CairoRenderContext::getCurrentState(void) const
+CairoRenderState* CairoRenderContext::getCurrentState(void) const
 {
     return _state;
 }
 
-CairoRenderState*
-CairoRenderContext::getParentState(void) const
+CairoRenderState* CairoRenderContext::getParentState(void) const
 {
     // if this is the root node just return it
     if (g_slist_length(_state_stack) == 1) {
@@ -171,8 +168,7 @@ CairoRenderContext::getParentState(void) const
     }
 }
 
-void
-CairoRenderContext::setStateForStyle(SPStyle const *style)
+void CairoRenderContext::setStateForStyle(SPStyle const *style)
 {
     // only opacity & overflow is stored for now
     _state->opacity = SP_SCALE24_TO_FLOAT(style->opacity.value);
@@ -195,7 +191,7 @@ CairoRenderContext::setStateForStyle(SPStyle const *style)
  * \param width     width of the surface to be created
  * \param height    height of the surface to be created
  */
-CairoRenderContext*
+CairoRenderContext* 
 CairoRenderContext::cloneMe(double width, double height) const
 {
     g_assert( _is_valid );
@@ -213,16 +209,14 @@ CairoRenderContext::cloneMe(double width, double height) const
     return new_context;
 }
 
-CairoRenderContext*
-CairoRenderContext::cloneMe(void) const
+CairoRenderContext* CairoRenderContext::cloneMe(void) const
 {
     g_assert( _is_valid );
 
     return cloneMe(_width, _height);
 }
 
-bool
-CairoRenderContext::setImageTarget(cairo_format_t format)
+bool CairoRenderContext::setImageTarget(cairo_format_t format)
 {
     // format cannot be set on an already initialized surface
     if (_is_valid)
@@ -244,8 +238,7 @@ CairoRenderContext::setImageTarget(cairo_format_t format)
     return false;
 }
 
-bool
-CairoRenderContext::setPdfTarget(gchar const *utf8_fn)
+bool CairoRenderContext::setPdfTarget(gchar const *utf8_fn)
 {
 #ifndef CAIRO_HAS_PDF_SURFACE
     return false;
@@ -327,8 +320,7 @@ CairoRenderContext::setPdfTarget(gchar const *utf8_fn)
     return true;
 }
 
-bool
-CairoRenderContext::setPsTarget(gchar const *utf8_fn)
+bool CairoRenderContext::setPsTarget(gchar const *utf8_fn)
 {
 #ifndef CAIRO_HAS_PS_SURFACE
     return false;
@@ -513,8 +505,7 @@ CairoRenderContext::getClipMode(void) const
     return _clip_mode;
 }
 
-CairoRenderState*
-CairoRenderContext::_createState(void)
+CairoRenderState* CairoRenderContext::_createState(void)
 {
     CairoRenderState *state = (CairoRenderState*)g_try_malloc(sizeof(CairoRenderState));
     g_assert( state != NULL );
@@ -531,8 +522,7 @@ CairoRenderContext::_createState(void)
     return state;
 }
 
-void
-CairoRenderContext::pushLayer(void)
+void CairoRenderContext::pushLayer(void)
 {
     g_assert( _is_valid );
 
@@ -937,8 +927,7 @@ CairoRenderContext::setTransform(Geom::Affine const &transform)
     _state->transform = transform;
 }
 
-Geom::Affine
-CairoRenderContext::getTransform() const
+Geom::Affine CairoRenderContext::getTransform() const
 {
     g_assert( _is_valid );
 
@@ -954,8 +943,7 @@ CairoRenderContext::getTransform() const
     return ret;
 }
 
-Geom::Affine
-CairoRenderContext::getParentTransform() const
+Geom::Affine CairoRenderContext::getParentTransform() const
 {
     g_assert( _is_valid );
 
@@ -963,8 +951,7 @@ CairoRenderContext::getParentTransform() const
     return parent_state->transform;
 }
 
-void
-CairoRenderContext::pushState(void)
+void CairoRenderContext::pushState(void)
 {
     g_assert( _is_valid );
 
@@ -977,8 +964,7 @@ CairoRenderContext::pushState(void)
     _state = new_state;
 }
 
-void
-CairoRenderContext::popState(void)
+void CairoRenderContext::popState(void)
 {
     g_assert( _is_valid );
 
@@ -986,7 +972,7 @@ CairoRenderContext::popState(void)
 
     g_free(_state_stack->data);
     _state_stack = g_slist_remove_link(_state_stack, _state_stack);
-    _state = (CairoRenderState*)_state_stack->data;
+    _state = static_cast<CairoRenderState*>(_state_stack->data);
 
     g_assert( g_slist_length(_state_stack) > 0 );
 }
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 937736630..554822dea 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -1480,7 +1480,7 @@ void PdfParser::doPatternFillFallback(GBool eoFill) {
   case 1:
     break;
   case 2:
-    doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
+    doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), gFalse, eoFill);
     break;
   default:
     error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
@@ -1499,7 +1499,7 @@ void PdfParser::doPatternStrokeFallback() {
   case 1:
     break;
   case 2:
-    doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
+    doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), gTrue, gFalse);
     break;
   default:
     error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
@@ -1593,7 +1593,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
   // do shading type-specific operations
   switch (shading->getType()) {
   case 1:
-    doFunctionShFill((GfxFunctionShading *)shading);
+    doFunctionShFill(static_cast<GfxFunctionShading *>(shading));
     break;
   case 2:
   case 3:
@@ -1601,11 +1601,11 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
     break;
   case 4:
   case 5:
-    doGouraudTriangleShFill((GfxGouraudTriangleShading *)shading);
+    doGouraudTriangleShFill(static_cast<GfxGouraudTriangleShading *>(shading));
     break;
   case 6:
   case 7:
-    doPatchMeshShFill((GfxPatchMeshShading *)shading);
+    doPatchMeshShFill(static_cast<GfxPatchMeshShading *>(shading));
     break;
   }
 
@@ -1689,7 +1689,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/)
   // do shading type-specific operations
   switch (shading->getType()) {
   case 1:
-    doFunctionShFill((GfxFunctionShading *)shading);
+    doFunctionShFill(static_cast<GfxFunctionShading *>(shading));
     break;
   case 2:
   case 3:
@@ -1700,11 +1700,11 @@ void PdfParser::opShFill(Object args[], int /*numArgs*/)
     break;
   case 4:
   case 5:
-    doGouraudTriangleShFill((GfxGouraudTriangleShading *)shading);
+    doGouraudTriangleShFill(static_cast<GfxGouraudTriangleShading *>(shading));
     break;
   case 6:
   case 7:
-    doPatchMeshShFill((GfxPatchMeshShading *)shading);
+    doPatchMeshShFill(static_cast<GfxPatchMeshShading *>(shading));
     break;
   }
 
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index e8d6363f0..885bed3c9 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -600,7 +600,7 @@ void SvgBuilder::setTransform(double const *transform) {
 bool SvgBuilder::isPatternTypeSupported(GfxPattern *pattern) {
     if ( pattern != NULL ) {
         if ( pattern->getType() == 2 ) {    // shading pattern
-            GfxShading *shading = ((GfxShadingPattern *)pattern)->getShading();
+            GfxShading *shading = (static_cast<GfxShadingPattern *>(pattern))->getShading();
             int shadingType = shading->getType();
             if ( shadingType == 2 || // axial shading
                  shadingType == 3 ) {   // radial shading
@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
     gchar *id = NULL;
     if ( pattern != NULL ) {
         if ( pattern->getType() == 2 ) {  // Shading pattern
-            GfxShadingPattern *shading_pattern = (GfxShadingPattern*)pattern;
+            GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
             double *ptm;
             double ittm[6];	// invert ttm
             double m[6] = {1, 0, 0, 1, 0, 0};
@@ -653,7 +653,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
                                  m,
                                  !is_stroke);
         } else if ( pattern->getType() == 1 ) {   // Tiling pattern
-            id = _createTilingPattern((GfxTilingPattern*)pattern, state, is_stroke);
+            id = _createTilingPattern(static_cast<GfxTilingPattern*>(pattern), state, is_stroke);
         }
     } else {
         return NULL;
@@ -740,7 +740,7 @@ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for
 
     if ( shading->getType() == 2 ) {  // Axial shading
         gradient = _xml_doc->createElement("svg:linearGradient");
-        GfxAxialShading *axial_shading = (GfxAxialShading*)shading;
+        GfxAxialShading *axial_shading = static_cast<GfxAxialShading*>(shading);
         double x1, y1, x2, y2;
         axial_shading->getCoords(&x1, &y1, &x2, &y2);
         sp_repr_set_svg_double(gradient, "x1", x1);
@@ -753,7 +753,7 @@ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for
         func = axial_shading->getFunc(0);
     } else if (shading->getType() == 3) {   // Radial shading
         gradient = _xml_doc->createElement("svg:radialGradient");
-        GfxRadialShading *radial_shading = (GfxRadialShading*)shading;
+        GfxRadialShading *radial_shading = static_cast<GfxRadialShading*>(shading);
         double x1, y1, r1, x2, y2, r2;
         radial_shading->getCoords(&x1, &y1, &r1, &x2, &y2, &r2);
         // FIXME: the inner circle's radius is ignored here
@@ -834,9 +834,9 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
     GfxColorSpace *color_space = shading->getColorSpace();
     GfxColor temp;
     if ( shading->getType() == 2 ) {  // Axial shading
-        ((GfxAxialShading*)shading)->getColor(offset, &temp);
+        (static_cast<GfxAxialShading*>(shading))->getColor(offset, &temp);
     } else if ( shading->getType() == 3 ) { // Radial shading
-        ((GfxRadialShading*)shading)->getColor(offset, &temp);
+        (static_cast<GfxRadialShading*>(shading))->getColor(offset, &temp);
     } else {
         return false;
     }
@@ -860,7 +860,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
             _addStopToGradient(gradient, 1.0, &stop2, 1.0);
         }
     } else if ( type == 3 ) { // Stitching
-        StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+        StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
         double *bounds = stitchingFunc->getBounds();
         int num_funcs = stitchingFunc->getNumFuncs();
         // Add stops from all the stitched functions
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 8f4f8c0fa..d8c78c97d 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -35,7 +35,6 @@ namespace Extension {
 void sp_color_param_changed(SPColorSelector *csel, GObject *cp);
 
 
-/** \brief  Free the allocated data. */
 ParamColor::~ParamColor(void)
 {
 
@@ -56,7 +55,6 @@ guint32 ParamColor::set( guint32 in, SPDocument * /*doc*/, Inkscape::XML::Node *
     return _value;
 }
 
-/** \brief  Initialize the object, to do that, copy the data. */
 ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar * desc, const Parameter::_scope_t scope, bool gui_hidden, const gchar * gui_tip, Inkscape::Extension::Extension * ext, Inkscape::XML::Node * xml) :
     Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext),
     _changeSignal(0)
@@ -113,7 +111,7 @@ void sp_color_param_changed(SPColorSelector *csel, GObject *obj)
     const SPColor color = csel->base->getColor();
     float alpha = csel->base->getAlpha();
 
-    ParamColor* ptr = (ParamColor*)obj;
+    ParamColor* ptr = reinterpret_cast<ParamColor*>(obj);
     ptr->set(color.toRGBA32( alpha ), NULL, NULL);
 
     ptr->_changeSignal->emit();
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index d6cac6541..90b380643 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -113,7 +113,7 @@ ParamRadioButton::ParamRadioButton (const gchar * name,
     // for simplicity : default to the contents of the first xml-child
     const char * defaultval = NULL;
     if (choices) {
-        defaultval = ((optionentry*) choices->data)->value->c_str();
+        defaultval = (static_cast<optionentry*> (choices->data))->value->c_str();
     }
 
     const char * indent = xml->attribute("indent");