static code analysis

(bzr r14508)

5 files changed, 37 insertions, 31 deletions

diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index fc365c435..9430feeff 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -128,6 +128,9 @@ sp_png_write_rgba_striped(SPDocument *doc,
                           int (* get_rows)(guchar const **rows, void **to_free, int row, int num_rows, void *data),
                           void *data)
 {
+    g_return_val_if_fail(filename != NULL, false);
+    g_return_val_if_fail(data != NULL, false);
+
     struct SPEBP *ebp = (struct SPEBP *) data;
     FILE *fp;
     png_structp png_ptr;
@@ -135,9 +138,6 @@ sp_png_write_rgba_striped(SPDocument *doc,
     png_color_8 sig_bit;
     png_uint_32 r;
 
-    g_return_val_if_fail(filename != NULL, false);
-    g_return_val_if_fail(data != NULL, false);
-
     /* open the file */
 
     Inkscape::IO::dump_fopen_call(filename, "M");
diff --git a/src/sp-marker.cpp b/src/sp-marker.cpp
index 9334614dc..88dfbe04e 100644
--- a/src/sp-marker.cpp
+++ b/src/sp-marker.cpp
@@ -43,14 +43,18 @@ public:
     std::vector<Inkscape::DrawingItem *> items;
 };
 
-SPMarker::SPMarker() : SPGroup(), SPViewBox() {
-
-    this->markerUnits = 0;
-    this->markerUnits_set = 0;
-
-    this->orient_mode = MARKER_ORIENT_ANGLE;
-    this->orient_set = 0;
-    this->orient = 0;
+SPMarker::SPMarker() : SPGroup(), SPViewBox(),
+    markerUnits_set(0),
+    markerUnits(0),
+    refX(),
+    refY(),
+    markerWidth(),
+    markerHeight(),
+    orient_set(0),
+    orient_mode(MARKER_ORIENT_ANGLE)
+{
+    // cppcheck-suppress useInitializationList
+	orient = 0;
 }
 
 /**
@@ -442,7 +446,7 @@ const gchar *generate_marker(std::vector<Inkscape::XML::Node*> &reprs, Geom::Rec
     const gchar *mark_id = repr->attribute("id");
     SPObject *mark_object = document->getObjectById(mark_id);
 
-    for (std::vector<Inkscape::XML::Node*>::const_iterator i=reprs.begin();i!=reprs.end();i++){
+    for (std::vector<Inkscape::XML::Node*>::const_iterator i=reprs.begin();i!=reprs.end();++i){
         Inkscape::XML::Node *node = *i;
         SPItem *copy = SP_ITEM(mark_object->appendChildRepr(node));
 
diff --git a/src/sp-star.cpp b/src/sp-star.cpp
index 51d5e6254..8a1956e3b 100644
--- a/src/sp-star.cpp
+++ b/src/sp-star.cpp
@@ -32,15 +32,16 @@
 
 #include "sp-star.h"
 
-SPStar::SPStar() : SPPolygon() {
-	this->sides = 5;
-	this->center = Geom::Point(0, 0);
+SPStar::SPStar() : SPPolygon() ,
+	sides(5),
+	center(0, 0),
+	flatsided(0),
+	rounded(0.0),
+	randomized(0.0)
+{
 	this->r[0] = 1.0;
 	this->r[1] = 0.001;
 	this->arg[0] = this->arg[1] = 0.0;
-	this->flatsided = 0;
-	this->rounded = 0.0;
-	this->randomized = 0.0;
 }
 
 SPStar::~SPStar() {
diff --git a/src/ui/uxmanager.cpp b/src/ui/uxmanager.cpp
index 051df691e..036659661 100644
--- a/src/ui/uxmanager.cpp
+++ b/src/ui/uxmanager.cpp
@@ -244,12 +244,13 @@ void UXManagerImpl::delTrack( SPDesktopWidget* dtw )
 
 void UXManagerImpl::connectToDesktop( vector<GtkWidget *> const & toolboxes, SPDesktop *desktop )
 {
-    TrackItem &tracker = trackedBoxes[desktop];
-    vector<GtkWidget*>& tracked = tracker.boxes;
-    if (desktop)
+    if (!desktop)
     {
-        tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
+        return;
     }
+    TrackItem &tracker = trackedBoxes[desktop];
+    vector<GtkWidget*>& tracked = tracker.boxes;
+    tracker.destroyConn = desktop->connectDestroy(&desktopDestructHandler);
 
     for (vector<GtkWidget*>::const_iterator it = toolboxes.begin(); it != toolboxes.end(); ++it ) {
         GtkWidget* toolbox = *it;
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index c3f301c52..b75cdb4be 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -943,8 +943,12 @@ static Glib::RefPtr<Gtk::ActionGroup> create_or_fetch_actions( SPDesktop* deskto
     };
 
     Inkscape::IconSize toolboxSize = ToolboxFactory::prefToSize("/toolbox/small");
-
     Glib::RefPtr<Gtk::ActionGroup> mainActions;
+    if (desktop == NULL)
+    {
+        return mainActions;
+    }
+
     if ( groups.find(desktop) != groups.end() ) {
         mainActions = groups[desktop];
     }
@@ -952,10 +956,7 @@ static Glib::RefPtr<Gtk::ActionGroup> create_or_fetch_actions( SPDesktop* deskto
     if ( !mainActions ) {
         mainActions = Gtk::ActionGroup::create("main");
         groups[desktop] = mainActions;
-        if (desktop)
-        {
-            desktop->connectDestroy(&desktopDestructHandler);
-        }
+        desktop->connectDestroy(&desktopDestructHandler);
     }
 
     for ( guint i = 0; i < G_N_ELEMENTS(verbsToUse); i++ ) {
@@ -1558,13 +1559,12 @@ static void toggle_snap_callback(GtkToggleAction *act, gpointer data) //data poi
 
     SPDesktop *dt = reinterpret_cast<SPDesktop*>(ptr);
     SPNamedView *nv = dt->getNamedView();
-    SPDocument *doc = nv->document;
-
-    if (dt == NULL || nv == NULL) {
-        g_warning("No desktop or namedview specified (in toggle_snap_callback)!");
+    if (nv == NULL) {
+        g_warning("No namedview specified (in toggle_snap_callback)!");
         return;
     }
 
+    SPDocument *doc = nv->document;
     Inkscape::XML::Node *repr = nv->getRepr();
 
     if (repr == NULL) {