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

(bzr r10952)

12 files changed, 68 insertions, 93 deletions

diff --git a/src/dialogs/spellcheck.cpp b/src/dialogs/spellcheck.cpp
index 53bc24211..a239837ba 100644
--- a/src/dialogs/spellcheck.cpp
+++ b/src/dialogs/spellcheck.cpp
@@ -229,7 +229,7 @@ spellcheck_text_is_valid (SPObject *root, SPItem *text)
     GSList *l = NULL;
     l = all_text_items (root, l, false, true);
     for (GSList *i = l; i; i = i->next) {
-        SPItem *item = (SPItem *) i->data;
+        SPItem *item = static_cast<SPItem *>(i->data);
         if (item == text) {
             g_slist_free (l);
             return true;
@@ -273,7 +273,7 @@ SPItem *spellcheck_get_text (SPObject *root)
     l = g_slist_sort(l, compare_text_bboxes);
 
     for (GSList *i = l; i; i = i->next) {
-        SPItem *item = (SPItem *) i->data;
+        SPItem *item = static_cast<SPItem *>(i->data);
         if (!g_slist_find (_seen_objects, item)) {
             _seen_objects = g_slist_prepend(_seen_objects, item);
             g_slist_free(l);
diff --git a/src/dom/domimpl.h b/src/dom/domimpl.h
index 4e17ce5ba..5fe508076 100644
--- a/src/dom/domimpl.h
+++ b/src/dom/domimpl.h
@@ -529,8 +529,8 @@ protected:
         {
             next    = NULL;
             key     = theKey;
-            data    = (DOMUserData *)theData;
-            handler = (UserDataHandler *)theHandler;
+            data    = const_cast<DOMUserData *>(theData);
+            handler = const_cast<UserDataHandler *>(theHandler);
         }
 
         virtual ~UserDataEntry()
diff --git a/src/dom/events.h b/src/dom/events.h
index b44df6dcd..9f44fe591 100644
--- a/src/dom/events.h
+++ b/src/dom/events.h
@@ -465,7 +465,7 @@ private:
 	        {
 	        namespaceURI = namespaceURIArg;
 	        eventType    = eventTypeArg;
-	        listener     = (EventListener *)listenerArg;
+	        listener     = const_cast<EventListener *>(listenerArg);
 	        useCapture   = useCaptureArg;
 	        }
 	
diff --git a/src/dom/ls.h b/src/dom/ls.h
index fd224ea6b..6e9a940f7 100644
--- a/src/dom/ls.h
+++ b/src/dom/ls.h
@@ -378,7 +378,7 @@ public:
      *
      */
     virtual void setFilter(const LSParserFilter *val)
-        { filter = (LSParserFilter *)val; }
+        { filter = const_cast<LSParserFilter *>(val); }
 
     /**
      *
@@ -657,7 +657,7 @@ public:
      *
      */
     virtual void setFilter(const LSSerializerFilter *val)
-        { filter = (LSSerializerFilter *)val; }
+        { filter = const_cast<LSSerializerFilter *>(val); }
 
     /**
      *
diff --git a/src/dom/util/thread.cpp b/src/dom/util/thread.cpp
index e8c06c850..d5368ef59 100644
--- a/src/dom/util/thread.cpp
+++ b/src/dom/util/thread.cpp
@@ -52,7 +52,7 @@ namespace util
 
 static DWORD WINAPI WinThreadFunction(LPVOID context)
 {
-    Thread *thread = (Thread *)context;
+    Thread *thread = static_cast<Thread *>(context);
     thread->execute();
     return 0;
 }
@@ -81,7 +81,7 @@ void Thread::sleep(unsigned long millis)
 
 void *PthreadThreadFunction(void *context)
 {
-    Thread *thread = (Thread *)context;
+    Thread *thread = static_cast<Thread *>(context);
     thread->execute();
     return NULL;
 }
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");
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index 01a5c0e75..ad7486f44 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -487,8 +487,8 @@ void FileOpenDialogImplWin32::register_preview_wnd_class()
 UINT_PTR CALLBACK FileOpenDialogImplWin32::GetOpenFileName_hookproc(
     HWND hdlg, UINT uiMsg, WPARAM, LPARAM lParam)
 {
-    FileOpenDialogImplWin32 *pImpl = (FileOpenDialogImplWin32*)
-        GetWindowLongPtr(hdlg, GWLP_USERDATA);
+    FileOpenDialogImplWin32 *pImpl = reinterpret_cast<FileOpenDialogImplWin32*>
+        (GetWindowLongPtr(hdlg, GWLP_USERDATA));
 
     switch(uiMsg)
     {
@@ -498,10 +498,10 @@ UINT_PTR CALLBACK FileOpenDialogImplWin32::GetOpenFileName_hookproc(
             HINSTANCE hInstance = GetModuleHandle(NULL);
 
             // Set the pointer to the object
-            OPENFILENAMEW *ofn = (OPENFILENAMEW*)lParam;
+            OPENFILENAMEW *ofn = reinterpret_cast<OPENFILENAMEW*>(lParam);
             SetWindowLongPtr(hdlg, GWLP_USERDATA, ofn->lCustData);
             SetWindowLongPtr(hParentWnd, GWLP_USERDATA, ofn->lCustData);
-            pImpl = (FileOpenDialogImplWin32*)ofn->lCustData;
+            pImpl = reinterpret_cast<FileOpenDialogImplWin32*>(ofn->lCustData);
             
             // Make the window a bit wider
             RECT rcRect;
@@ -614,8 +614,8 @@ UINT_PTR CALLBACK FileOpenDialogImplWin32::GetOpenFileName_hookproc(
 
 LRESULT CALLBACK FileOpenDialogImplWin32::file_dialog_subclass_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    FileOpenDialogImplWin32 *pImpl = (FileOpenDialogImplWin32*)
-        GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    FileOpenDialogImplWin32 *pImpl = reinterpret_cast<FileOpenDialogImplWin32*>
+        (GetWindowLongPtr(hwnd, GWLP_USERDATA));
 
     LRESULT lResult = CallWindowProc(pImpl->_base_window_proc, hwnd, uMsg, wParam, lParam);
 
@@ -648,8 +648,8 @@ LRESULT CALLBACK FileOpenDialogImplWin32::preview_wnd_proc(HWND hwnd, UINT uMsg,
     const int CaptionPadding = 4;
     const int IconSize = 32;
 
-    FileOpenDialogImplWin32 *pImpl = (FileOpenDialogImplWin32*)
-        GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    FileOpenDialogImplWin32 *pImpl = reinterpret_cast<FileOpenDialogImplWin32*>
+        (GetWindowLongPtr(hwnd, GWLP_USERDATA));
 
     LRESULT lResult = 0;
 
@@ -671,9 +671,9 @@ LRESULT CALLBACK FileOpenDialogImplWin32::preview_wnd_proc(HWND hwnd, UINT uMsg,
             PAINTSTRUCT paint_struct;
             HDC dc = BeginPaint(hwnd, &paint_struct);
 
-            HFONT hCaptionFont = (HFONT)SendMessage(GetParent(hwnd),
-                    WM_GETFONT, 0, 0);
-            HFONT hOldFont = (HFONT)SelectObject(dc, hCaptionFont);
+            HFONT hCaptionFont = reinterpret_cast<HFONT>(SendMessage(GetParent(hwnd),
+                    WM_GETFONT, 0, 0));
+            HFONT hOldFont = static_cast<HFONT>(SelectObject(dc, hCaptionFont));
             SetBkMode(dc, TRANSPARENT);
 
             pImpl->_mutex->lock();
@@ -682,7 +682,7 @@ LRESULT CALLBACK FileOpenDialogImplWin32::preview_wnd_proc(HWND hwnd, UINT uMsg,
             {
                 WCHAR* noFileText=(WCHAR*)g_utf8_to_utf16(_("No file selected"),
                     -1, NULL, NULL, NULL);
-                FillRect(dc, &rcClient, (HBRUSH)(COLOR_3DFACE + 1));
+                FillRect(dc, &rcClient, reinterpret_cast<HBRUSH>(COLOR_3DFACE + 1));
                 DrawTextW(dc,  noFileText, -1, &rcClient, 
                     DT_CENTER | DT_VCENTER | DT_NOPREFIX);
                 g_free(noFileText);
@@ -729,7 +729,7 @@ LRESULT CALLBACK FileOpenDialogImplWin32::preview_wnd_proc(HWND hwnd, UINT uMsg,
             }
             else if(pImpl->_preview_file_icon != NULL)
             {
-                FillRect(dc, &rcClient, (HBRUSH)(COLOR_3DFACE + 1));
+                FillRect(dc, &rcClient, reinterpret_cast<HBRUSH>(COLOR_3DFACE + 1));
 
                 // Draw the files icon
                 const int destX = (rcClient.right - IconSize) / 2;
@@ -755,7 +755,7 @@ LRESULT CALLBACK FileOpenDialogImplWin32::preview_wnd_proc(HWND hwnd, UINT uMsg,
             else
             {
                 // Can't show anything!
-                FillRect(dc, &rcClient, (HBRUSH)(COLOR_3DFACE + 1));
+                FillRect(dc, &rcClient, reinterpret_cast<HBRUSH>(COLOR_3DFACE + 1));
             }
 
             pImpl->_mutex->unlock();
@@ -1768,8 +1768,8 @@ void FileSaveDialogImplWin32::setSelectionType( Inkscape::Extension::Extension *
 UINT_PTR CALLBACK FileSaveDialogImplWin32::GetSaveFileName_hookproc(
     HWND hdlg, UINT uiMsg, WPARAM, LPARAM lParam)
 {
-    FileSaveDialogImplWin32 *pImpl = (FileSaveDialogImplWin32*)
-        GetWindowLongPtr(hdlg, GWLP_USERDATA);
+    FileSaveDialogImplWin32 *pImpl = reinterpret_cast<FileSaveDialogImplWin32*>
+        (GetWindowLongPtr(hdlg, GWLP_USERDATA));
 
     switch(uiMsg)
     {
@@ -1803,10 +1803,10 @@ UINT_PTR CALLBACK FileSaveDialogImplWin32::GetSaveFileName_hookproc(
             HGDIOBJ dlgFont = GetStockObject(DEFAULT_GUI_FONT);
 
             // Set the pointer to the object
-            OPENFILENAMEW *ofn = (OPENFILENAMEW*)lParam;
+            OPENFILENAMEW *ofn = reinterpret_cast<OPENFILENAMEW*>(lParam);
             SetWindowLongPtr(hdlg, GWLP_USERDATA, ofn->lCustData);
             SetWindowLongPtr(hParentWnd, GWLP_USERDATA, ofn->lCustData);
-            pImpl = (FileSaveDialogImplWin32*)ofn->lCustData;
+            pImpl = reinterpret_cast<FileSaveDialogImplWin32*>(ofn->lCustData);
 
             // Create the Title label and edit control
             pImpl->_title_label = CreateWindowEx(NULL, "STATIC", "Title:",
diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index 429aba6e8..2bcb5a157 100644
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -45,8 +45,7 @@ ColorPicker::~ColorPicker()
     _colorSelector = NULL;
 }
 
-void
-ColorPicker::setupDialog(const Glib::ustring &title)
+void ColorPicker::setupDialog(const Glib::ustring &title)
 {
     GtkWidget *dlg = GTK_WIDGET(_colorSelectorDialog.gobj());
     sp_transientize(dlg);
@@ -69,11 +68,7 @@ ColorPicker::setupDialog(const Glib::ustring &title)
 
 }
 
-
-
-
-void
-ColorPicker::setRgba32 (guint32 rgba)
+void ColorPicker::setRgba32 (guint32 rgba)
 {
     if (_in_use) return;
 
@@ -87,14 +82,12 @@ ColorPicker::setRgba32 (guint32 rgba)
     }
 }
 
-void
-ColorPicker::closeWindow()
+void ColorPicker::closeWindow()
 {
     _colorSelectorDialog.hide();
 }
 
-void
-ColorPicker::on_clicked()
+void ColorPicker::on_clicked()
 {
     if (_colorSelector)
     {
@@ -105,13 +98,11 @@ ColorPicker::on_clicked()
     _colorSelectorDialog.show();
 }
 
-void
-ColorPicker::on_changed (guint32)
+void ColorPicker::on_changed (guint32)
 {
 }
 
-void
-sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp)
+void sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp)
 {
     if (_in_use) {
         return;
@@ -124,7 +115,7 @@ sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp)
     csel->base->getColorAlpha(color, alpha);
     guint32 rgba = color.toRGBA32( alpha );
 
-    ColorPicker *ptr = (ColorPicker *)(cp);
+    ColorPicker *ptr = reinterpret_cast<ColorPicker *>(cp);
 
     (ptr->_preview).setRgba32 (rgba);