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

(bzr r10938)

6 files changed, 27 insertions, 43 deletions

diff --git a/src/style.h b/src/style.h
index 6c9ee992e..9a3d7309e 100644
--- a/src/style.h
+++ b/src/style.h
@@ -142,8 +142,8 @@ struct SPILength {
     float computed;
 };
 
-#define SP_STYLE_FILL_SERVER(s) (((SPStyle *) (s))->getFillPaintServer())
-#define SP_STYLE_STROKE_SERVER(s) (((SPStyle *) (s))->getStrokePaintServer())
+#define SP_STYLE_FILL_SERVER(s) ((const_cast<SPStyle *> (s))->getFillPaintServer())
+#define SP_STYLE_STROKE_SERVER(s) ((const_cast<SPStyle *> (s))->getStrokePaintServer())
 
 class SVGICCColor;
 
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index f58aeae10..62682b9dc 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -28,7 +28,7 @@ void hideCallback(GtkObject */*object*/, gpointer dock_ptr)
 {
     g_return_if_fail( dock_ptr != NULL );
 
-    Dock *dock = (Dock *)dock_ptr;
+    Dock *dock = static_cast<Dock *>(dock_ptr);
     dock->hide();
 }
 
@@ -36,7 +36,7 @@ void unhideCallback(GtkObject */*object*/, gpointer dock_ptr)
 {
     g_return_if_fail( dock_ptr != NULL );
 
-    Dock *dock = (Dock *)dock_ptr;
+    Dock *dock = static_cast<Dock *>(dock_ptr);
     dock->show();
 }
 
@@ -105,8 +105,7 @@ Dock::~Dock()
     g_free(_gdl_dock_bar);
 }
 
-void
-Dock::addItem(DockItem& item, DockItem::Placement placement)
+void Dock::addItem(DockItem& item, DockItem::Placement placement)
 {
     _dock_items.push_back(&item);
     gdl_dock_add_item(_gdl_dock, GDL_DOCK_ITEM(item.gobj()), (GdlDockPlacement)placement);
@@ -118,14 +117,12 @@ Dock::addItem(DockItem& item, DockItem::Placement placement)
     }
 }
 
-Gtk::Widget&
-Dock::getWidget()
+Gtk::Widget &Dock::getWidget()
 {
      return *_scrolled_window;
 }
 
-Gtk::Paned *
-Dock::getParentPaned()
+Gtk::Paned *Dock::getParentPaned()
 {
     g_return_val_if_fail(_dock_box, 0);
     Gtk::Container *parent = getWidget().get_parent();
@@ -133,20 +130,17 @@ Dock::getParentPaned()
 }
 
 
-Gtk::Paned *
-Dock::getPaned()
+Gtk::Paned *Dock::getPaned()
 {
     return _paned;
 }
 
-GtkWidget *
-Dock::getGdlWidget()
+GtkWidget *Dock::getGdlWidget()
 {
     return GTK_WIDGET(_gdl_dock);
 }
 
-bool
-Dock::isEmpty() const
+bool Dock::isEmpty() const
 {
     std::list<const DockItem *>::const_iterator
         i = _dock_items.begin(),
@@ -161,8 +155,7 @@ Dock::isEmpty() const
     return true;
 }
 
-bool
-Dock::hasIconifiedItems() const
+bool Dock::hasIconifiedItems() const
 {
     std::list<const DockItem *>::const_iterator
         i = _dock_items.begin(),
@@ -177,20 +170,17 @@ Dock::hasIconifiedItems() const
     return false;
 }
 
-void
-Dock::hide()
+void Dock::hide()
 {
     getWidget().hide();
 }
 
-void
-Dock::show()
+void Dock::show()
 {
     getWidget().show();
 }
 
-void
-Dock::toggleDockable(int width, int height)
+void Dock::toggleDockable(int width, int height)
 {
     static int prev_horizontal_position, prev_vertical_position;
 
@@ -213,8 +203,7 @@ Dock::toggleDockable(int width, int height)
 
 }
 
-void
-Dock::scrollToItem(DockItem& item)
+void Dock::scrollToItem(DockItem& item)
 {
     int item_x, item_y;
     item.getWidget().translate_coordinates(getWidget(), 0, 0, item_x, item_y);
@@ -236,8 +225,7 @@ Dock::signal_layout_changed()
                                     &_signal_layout_changed_proxy);
 }
 
-void
-Dock::_onLayoutChanged()
+void Dock::_onLayoutChanged()
 {
     if (isEmpty()) {
         if (hasIconifiedItems()) {
@@ -262,7 +250,7 @@ Dock::_onPanedButtonEvent(GdkEventButton *event)
         _paned->get_child1()->set_size_request(-1, -1);
 }
 
-gboolean
+gboolean 
 Dock::_on_paned_button_event(GtkWidget */*widget*/, GdkEventButton *event, gpointer user_data)
 {
     if (Dock *dock = static_cast<Dock *>(user_data))
diff --git a/src/ui/widget/imageicon.cpp b/src/ui/widget/imageicon.cpp
index c60e94ab7..77015bdd2 100644
--- a/src/ui/widget/imageicon.cpp
+++ b/src/ui/widget/imageicon.cpp
@@ -97,11 +97,10 @@ void ImageIcon::init()
 
 bool ImageIcon::showSvgDocument(const SPDocument *docArg)
 {
-
     if (document)
         document->doUnref();
 
-    SPDocument *doc = (SPDocument *)docArg;
+    SPDocument *doc = const_cast<SPDocument *>(docArg);
 
     doc->doRef();
     document = doc;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 66777cf6a..215edf4a2 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1451,7 +1451,7 @@ SPViewWidget *sp_desktop_widget_new( SPNamedView *namedview )
 
 SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
 {
-    SPDesktopWidget *dtw = (SPDesktopWidget*)g_object_new(SP_TYPE_DESKTOP_WIDGET, NULL);
+    SPDesktopWidget *dtw = static_cast<SPDesktopWidget*>(g_object_new(SP_TYPE_DESKTOP_WIDGET, NULL));
 
     dtw->dt2r = 1.0 / namedview->doc_units->unittobase;
 
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 9fe875d28..0f19fbc01 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -114,11 +114,10 @@ to all objects in selection. If there was no previous gradient on an item, uses
 fill/stroke setting from preferences to create new default (linear: left/right; radial: centered)
 gradient.
 */
-void
-gr_apply_gradient (Inkscape::Selection *selection, GrDrag *drag, SPGradient *gr)
+void gr_apply_gradient (Inkscape::Selection *selection, GrDrag *drag, SPGradient *gr)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    SPGradientType new_type = (SPGradientType) prefs->getInt("/tools/gradient/newgradient", SP_GRADIENT_TYPE_LINEAR);
+    SPGradientType new_type = static_cast<SPGradientType>(prefs->getInt("/tools/gradient/newgradient", SP_GRADIENT_TYPE_LINEAR));
     guint new_fill = prefs->getBool("/tools/gradient/newfillorstroke", true);
 
 
@@ -126,7 +125,7 @@ gr_apply_gradient (Inkscape::Selection *selection, GrDrag *drag, SPGradient *gr)
 
     // First try selected dragger
     if (drag && drag->selected) {
-        GrDragger *dragger = (GrDragger*) drag->selected->data;
+        GrDragger *dragger = static_cast<GrDragger*>(drag->selected->data);
         for (GSList const* i = dragger->draggables; i != NULL; i = i->next) { // for all draggables of dragger
             GrDraggable *draggable = (GrDraggable *) i->data;
             gr_apply_gradient_to_item (draggable->item, gr, new_type, new_fill, draggable->fill_or_stroke, !draggable->fill_or_stroke);
@@ -140,13 +139,12 @@ gr_apply_gradient (Inkscape::Selection *selection, GrDrag *drag, SPGradient *gr)
    }
 }
 
-void
-gr_item_activate (GtkMenuItem *menuitem, gpointer data)
+void gr_item_activate (GtkMenuItem *menuitem, gpointer data)
 {
-    SPGradient *gr = (SPGradient *) g_object_get_data (G_OBJECT (menuitem), "gradient");
+    SPGradient *gr = static_cast<SPGradient *>(g_object_get_data (G_OBJECT (menuitem), "gradient"));
     gr = sp_gradient_ensure_vector_normalized(gr);
 
-    SPDesktop *desktop = (SPDesktop *) data;
+    SPDesktop *desktop = static_cast<SPDesktop *>(data);
     Inkscape::Selection *selection = sp_desktop_selection (desktop);
     SPEventContext *ev = sp_desktop_event_context (desktop);
 
@@ -156,8 +154,7 @@ gr_item_activate (GtkMenuItem *menuitem, gpointer data)
 		       _("Assign gradient to object"));
 }
 
-gchar *
-gr_prepare_label (SPObject *obj)
+gchar *gr_prepare_label (SPObject *obj)
 {
     const gchar *id = obj->defaultLabel();
     if (strlen(id) > 15 && (!strncmp (id, "#linearGradient", 15) || !strncmp (id, "#radialGradient", 15)))
diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp
index a16f70500..66e42e6f4 100644
--- a/src/widgets/sp-color-wheel-selector.cpp
+++ b/src/widgets/sp-color-wheel-selector.cpp
@@ -250,7 +250,7 @@ sp_color_wheel_selector_new (void)
 /* Helpers for setting color value */
 
 static void preserve_icc(SPColor *color, SPColorWheelSelector *cs){
-    ColorSelector* selector = (ColorSelector*)(SP_COLOR_SELECTOR(cs)->base);
+    ColorSelector* selector = static_cast<ColorSelector*>(SP_COLOR_SELECTOR(cs)->base);
     color->icc = selector->getColor().icc ? new SVGICCColor(*selector->getColor().icc) : 0;
 }