cppcheck

(bzr r10681)

27 files changed, 66 insertions, 65 deletions

diff --git a/src/dom/css.h b/src/dom/css.h
index e0e9c09ec..f62b93588 100644
--- a/src/dom/css.h
+++ b/src/dom/css.h
@@ -608,7 +608,7 @@ public:
     virtual DOMString getPropertyValue(const DOMString &propertyName)
         {
         std::vector<CSSStyleDeclarationEntry>::iterator iter;
-        for (iter=items.begin() ; iter!=items.end() ; iter++)
+        for (iter=items.begin() ; iter!=items.end() ; ++iter)
             {
             if (iter->name == propertyName)
                 return iter->value;
@@ -637,7 +637,7 @@ public:
                                      throw (dom::DOMException)
         {
         std::vector<CSSStyleDeclarationEntry>::iterator iter;
-        for (iter=items.begin() ; iter!=items.end() ; iter++)
+        for (iter=items.begin() ; iter!=items.end() ; ++iter)
             {
             if (iter->name == propertyName)
                 items.erase(iter);
@@ -652,7 +652,7 @@ public:
     virtual DOMString getPropertyPriority(const DOMString &propertyName)
         {
         std::vector<CSSStyleDeclarationEntry>::iterator iter;
-        for (iter=items.begin() ; iter!=items.end() ; iter++)
+        for (iter=items.begin() ; iter!=items.end() ; ++iter)
             {
             if (iter->name == propertyName)
                 return iter->prio;
@@ -669,7 +669,7 @@ public:
                              throw (dom::DOMException)
         {
         std::vector<CSSStyleDeclarationEntry>::iterator iter;
-        for (iter=items.begin() ; iter!=items.end() ; iter++)
+        for (iter=items.begin() ; iter!=items.end() ; ++iter)
             {
             if (iter->name == propertyName)
                 {
diff --git a/src/dom/stylesheets.h b/src/dom/stylesheets.h
index 0a96a61d7..0e76d6d4e 100644
--- a/src/dom/stylesheets.h
+++ b/src/dom/stylesheets.h
@@ -122,7 +122,7 @@ public:
                               throw (dom::DOMException)
         {
         std::vector<DOMString>::iterator iter;
-        for (iter=items.begin() ; iter!=items.end() ; iter++)
+        for (iter=items.begin() ; iter!=items.end() ; ++iter)
             {
             if (*iter == oldMedium)
                 items.erase(iter);
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index fb8d4de4b..25a93102f 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -136,7 +136,7 @@ Filter::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *d
 	Inkscape::XML::Node * defsrepr = document->doc()->getDefs()->getRepr();
 
     for(std::list<SPItem *>::iterator item = items.begin();
-            item != items.end(); item++) {
+            item != items.end(); ++item) {
         SPItem * spitem = *item;
 	Inkscape::XML::Node * node = spitem->getRepr();
 
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index 74b6a69ee..aa7073320 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -891,7 +891,7 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
         return false;
         }
 
-    for (String::iterator iter = outbuf.begin() ; iter!=outbuf.end(); iter++)
+    for (String::iterator iter = outbuf.begin() ; iter!=outbuf.end(); ++iter)
         {
         fputc(*iter, f);
         }
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index f5dea54bf..93cfa4c71 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -122,7 +122,7 @@ void SvgBuilder::_init() {
     font_factory::Default()->GetUIFamiliesAndStyles(&familyStyleMap);
     for (FamilyToStylesMap::iterator iter = familyStyleMap.begin();
          iter != familyStyleMap.end();
-         iter++) {
+         ++iter) {
         _availableFontNames.push_back(iter->first.c_str());
     }
 
@@ -1334,7 +1334,7 @@ void SvgBuilder::_flushText() {
 	}
 
         glyphs_in_a_row++;
-        i++;
+        ++i;
     }
     _container->appendChild(text_node);
     Inkscape::GC::release(text_node);
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index a29aade35..ecdc049e2 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -638,7 +638,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
     if (!f)
         return;
 
-    for (String::iterator iter = outbuf.begin() ; iter!=outbuf.end(); iter++)
+    for (String::iterator iter = outbuf.begin() ; iter!=outbuf.end(); ++iter)
         {
         int ch = *iter;
         fputc(ch, f);
diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index ece0ddc67..79bcb2087 100644
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -172,7 +172,7 @@ bool GzipInputStream::load()
 
     std::vector<unsigned char>::iterator iter;
     Bytef *p = srcBuf;
-    for (iter=inputBuf.begin() ; iter != inputBuf.end() ; iter++)
+    for (iter=inputBuf.begin() ; iter != inputBuf.end() ; ++iter)
         *p++ = *iter;
 
     int headerLen = 10;
@@ -390,7 +390,7 @@ void GzipOutputStream::flush()
         
     std::vector<unsigned char>::iterator iter;
     Bytef *p = srcbuf;
-    for (iter=inputBuf.begin() ; iter != inputBuf.end() ; iter++)
+    for (iter=inputBuf.begin() ; iter != inputBuf.end() ; ++iter)
         *p++ = *iter;
         
     crc = crc32(crc, (const Bytef *)srcbuf, srclen);
diff --git a/src/libcola/gradient_projection.h b/src/libcola/gradient_projection.h
index 9907cdb13..66fc37aba 100644
--- a/src/libcola/gradient_projection.h
+++ b/src/libcola/gradient_projection.h
@@ -203,7 +203,7 @@ public:
                 vars.push_back(v);
                 for(OffsetList::iterator o=ac->offsets.begin();
                         o!=ac->offsets.end();
-                        o++) {
+                        ++o) {
                     gcs.push_back(new vpsc::Constraint(v,vars[o->first],o->second,true));
                 }
             }
diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index 66bc8c530..45b03c38b 100644
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -34,7 +34,7 @@ void Inkscape::LineSnapper::freeSnap(IntermSnapResults &isr,
     /* Get the lines that we will try to snap to */
     const LineList lines = _getSnapLines(p.getPoint());
 
-    for (LineList::const_iterator i = lines.begin(); i != lines.end(); i++) {
+    for (LineList::const_iterator i = lines.begin(); i != lines.end(); ++i) {
         Geom::Point const p1 = i->second; // point at guide/grid line
         Geom::Point const p2 = p1 + Geom::rot90(i->first); // 2nd point at guide/grid line
         // std::cout << "  line through " << i->second << " with normal " << i->first;
@@ -78,7 +78,7 @@ void Inkscape::LineSnapper::constrainedSnap(IntermSnapResults &isr,
     /* Get the lines that we will try to snap to */
     const LineList lines = _getSnapLines(pp);
 
-    for (LineList::const_iterator i = lines.begin(); i != lines.end(); i++) {
+    for (LineList::const_iterator i = lines.begin(); i != lines.end(); ++i) {
         Geom::Point const point_on_line = c.hasPoint() ? c.getPoint() : pp;
         Geom::Line gridguide_line(i->second, i->second + Geom::rot90(i->first));
 
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index a5b2077a5..e040eec32 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -436,7 +436,7 @@ Effect::readallParameters(Inkscape::XML::Node * repr)
             param->param_set_default();
         }
 
-        it++;
+        ++it;
     }
 }
 
@@ -572,7 +572,7 @@ Effect::newWidget(Gtk::Tooltips * tooltips)
             }
         }
 
-        it++;
+        ++it;
     }
 
     return dynamic_cast<Gtk::Widget *>(vbox);
@@ -604,7 +604,7 @@ Effect::getParameter(const char * key)
             return param;
         }
 
-        it++;
+        ++it;
     }
 
     return NULL;
@@ -671,7 +671,7 @@ void
 Effect::transform_multiply(Geom::Affine const& postmul, bool set)
 {
     // cycle through all parameters. Most parameters will not need transformation, but path and point params do.
-    for (std::vector<Parameter *>::iterator it = param_vector.begin(); it != param_vector.end(); it++) {
+    for (std::vector<Parameter *>::iterator it = param_vector.begin(); it != param_vector.end(); ++it) {
         Parameter * param = *it;
         param->param_transform_multiply(postmul, set);
     }
diff --git a/src/live_effects/lpe-gears.cpp b/src/live_effects/lpe-gears.cpp
index 337beb516..ac2db1716 100644
--- a/src/live_effects/lpe-gears.cpp
+++ b/src/live_effects/lpe-gears.cpp
@@ -244,12 +244,13 @@ LPEGears::doEffect_path (std::vector<Geom::Path> const & path_in)
     gear->centre(gear_centre);
     gear->angle(atan2((*it).initialPoint() - gear_centre));
 
-    it++; if ( it == gearpath.end() ) return path_out;
+    ++it;
+	if ( it == gearpath.end() ) return path_out;
     gear->pitch_radius(Geom::distance(gear_centre, (*it).finalPoint()));
 
     path_out.push_back( gear->path());
 
-    for (it++ ; it != gearpath.end() ; it++) {
+    for (++it; it != gearpath.end() ; ++it) {
         // iterate through Geom::Curve in path_in
         Gear* gearnew = new Gear(gear->spawn( (*it).finalPoint() ));
         path_out.push_back( gearnew->path() );
diff --git a/src/live_effects/lpe-knot.cpp b/src/live_effects/lpe-knot.cpp
index 4c88ac315..c957c8f08 100644
--- a/src/live_effects/lpe-knot.cpp
+++ b/src/live_effects/lpe-knot.cpp
@@ -214,7 +214,7 @@ CrossingPoints::CrossingPoints(std::vector<Geom::Path> const &paths) : std::vect
             if (cp.j == i) cuts[cp.tj] = k;
         }
         unsigned count = 0;
-        for ( std::map < double, unsigned >::iterator m=cuts.begin(); m!=cuts.end(); m++ ){
+        for ( std::map < double, unsigned >::iterator m=cuts.begin(); m!=cuts.end(); ++m ){
             if ( (*this)[m->second].i == i && (*this)[m->second].ti == m->first ){
                 (*this)[m->second].ni = count;
             }else{
diff --git a/src/snapped-line.cpp b/src/snapped-line.cpp
index d9cd48d5b..6c0c411d8 100644
--- a/src/snapped-line.cpp
+++ b/src/snapped-line.cpp
@@ -176,7 +176,7 @@ bool getClosestSLS(std::list<Inkscape::SnappedLineSegment> const &list, Inkscape
 {
     bool success = false;
 
-    for (std::list<Inkscape::SnappedLineSegment>::const_iterator i = list.begin(); i != list.end(); i++) {
+    for (std::list<Inkscape::SnappedLineSegment>::const_iterator i = list.begin(); i != list.end(); ++i) {
         if ((i == list.begin()) || (*i).getSnapDistance() < result.getSnapDistance()) {
             result = *i;
             success = true;
@@ -191,10 +191,10 @@ bool getClosestIntersectionSLS(std::list<Inkscape::SnappedLineSegment> const &li
 {
     bool success = false;
 
-    for (std::list<Inkscape::SnappedLineSegment>::const_iterator i = list.begin(); i != list.end(); i++) {
+    for (std::list<Inkscape::SnappedLineSegment>::const_iterator i = list.begin(); i != list.end(); ++i) {
         std::list<Inkscape::SnappedLineSegment>::const_iterator j = i;
-        j++;
-        for (; j != list.end(); j++) {
+        ++j;
+        for (; j != list.end(); ++j) {
             Inkscape::SnappedPoint sp = (*i).intersect(*j);
             if (sp.getAtIntersection()) {
                 // if it's the first point
@@ -221,7 +221,7 @@ bool getClosestSL(std::list<Inkscape::SnappedLine> const &list, Inkscape::Snappe
 {
     bool success = false;
 
-    for (std::list<Inkscape::SnappedLine>::const_iterator i = list.begin(); i != list.end(); i++) {
+    for (std::list<Inkscape::SnappedLine>::const_iterator i = list.begin(); i != list.end(); ++i) {
         if ((i == list.begin()) || (*i).getSnapDistance() < result.getSnapDistance()) {
             result = *i;
             success = true;
@@ -236,10 +236,10 @@ bool getClosestIntersectionSL(std::list<Inkscape::SnappedLine> const &list, Inks
 {
     bool success = false;
 
-    for (std::list<Inkscape::SnappedLine>::const_iterator i = list.begin(); i != list.end(); i++) {
+    for (std::list<Inkscape::SnappedLine>::const_iterator i = list.begin(); i != list.end(); ++i) {
         std::list<Inkscape::SnappedLine>::const_iterator j = i;
-        j++;
-        for (; j != list.end(); j++) {
+        ++j;
+        for (; j != list.end(); ++j) {
             Inkscape::SnappedPoint sp = (*i).intersect(*j);
             if (sp.getAtIntersection()) {
                 // if it's the first point
@@ -266,8 +266,8 @@ bool getClosestIntersectionSL(std::list<Inkscape::SnappedLine> const &list1, std
 {
     bool success = false;
 
-    for (std::list<Inkscape::SnappedLine>::const_iterator i = list1.begin(); i != list1.end(); i++) {
-        for (std::list<Inkscape::SnappedLine>::const_iterator j = list2.begin(); j != list2.end(); j++) {
+    for (std::list<Inkscape::SnappedLine>::const_iterator i = list1.begin(); i != list1.end(); ++i) {
+        for (std::list<Inkscape::SnappedLine>::const_iterator j = list2.begin(); j != list2.end(); ++j) {
             Inkscape::SnappedPoint sp = (*i).intersect(*j);
             if (sp.getAtIntersection()) {
                 // if it's the first point
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index d67afce8e..d0c548a6a 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -562,7 +562,7 @@ void sp_lpe_item_down_current_path_effect(SPLPEItem *lpeitem)
     PathEffectList::iterator cur_it = find( new_list.begin(), new_list.end(), lperef );
     if (cur_it != new_list.end()) {
         PathEffectList::iterator down_it = cur_it;
-        down_it++;
+        ++down_it;
         if (down_it != new_list.end()) { // perhaps current effect is already last effect
             std::iter_swap(cur_it, down_it);
         }
@@ -583,7 +583,7 @@ void sp_lpe_item_up_current_path_effect(SPLPEItem *lpeitem)
     PathEffectList::iterator cur_it = find( new_list.begin(), new_list.end(), lperef );
     if (cur_it != new_list.end() && cur_it != new_list.begin()) {
         PathEffectList::iterator up_it = cur_it;
-        up_it--;
+        --up_it;
         std::iter_swap(cur_it, up_it);
     }
     std::string r = patheffectlist_write_svg(new_list);
@@ -601,7 +601,7 @@ bool sp_lpe_item_has_broken_path_effect(SPLPEItem *lpeitem)
 
     // go through the list; if some are unknown or invalid, return true
     PathEffectList effect_list =  sp_lpe_item_get_effect_list(lpeitem);
-    for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); it++)
+    for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); ++it)
     {
         LivePathEffectObject *lpeobj = (*it)->lpeobject;
         if (!lpeobj || !lpeobj->get_lpe())
@@ -619,7 +619,7 @@ bool sp_lpe_item_has_path_effect(SPLPEItem *lpeitem)
 
     // go through the list; if some are unknown or invalid, we are not an LPE item!
     PathEffectList effect_list =  sp_lpe_item_get_effect_list(lpeitem);
-    for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); it++)
+    for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); ++it)
     {
         LivePathEffectObject *lpeobj = (*it)->lpeobject;
         if (!lpeobj || !lpeobj->get_lpe())
@@ -761,7 +761,7 @@ Inkscape::LivePathEffect::Effect* sp_lpe_item_get_current_lpe(SPLPEItem *lpeitem
 
 bool sp_lpe_item_set_current_path_effect(SPLPEItem *lpeitem, Inkscape::LivePathEffect::LPEObjectReference* lperef)
 {
-    for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); it++) {
+    for (PathEffectList::iterator it = lpeitem->path_effect_list->begin(); it != lpeitem->path_effect_list->end(); ++it) {
         if ((*it)->lpeobject_repr == lperef->lpeobject_repr) {
             lpeitem->current_path_effect = (*it);  // current_path_effect should always be a pointer from the path_effect_list !
             return true;
@@ -819,7 +819,7 @@ bool sp_lpe_item_fork_path_effects_if_necessary(SPLPEItem *lpeitem, unsigned int
 
         std::vector<LivePathEffectObject const *> old_lpeobjs, new_lpeobjs;
         PathEffectList effect_list =  sp_lpe_item_get_effect_list(lpeitem);
-        for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); it++)
+        for (PathEffectList::iterator it = effect_list.begin(); it != effect_list.end(); ++it)
         {
             LivePathEffectObject *lpeobj = (*it)->lpeobject;
             if (lpeobj) {
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index 8781d75e6..f4278a5ac 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -117,7 +117,7 @@ static void sp_svg_write_curve(Inkscape::SVG::PathString & str, Geom::Curve cons
 static void sp_svg_write_path(Inkscape::SVG::PathString & str, Geom::Path const & p) {
     str.moveTo( p.initialPoint()[0], p.initialPoint()[1] );
 
-    for(Geom::Path::const_iterator cit = p.begin(); cit != p.end_open(); cit++) {
+    for(Geom::Path::const_iterator cit = p.begin(); cit != p.end_open(); ++cit) {
         sp_svg_write_curve(str, &(*cit));
     }
 
@@ -129,7 +129,7 @@ static void sp_svg_write_path(Inkscape::SVG::PathString & str, Geom::Path const
 gchar * sp_svg_write_path(Geom::PathVector const &p) {
     Inkscape::SVG::PathString str;
 
-    for(Geom::PathVector::const_iterator pit = p.begin(); pit != p.end(); pit++) {
+    for(Geom::PathVector::const_iterator pit = p.begin(); pit != p.end(); ++pit) {
         sp_svg_write_path(str, *pit);
     }
 
diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index b3404fc00..a30d903cd 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -584,7 +584,7 @@ void SioxImage::assign(const SioxImage &other)
 /**
  * Write the image to a PPM file
  */
-bool SioxImage::writePPM(const std::string fileName)
+bool SioxImage::writePPM(const std::string &fileName)
 {
 
     FILE *f = fopen(fileName.c_str(), "wb");
diff --git a/src/trace/siox.h b/src/trace/siox.h
index 6b7256fe0..57c78bd5a 100644
--- a/src/trace/siox.h
+++ b/src/trace/siox.h
@@ -316,7 +316,7 @@ public:
     /**
      * Saves this image as a simple color PPM
      */
-    bool writePPM(const std::string fileName);
+    bool writePPM(const std::string &fileName);
 
 
 
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index 7c47dc442..64a4a7732 100644
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
@@ -86,7 +86,7 @@ Tracer::getSelectedSPImage()
             items.insert(items.begin(), item);
             }
         std::vector<SPItem *>::iterator iter;
-        for (iter = items.begin() ; iter!= items.end() ; iter++)
+        for (iter = items.begin() ; iter!= items.end() ; ++iter)
             {
             SPItem *item = *iter;
             if (SP_IS_IMAGE(item))
@@ -251,7 +251,7 @@ Tracer::sioxProcessImage(SPImage *img,
 
     std::vector<Inkscape::DrawingItem *> arenaItems;
     std::vector<SPShape *>::iterator iter;
-    for (iter = sioxShapes.begin() ; iter!=sioxShapes.end() ; iter++)
+    for (iter = sioxShapes.begin() ; iter!=sioxShapes.end() ; ++iter)
         {
         SPItem *item = *iter;
         Inkscape::DrawingItem *aItem = item->get_arenaitem(desktop->dkey);
@@ -279,7 +279,7 @@ Tracer::sioxProcessImage(SPImage *img,
             //g_message("x:%f    y:%f\n", point[0], point[1]);
             bool weHaveAHit = false;
             std::vector<Inkscape::DrawingItem *>::iterator aIter;
-            for (aIter = arenaItems.begin() ; aIter!=arenaItems.end() ; aIter++)
+            for (aIter = arenaItems.begin() ; aIter!=arenaItems.end() ; ++aIter)
                 {
                 Inkscape::DrawingItem *arenaItem = *aIter;
                 if (arenaItem->pick(point, 1.0f, 1))
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 573674406..708013b5d 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -1087,7 +1087,7 @@ AlignAndDistribute::~AlignAndDistribute()
 
     for (std::list<Action *>::iterator it = _actionList.begin();
          it != _actionList.end();
-         it ++)
+         ++it)
         delete *it;
 }
 
@@ -1245,7 +1245,7 @@ std::list<SPItem *>::iterator AlignAndDistribute::find_master( std::list<SPItem
     case BIGGEST:
     {
         gdouble max = -1e18;
-        for (std::list<SPItem *>::iterator it = list.begin(); it != list.end(); it++) {
+        for (std::list<SPItem *>::iterator it = list.begin(); it != list.end(); ++it) {
             Geom::OptRect b = (*it)->desktopVisualBounds();
             if (b) {
                 gdouble dim = (*b)[horizontal ? Geom::X : Geom::Y].extent();
@@ -1262,7 +1262,7 @@ std::list<SPItem *>::iterator AlignAndDistribute::find_master( std::list<SPItem
     case SMALLEST:
     {
         gdouble max = 1e18;
-        for (std::list<SPItem *>::iterator it = list.begin(); it != list.end(); it++) {
+        for (std::list<SPItem *>::iterator it = list.begin(); it != list.end(); ++it) {
             Geom::OptRect b = (*it)->desktopVisualBounds();
             if (b) {
                 gdouble dim = (*b)[horizontal ? Geom::X : Geom::Y].extent();
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index 0dae7bd88..2aebef997 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -97,7 +97,7 @@ DocumentMetadata::~DocumentMetadata()
     Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
     repr->removeListenerByData (this);
 
-    for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); it++)
+    for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); ++it)
         delete (*it);
 }
 
@@ -199,7 +199,7 @@ void DocumentMetadata::update()
 
     //-----------------------------------------------------------meta pages
     /* update the RDF entities */
-    for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); it++)
+    for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); ++it)
         (*it)->update (SP_ACTIVE_DOCUMENT);
 
     _licensor.update (SP_ACTIVE_DOCUMENT);
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 921d89c2e..61013295a 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -763,7 +763,7 @@ void FileOpenDialogImplGtk::createFilterMenu()
         Inkscape::Extension::db.get_input_list(extension_list);
 
         for (Inkscape::Extension::DB::InputList::iterator current_item = extension_list.begin();
-             current_item != extension_list.end(); current_item++)
+             current_item != extension_list.end(); ++current_item)
         {
             Inkscape::Extension::Input * imod = *current_item;
 
@@ -1087,7 +1087,7 @@ void FileSaveDialogImplGtk::createFileTypeMenu()
     knownExtensions.clear();
 
     for (Inkscape::Extension::DB::OutputList::iterator current_item = extension_list.begin();
-         current_item != extension_list.end(); current_item++)
+         current_item != extension_list.end(); ++current_item)
     {
         Inkscape::Extension::Output * omod = *current_item;
 
@@ -1342,7 +1342,7 @@ void FileExportDialogImpl::createFileTypeMenu()
     Inkscape::Extension::db.get_output_list(extension_list);
 
     for (Inkscape::Extension::DB::OutputList::iterator current_item = extension_list.begin();
-         current_item != extension_list.end(); current_item++)
+         current_item != extension_list.end(); ++current_item)
     {
         Inkscape::Extension::Output * omod = *current_item;
 
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index 2d23ed943..4ed963148 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -227,7 +227,7 @@ void FileOpenDialogImplWin32::createFilterMenu()
         int filter_count = 5;       // 5 - one for each filter type
 
         for (Inkscape::Extension::DB::InputList::iterator current_item = extension_list.begin();
-             current_item != extension_list.end(); current_item++)
+             current_item != extension_list.end(); ++current_item)
         {
             Filter filter;
 
@@ -383,7 +383,7 @@ void FileOpenDialogImplWin32::createFilterMenu()
     wchar_t *filterptr = _filter;
 
     for(list<Filter>::iterator filter_iterator = filter_list.begin();
-        filter_iterator != filter_list.end(); filter_iterator++)
+        filter_iterator != filter_list.end(); ++filter_iterator)
     {
         const Filter &filter = *filter_iterator;
 
@@ -1616,7 +1616,7 @@ void FileSaveDialogImplWin32::createFilterMenu()
     int filter_length = 1;
 
     for (Inkscape::Extension::DB::OutputList::iterator current_item = extension_list.begin();
-         current_item != extension_list.end(); current_item++)
+         current_item != extension_list.end(); ++current_item)
     {
         Inkscape::Extension::Output *omod = *current_item;
         if (omod->deactivated()) continue;
@@ -1650,7 +1650,7 @@ void FileSaveDialogImplWin32::createFilterMenu()
     wchar_t *filterptr = _filter;
 
     for(list<Filter>::iterator filter_iterator = filter_list.begin();
-        filter_iterator != filter_list.end(); filter_iterator++)
+        filter_iterator != filter_list.end(); ++filter_iterator)
     {
         const Filter &filter = *filter_iterator;
 
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 2227a8c5a..3c5d3f1a2 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -299,7 +299,7 @@ LivePathEffectEditor::effect_list_reload(SPLPEItem *lpeitem)
 
     PathEffectList effectlist = sp_lpe_item_get_effect_list(lpeitem);
     PathEffectList::iterator it;
-    for( it = effectlist.begin() ; it!=effectlist.end(); it++ )
+    for( it = effectlist.begin() ; it!=effectlist.end(); ++it)
     {
         if ( !(*it)->lpeobject ) {
             continue;
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 2edd24eec..50f8a90aa 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -620,7 +620,7 @@ SwatchesPanel::SwatchesPanel(gchar const* prefsPath) :
 
         int i = 0;
         std::vector<SwatchPage*> swatchSets = _getSwatchSets();
-        for ( std::vector<SwatchPage*>::iterator it = swatchSets.begin(); it != swatchSets.end(); it++ ) {
+        for ( std::vector<SwatchPage*>::iterator it = swatchSets.begin(); it != swatchSets.end(); ++it) {
             SwatchPage* curr = *it;
             Gtk::RadioMenuItem* single = manage(new Gtk::RadioMenuItem(groupOne, curr->_name));
             if ( curr == first ) {
@@ -1134,7 +1134,7 @@ void SwatchesPanel::_rebuild()
     _holder->freezeUpdates();
     // TODO restore once 'clear' works _holder->addPreview(_clear);
     _holder->addPreview(_remove);
-    for ( boost::ptr_vector<ColorItem>::iterator it = curr->_colors.begin(); it != curr->_colors.end(); it++ ) {
+    for ( boost::ptr_vector<ColorItem>::iterator it = curr->_colors.begin(); it != curr->_colors.end(); ++it) {
         _holder->addPreview(&*it);
     }
     _holder->thawUpdates();
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index f7759f103..67f3789c7 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -501,7 +501,7 @@ PageSizer::find_paper_size (double w, double h) const
 
     std::map<Glib::ustring, PaperSize>::const_iterator iter;
     for (iter = _paperSizeTable.begin() ;
-         iter != _paperSizeTable.end() ; iter++) {
+         iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
         SPUnit const &i_unit = sp_unit_get_by_id(paper.unit);
         double smallX = sp_units_get_pixels(paper.smaller, i_unit);
@@ -515,7 +515,7 @@ PageSizer::find_paper_size (double w, double h) const
             // We need to search paperSizeListStore explicitly for the
             // specified paper size because it is sorted in a different
             // way than paperSizeTable (which is sorted alphabetically)
-            for (p = _paperSizeListStore->children().begin(); p != _paperSizeListStore->children().end(); p++) {
+            for (p = _paperSizeListStore->children().begin(); p != _paperSizeListStore->children().end(); ++p) {
                 if ((*p)[_paperSizeListColumns.nameColumn] == paper.name) {
                     return p;
                 }
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index c2580013a..3f060f740 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -72,7 +72,7 @@ RegisteredCheckButton::setActive (bool b)
     setProgrammatically = true;
     set_active (b);
     //The slave button is greyed out if the master button is unchecked
-    for (std::list<Gtk::Widget*>::const_iterator i = _slavewidgets.begin(); i != _slavewidgets.end(); i++) {
+    for (std::list<Gtk::Widget*>::const_iterator i = _slavewidgets.begin(); i != _slavewidgets.end(); ++i) {
         (*i)->set_sensitive(b);
     }
     setProgrammatically = false;
@@ -92,7 +92,7 @@ RegisteredCheckButton::on_toggled()
 
     write_to_xml(get_active() ? "true" : "false");
     //The slave button is greyed out if the master button is unchecked
-    for (std::list<Gtk::Widget*>::const_iterator i = _slavewidgets.begin(); i != _slavewidgets.end(); i++) {
+    for (std::list<Gtk::Widget*>::const_iterator i = _slavewidgets.begin(); i != _slavewidgets.end(); ++i) {
         (*i)->set_sensitive(get_active());
     }
 
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 516da5761..51c3af4dd 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -1092,7 +1092,7 @@ void SelectedStyle::opacity_1(void) {_opacity_sb.set_value(100);}
 void SelectedStyle::on_opacity_menu (Gtk::Menu *menu) {
 
     Glib::ListHandle<Gtk::Widget *> children = menu->get_children();
-    for (Glib::ListHandle<Gtk::Widget *>::iterator iter = children.begin(); iter != children.end(); iter++) {
+    for (Glib::ListHandle<Gtk::Widget *>::iterator iter = children.begin(); iter != children.end(); ++iter) {
         menu->remove(*(*iter));
     }