cppcheck: Convert more C-style pointer casts to GObject or C++

(bzr r11867)

8 files changed, 56 insertions, 56 deletions

diff --git a/src/common-context.cpp b/src/common-context.cpp
index 9ced41a26..9d5dbb048 100644
--- a/src/common-context.cpp
+++ b/src/common-context.cpp
@@ -56,9 +56,9 @@ GType sp_common_context_get_type(void)
 static void sp_common_context_class_init(SPCommonContextClass *klass)
 {
     GObjectClass *object_class = (GObjectClass *) klass;
-    SPEventContextClass *event_context_class = (SPEventContextClass *) klass;
+    SPEventContextClass *event_context_class = SP_EVENT_CONTEXT_CLASS(klass);
 
-    common_parent_class = (SPEventContextClass*)g_type_class_peek_parent(klass);
+    common_parent_class = SP_EVENT_CONTEXT_CLASS(g_type_class_peek_parent(klass));
 
     object_class->dispose = sp_common_context_dispose;
 
diff --git a/src/desktop-handles.cpp b/src/desktop-handles.cpp
index aed2eec34..f7ffbed70 100644
--- a/src/desktop-handles.cpp
+++ b/src/desktop-handles.cpp
@@ -44,7 +44,7 @@ sp_desktop_canvas (SPDesktop const * desktop)
 {
 	g_return_val_if_fail (desktop != NULL, NULL);
 
-	return ((SPCanvasItem *) desktop->main)->canvas;
+	return (SP_CANVAS_ITEM(desktop->main))->canvas;
 }
 
 SPCanvasItem *
diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 1a788b59a..ae243853e 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -150,7 +150,7 @@ SPCurve::concat(GSList const *list)
     SPCurve *new_curve = new SPCurve();
 
     for (GSList const *l = list; l != NULL; l = l->next) {
-        SPCurve *c = (SPCurve *) l->data;
+        SPCurve *c = static_cast<SPCurve *>(l->data);
         new_curve->_pathv.insert( new_curve->_pathv.end(), c->get_pathvector().begin(), c->get_pathvector().end() );
     }
 
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index e095fb9a9..d0c6d2d56 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -43,10 +43,9 @@
 static cairo_user_data_key_t key;
 
 static cairo_status_t font_init_cb (cairo_scaled_font_t  *scaled_font,
-                                    cairo_t */*cairo*/, cairo_font_extents_t *metrics){
-    cairo_font_face_t*  face;
-    face = cairo_scaled_font_get_font_face(scaled_font);
-    SvgFont* instance = (SvgFont*) cairo_font_face_get_user_data(face, &key);
+                                    cairo_t * /*cairo*/, cairo_font_extents_t *metrics){
+    cairo_font_face_t* face = cairo_scaled_font_get_font_face(scaled_font);
+    SvgFont* instance = static_cast<SvgFont*>(cairo_font_face_get_user_data(face, &key));
     return instance->scaled_font_init(scaled_font, metrics);
 }
 
@@ -58,9 +57,8 @@ static cairo_status_t font_text_to_glyphs_cb ( cairo_scaled_font_t  *scaled_font
                                                cairo_text_cluster_t **clusters,
                                                int                  *num_clusters,
                                                cairo_text_cluster_flags_t *flags){
-    cairo_font_face_t*  face;
-    face = cairo_scaled_font_get_font_face(scaled_font);
-    SvgFont* instance = (SvgFont*) cairo_font_face_get_user_data(face, &key);
+    cairo_font_face_t* face = cairo_scaled_font_get_font_face(scaled_font);
+    SvgFont* instance = static_cast<SvgFont*>(cairo_font_face_get_user_data(face, &key));
     return instance->scaled_font_text_to_glyphs(scaled_font, utf8, utf8_len, glyphs, num_glyphs, clusters, num_clusters, flags);
 }
 
@@ -68,9 +66,8 @@ static cairo_status_t font_render_glyph_cb (cairo_scaled_font_t  *scaled_font,
                                             unsigned long         glyph,
                                             cairo_t              *cr,
                                             cairo_text_extents_t *metrics){
-    cairo_font_face_t*  face;
-    face = cairo_scaled_font_get_font_face(scaled_font);
-    SvgFont* instance = (SvgFont*) cairo_font_face_get_user_data(face, &key);
+    cairo_font_face_t* face = cairo_scaled_font_get_font_face(scaled_font);
+    SvgFont* instance = static_cast<SvgFont*>(cairo_font_face_get_user_data(face, &key));
     return instance->scaled_font_render_glyph(scaled_font, glyph, cr, metrics);
 }
 
@@ -116,15 +113,15 @@ unsigned int size_of_substring(const char* substring, gchar* str){
 }
 
 //TODO: in these macros, verify what happens when using unicode strings.
-#define Match_VKerning_Rule (((SPVkern*)node)->u1->contains(previous_unicode[0])\
-                || ((SPVkern*)node)->g1->contains(previous_glyph_name)) &&\
-                (((SPVkern*)node)->u2->contains(this->glyphs[i]->unicode[0])\
-                || ((SPVkern*)node)->g2->contains(this->glyphs[i]->glyph_name.c_str()))
+#define Match_VKerning_Rule ((SP_VKERN(node))->u1->contains(previous_unicode[0])\
+                || (SP_VKERN(node))->g1->contains(previous_glyph_name)) &&\
+                ((SP_VKERN(node))->u2->contains(this->glyphs[i]->unicode[0])\
+                || (SP_VKERN(node))->g2->contains(this->glyphs[i]->glyph_name.c_str()))
 
-#define Match_HKerning_Rule (((SPHkern*)node)->u1->contains(previous_unicode[0])\
-                || ((SPHkern*)node)->g1->contains(previous_glyph_name)) &&\
-                (((SPHkern*)node)->u2->contains(this->glyphs[i]->unicode[0])\
-                || ((SPHkern*)node)->g2->contains(this->glyphs[i]->glyph_name.c_str()))
+#define Match_HKerning_Rule ((SP_HKERN(node))->u1->contains(previous_unicode[0])\
+                || (SP_HKERN(node))->g1->contains(previous_glyph_name)) &&\
+                ((SP_HKERN(node))->u2->contains(this->glyphs[i]->unicode[0])\
+                || (SP_HKERN(node))->g2->contains(this->glyphs[i]->glyph_name.c_str()))
 
 cairo_status_t
 SvgFont::scaled_font_text_to_glyphs (cairo_scaled_font_t  */*scaled_font*/,
@@ -187,14 +184,14 @@ SvgFont::scaled_font_text_to_glyphs (cairo_scaled_font_t  */*scaled_font*/,
                 for(SPObject* node = this->font->children;previous_unicode && node;node=node->next){
                     //apply glyph kerning if appropriate
                     if (SP_IS_HKERN(node) && is_horizontal_text && Match_HKerning_Rule ){
-                        x -= (((SPHkern*)node)->k / 1000.0);//TODO: use here the height of the font
+                        x -= ((SP_HKERN(node))->k / 1000.0);//TODO: use here the height of the font
                     }
                     if (SP_IS_VKERN(node) && !is_horizontal_text && Match_VKerning_Rule ){
-                        y -= (((SPVkern*)node)->k / 1000.0);//TODO: use here the "height" of the font
+                        y -= ((SP_VKERN(node))->k / 1000.0);//TODO: use here the "height" of the font
                     }
                 }
-                previous_unicode = (char*) this->glyphs[i]->unicode.c_str();//used for kerning checking
-                previous_glyph_name = (char*) this->glyphs[i]->glyph_name.c_str();//used for kerning checking
+                previous_unicode = const_cast<char*>(this->glyphs[i]->unicode.c_str());//used for kerning checking
+                previous_glyph_name = const_cast<char*>(this->glyphs[i]->glyph_name.c_str());//used for kerning checking
                 (*glyphs)[count].index = i;
                 (*glyphs)[count].x = x;
                 (*glyphs)[count++].y = y;
@@ -251,7 +248,7 @@ Geom::PathVector
 SvgFont::flip_coordinate_system(SPFont* spfont, Geom::PathVector pathv){
     double units_per_em = 1000;
     SPObject* obj;
-    for (obj = ((SPObject*) spfont)->children; obj; obj=obj->next){
+    for (obj = (SP_OBJECT(spfont))->children; obj; obj=obj->next){
         if (SP_IS_FONTFACE(obj)){
             //XML Tree being directly used here while it shouldn't be.
             sp_repr_get_double(obj->getRepr(), "units_per_em", &units_per_em);
@@ -282,16 +279,16 @@ SvgFont::scaled_font_render_glyph (cairo_scaled_font_t  */*scaled_font*/,
     SPObject* node;
     if (glyph == this->glyphs.size()){
         if (!this->missingglyph) return CAIRO_STATUS_SUCCESS;
-        node = (SPObject*) this->missingglyph;
+        node = SP_OBJECT(this->missingglyph);
     } else {
-        node = (SPObject*) this->glyphs[glyph];
+        node = SP_OBJECT(this->glyphs[glyph]);
     }
 
     if (!SP_IS_GLYPH(node) && !SP_IS_MISSING_GLYPH(node)) {
         return CAIRO_STATUS_SUCCESS;  // FIXME: is this the right code to return?
     }
 
-    SPFont* spfont = (SPFont*) node->parent;
+    SPFont* spfont = SP_FONT(node->parent);
     if (!spfont) {
         return CAIRO_STATUS_SUCCESS;  // FIXME: is this the right code to return?
     }
@@ -300,12 +297,12 @@ SvgFont::scaled_font_render_glyph (cairo_scaled_font_t  */*scaled_font*/,
     // or using the d attribute of a glyph node.
     // pathv stores the path description from the d attribute:
     Geom::PathVector pathv;
-    if (SP_IS_GLYPH(node) && ((SPGlyph*)node)->d) {
-        pathv = sp_svg_read_pathv(((SPGlyph*)node)->d);
+    if (SP_IS_GLYPH(node) && (SP_GLYPH(node))->d) {
+        pathv = sp_svg_read_pathv((SP_GLYPH(node))->d);
         pathv = flip_coordinate_system(spfont, pathv);
         this->render_glyph_path(cr, &pathv);
-    } else if (SP_IS_MISSING_GLYPH(node) && ((SPMissingGlyph*)node)->d) {
-        pathv = sp_svg_read_pathv(((SPMissingGlyph*)node)->d);
+    } else if (SP_IS_MISSING_GLYPH(node) && (SP_MISSING_GLYPH(node))->d) {
+        pathv = sp_svg_read_pathv((SP_MISSING_GLYPH(node))->d);
         pathv = flip_coordinate_system(spfont, pathv);
         this->render_glyph_path(cr, &pathv);
     }
@@ -314,7 +311,7 @@ SvgFont::scaled_font_render_glyph (cairo_scaled_font_t  */*scaled_font*/,
         //render the SVG described on this glyph's child nodes.
         for(node = node->children; node; node=node->next){
             if (SP_IS_PATH(node)){
-                pathv = ((SPShape*)node)->_curve->get_pathvector();
+                pathv = (SP_SHAPE(node))->_curve->get_pathvector();
                 pathv = flip_coordinate_system(spfont, pathv);
                 this->render_glyph_path(cr, &pathv);
             }
@@ -324,12 +321,12 @@ SvgFont::scaled_font_render_glyph (cairo_scaled_font_t  */*scaled_font*/,
             if (SP_IS_USE(node)){
                 SPItem* item = SP_USE(node)->ref->getObject();
                 if (SP_IS_PATH(item)){
-                    pathv = ((SPShape*)item)->_curve->get_pathvector();
+                    pathv = (SP_SHAPE(item))->_curve->get_pathvector();
                     pathv = flip_coordinate_system(spfont, pathv);
                     this->render_glyph_path(cr, &pathv);
                 }
 
-                glyph_modified_connection = ((SPObject*) item)->connectModified(sigc::mem_fun(*this, &SvgFont::glyph_modified));
+                glyph_modified_connection = (SP_OBJECT(item))->connectModified(sigc::mem_fun(*this, &SvgFont::glyph_modified));
             }
         }
     }
@@ -342,10 +339,10 @@ SvgFont::get_font_face(){
     if (!this->userfont) {
         for(SPObject* node = this->font->children;node;node=node->next){
             if (SP_IS_GLYPH(node)){
-                this->glyphs.push_back((SPGlyph*)node);
+                this->glyphs.push_back(SP_GLYPH(node));
             }
             if (SP_IS_MISSING_GLYPH(node)){
-                this->missingglyph=(SPMissingGlyph*)node;
+                this->missingglyph=SP_MISSING_GLYPH(node);
             }
         }
         this->userfont = new UserFont(this);
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 6f89e862e..e9d0aa935 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -845,8 +845,8 @@ public:
         Inkscape::Preferences::Observer(path), _ec(ec) {
     }
     virtual void notify(Inkscape::Preferences::Entry const &val) {
-        if (((SPEventContextClass *) G_OBJECT_GET_CLASS(_ec))->set) {
-            ((SPEventContextClass *) G_OBJECT_GET_CLASS(_ec))->set(_ec,
+        if ((SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(_ec)))->set) {
+            (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(_ec)))->set(_ec,
                     const_cast<Inkscape::Preferences::Entry*> (&val));
         }
     }
@@ -879,8 +879,8 @@ sp_event_context_new(GType type, SPDesktop *desktop, gchar const *pref_path,
         prefs->addObserver(*(ec->pref_observer));
     }
 
-    if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->setup)
-        ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->setup(ec);
+    if ((SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->setup)
+        (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->setup(ec);
 
     return ec;
 }
@@ -898,8 +898,8 @@ void sp_event_context_finish(SPEventContext *ec) {
         g_warning("Finishing event context with active link\n");
     }
 
-    if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->finish)
-        ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->finish(ec);
+    if ((SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->finish)
+        (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->finish(ec);
 }
 
 //-------------------------------member functions
@@ -955,11 +955,11 @@ void sp_event_context_read(SPEventContext *ec, gchar const *key) {
     g_return_if_fail(SP_IS_EVENT_CONTEXT(ec));
     g_return_if_fail(key != NULL);
 
-    if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->set) {
+    if ((SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->set) {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         Inkscape::Preferences::Entry val = prefs->getEntry(
                 ec->pref_observer->observed_path + '/' + key);
-        ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->set(ec, &val);
+        (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->set(ec, &val);
     }
 }
 
@@ -975,8 +975,8 @@ void sp_event_context_activate(SPEventContext *ec) {
     // context should take care of this by itself.
     sp_event_context_discard_delayed_snap_event(ec);
 
-    if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->activate)
-        ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->activate(ec);
+    if ((SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->activate)
+        (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->activate(ec);
 }
 
 /**
@@ -986,8 +986,8 @@ void sp_event_context_deactivate(SPEventContext *ec) {
     g_return_if_fail(ec != NULL);
     g_return_if_fail(SP_IS_EVENT_CONTEXT(ec));
 
-    if (((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->deactivate)
-        ((SPEventContextClass *) G_OBJECT_GET_CLASS(ec))->deactivate(ec);
+    if ((SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->deactivate)
+        (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(ec)))->deactivate(ec);
 }
 
 /**
@@ -1028,7 +1028,7 @@ gint sp_event_context_virtual_root_handler(SPEventContext * event_context, GdkEv
     gint ret = false;
     if (event_context) {    // If no event-context is available then do nothing, otherwise Inkscape would crash
                             // (see the comment in SPDesktop::set_event_context, and bug LP #622350)
-        ret = ((SPEventContextClass *) G_OBJECT_GET_CLASS(event_context))->root_handler(event_context, event);
+        ret = (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(event_context)))->root_handler(event_context, event);
         set_event_location(event_context->desktop, event);
     }
     return ret;
@@ -1067,7 +1067,7 @@ gint sp_event_context_virtual_item_handler(SPEventContext * event_context, SPIte
     gint ret = false;
     if (event_context) {    // If no event-context is available then do nothing, otherwise Inkscape would crash
                             // (see the comment in SPDesktop::set_event_context, and bug LP #622350)
-        ret = ((SPEventContextClass *) G_OBJECT_GET_CLASS(event_context))->item_handler(event_context, item, event);
+        ret = (SP_EVENT_CONTEXT_CLASS(G_OBJECT_GET_CLASS(event_context)))->item_handler(event_context, item, event);
         if (!ret) {
             ret = sp_event_context_virtual_root_handler(event_context, event);
         } else {
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index c8c187c77..0639ae8d0 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -969,7 +969,7 @@ static Geom::Affine getODFTransform(const SPItem *item)
 static Geom::OptRect getODFBoundingBox(const SPItem *item)
 {
     // TODO: geometric or visual?
-    Geom::OptRect bbox = ((SPItem *)item)->documentVisualBounds();
+    Geom::OptRect bbox = item->documentVisualBounds();
     if (bbox) {
         *bbox *= Geom::Affine(Geom::Scale(pxToCm));
     }
diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index 69e76d55f..c92a5c22f 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -140,7 +140,7 @@ public: // FIXME: make more of this private!
     }
 
     guint singleSelectedDraggerSingleDraggableType() {
-        return (selected? ((GrDraggable *) ((GrDragger *) selected->data)->draggables->data)->point_type : 0);}
+        return (selected? (static_cast<GrDraggable*>((static_cast<GrDragger*>(selected->data))->draggables->data))->point_type : 0);}
 
     // especially the selection must be private, fix gradient-context to remove direct access to it
     GList *selected; // list of GrDragger*
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 904e21960..3b1028ab8 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -3450,7 +3450,10 @@ void sp_selection_create_bitmap_copy(SPDesktop *desktop)
     // Run filter, if any
     if (run) {
         g_print("Running external filter: %s\n", run);
-        system(run);
+        int result = system(run);
+
+        if(result == -1)
+            g_warning("Could not run external filter: %s\n", run);
     }
 
     // Import the image back