cppcheck

(bzr r12382)

5 files changed, 17 insertions, 13 deletions

diff --git a/src/sp-string.cpp b/src/sp-string.cpp
index 2fe84ac6a..457c248bc 100644
--- a/src/sp-string.cpp
+++ b/src/sp-string.cpp
@@ -132,10 +132,10 @@ sp_string_update(SPObject *object, SPCtx *ctx, unsigned flags)
     if (((SPObjectClass *) sp_string_parent_class)->update)
         ((SPObjectClass *) sp_string_parent_class)->update(object, ctx, flags);
 
-    if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_MODIFIED_FLAG)) {
-        /* Parent style or we ourselves changed, so recalculate */
-        flags &= ~SP_OBJECT_USER_MODIFIED_FLAG_B; // won't be "just a transformation" anymore, we're going to recompute "x" and "y" attributes
-    }
+    // if (flags & (SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_MODIFIED_FLAG)) {
+    //     /* Parent style or we ourselves changed, so recalculate */
+    //     flags &= ~SP_OBJECT_USER_MODIFIED_FLAG_B; // won't be "just a transformation" anymore, we're going to recompute "x" and "y" attributes
+    // }
 }
 
 
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index dbd06d9e8..7f88824f7 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -195,7 +195,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index) {
     //Move each item in the selected list separately
     for (std::list<SPItem *>::iterator it(selected.begin());
          it != selected.end();
-         it++)
+         ++it)
     {
         sp_desktop_document (desktop)->ensureUpToDate();
         if (!sel_as_group)
@@ -347,7 +347,7 @@ private :
             float pos = sorted.front().bbox.min()[_orientation];
             for ( std::vector<BBoxSort> ::iterator it (sorted.begin());
                   it < sorted.end();
-                  it ++ )
+                  ++it )
             {
                 if (!Geom::are_near(pos, it->bbox.min()[_orientation], 1e-6)) {
                     Geom::Point t(0.0, 0.0);
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 4aa972296..2ae98beda 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -762,7 +762,7 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
                 double move = x;
                 for ( std::vector<BBoxSort> ::iterator it (sorted.begin());
                       it < sorted.end();
-                      it ++ )
+                      ++it )
                 {
                     sp_item_move_rel(it->item, Geom::Translate(move, 0));
                     // move each next object by x relative to previous
@@ -786,7 +786,7 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
                 double move = y;
                 for ( std::vector<BBoxSort> ::iterator it (sorted.begin());
                       it < sorted.end();
-                      it ++ )
+                      ++it )
                 {
                     sp_item_move_rel(it->item, Geom::Translate(0, move));
                     // move each next object by x relative to previous
diff --git a/src/unicoderange.cpp b/src/unicoderange.cpp
index dcf461214..67239d0d2 100644
--- a/src/unicoderange.cpp
+++ b/src/unicoderange.cpp
@@ -37,8 +37,10 @@ int
 UnicodeRange::add_range(gchar* val){
 		Urange r;
 		int i=0, count=0;
-		while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=',') i++;
-		r.start = (gchar*) malloc((i+1)*sizeof(gchar*));
+		while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=','){
+            i++;
+		}
+        r.start = (gchar*) malloc((i+1)*sizeof(gchar*));
 		strncpy(r.start, val, i);
 		r.start[i] = '\0';
 		val+=i;
@@ -50,7 +52,7 @@ UnicodeRange::add_range(gchar* val){
 			r.end = (gchar*) malloc((i+1)*sizeof(gchar*));
 			strncpy(r.end, val, i);
 			r.end[i] = '\0';
-			val+=i;
+			// val+=i;
 			count+=i;
 		} else {
 			r.end=NULL;
diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp
index 00b00ce38..53e73dd57 100644
--- a/src/widgets/sp-color-icc-selector.cpp
+++ b/src/widgets/sp-color-icc-selector.cpp
@@ -272,7 +272,8 @@ static void sp_color_icc_selector_class_init(SPColorICCSelectorClass *klass)
 
 
 ColorICCSelector::ColorICCSelector( SPColorSelector* csel )
-    : ColorSelector( csel )
+    : ColorSelector( csel ),
+      _impl(NULL)
 {
 }
 
@@ -429,7 +430,8 @@ ColorICCSelectorImpl::~ColorICCSelectorImpl()
 
 void ColorICCSelector::init()
 {
-    _impl = new ColorICCSelectorImpl(this);
+    if (_impl) delete(_impl);
+	_impl = new ColorICCSelectorImpl(this);
     gint row = 0;
 
     _impl->_updating = FALSE;