static code analysis

(bzr r14509)

10 files changed, 38 insertions, 38 deletions

diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 17d704975..f010a687d 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -241,7 +241,7 @@ void Inkscape::SelTrans::setCenter(Geom::Point const &p)
 
     // Write the new center position into all selected items
     std::vector<SPItem*> items=_desktop->selection->itemList();
-    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end();iter++ ) {
+    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
         SPItem *it = SP_ITEM(*iter);
         it->setCenter(p);
         // only set the value; updating repr and document_done will be done once, on ungrab
@@ -271,7 +271,7 @@ void Inkscape::SelTrans::grab(Geom::Point const &p, gdouble x, gdouble y, bool s
     }
 
     std::vector<SPItem*> items=_desktop->selection->itemList();
-    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end();iter++ ) {
+    for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
         SPItem *it = static_cast<SPItem*>(sp_object_ref(*iter, NULL));
         _items.push_back(it);
         _items_const.push_back(it);
@@ -493,7 +493,7 @@ void Inkscape::SelTrans::ungrab()
         if (_center_is_set) {
             // we were dragging center; update reprs and commit undoable action
         	std::vector<SPItem*> items=_desktop->selection->itemList();
-            for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end();iter++ ) {
+            for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
                 SPItem *it = *iter;
                 it->updateRepr();
             }
@@ -534,7 +534,7 @@ void Inkscape::SelTrans::stamp()
             _stamp_cache = l;
         }
 
-        for(std::vector<SPItem*>::const_iterator x=l.begin();x!=l.end();x++) {
+        for(std::vector<SPItem*>::const_iterator x=l.begin();x!=l.end(); ++x) {
             SPItem *original_item = *x;
             Inkscape::XML::Node *original_repr = original_item->getRepr();
 
@@ -712,7 +712,7 @@ void Inkscape::SelTrans::handleClick(SPKnot */*knot*/, guint state, SPSelTransHa
             if (state & GDK_SHIFT_MASK) {
                 // Unset the  center position for all selected items
             	std::vector<SPItem*> items=_desktop->selection->itemList();
-                for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end();iter++ ) {
+                for ( std::vector<SPItem*>::const_iterator iter=items.begin();iter!=items.end(); ++iter) {
                     SPItem *it = *iter;
                     it->unsetCenter();
                     it->updateRepr();
diff --git a/src/snapper.h b/src/snapper.h
index 24f9b9442..6c7995045 100644
--- a/src/snapper.h
+++ b/src/snapper.h
@@ -77,7 +77,7 @@ public:
         // Constructs a linear constraint
         SnapConstraint(Geom::Point const &p, Geom::Point const &d) : _point(p), _direction(d), _radius(0), _type(LINE) {}
         // Orthogonal version
-        SnapConstraint(Geom::Point const &p, Geom::Dim2 const &d) : _point(p), _radius(0), _type(LINE) {_direction = Geom::Point(); _direction[d] = 1.;}
+        SnapConstraint(Geom::Point const &p, Geom::Dim2 const &d) : _point(p), _direction(), _radius(0), _type(LINE) {_direction[d] = 1.;}
         SnapConstraint(Geom::Line const &l) : _point(l.origin()), _direction(l.versor()), _radius(0), _type(LINE) {}
         // Constructs a circular constraint
         SnapConstraint(Geom::Point const &p, Geom::Point const &d, Geom::Coord const &r) : _point(p), _direction(d), _radius(r), _type(CIRCLE) {}
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index fa5a57529..75cce4374 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -51,7 +51,7 @@ static bool try_get_intersect_point_with_item_recursive(Geom::PathVector& conn_p
         // consider all first-order children
         double child_pos = 0.0;
         std::vector<SPItem*> g = sp_item_group_item_list(group);
-        for (std::vector<SPItem*>::const_iterator i = g.begin();i!=g.end();i++) {
+        for (std::vector<SPItem*>::const_iterator i = g.begin();i!=g.end();++i) {
             SPItem* child_item = *i;
             try_get_intersect_point_with_item_recursive(conn_pv, child_item,
                     item_transform * child_item->transform, child_pos);
diff --git a/src/sp-defs.cpp b/src/sp-defs.cpp
index 2e341d3c6..dd779c0da 100644
--- a/src/sp-defs.cpp
+++ b/src/sp-defs.cpp
@@ -37,7 +37,7 @@ void SPDefs::update(SPCtx *ctx, guint flags) {
 
     flags &= SP_OBJECT_MODIFIED_CASCADE;
     std::vector<SPObject*> l(this->childList(true));
-    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();++i){
         SPObject *child = *i;
         if (flags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
             child->updateDisplay(ctx, flags);
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 5d96899b1..8cd0bf8d3 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -162,7 +162,7 @@ void SPGroup::update(SPCtx *ctx, unsigned int flags) {
     }
     childflags &= SP_OBJECT_MODIFIED_CASCADE;
     std::vector<SPObject*> l=this->childList(true, SPObject::ActionUpdate);
-    for(std::vector<SPObject*> ::const_iterator i=l.begin();i!=l.end();i++){
+    for(std::vector<SPObject*> ::const_iterator i=l.begin();i!=l.end();++i){
         SPObject *child = *i;
 
         if (childflags || (child->uflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
@@ -206,7 +206,7 @@ void SPGroup::modified(guint flags) {
     flags &= SP_OBJECT_MODIFIED_CASCADE;
 
     std::vector<SPObject*> l=this->childList(true);
-    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();++i){
         SPObject *child = *i;
 
         if (flags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) {
@@ -280,7 +280,7 @@ Geom::OptRect SPGroup::bbox(Geom::Affine const &transform, SPItem::BBoxType bbox
 
     // TODO CPPIFY: replace this const_cast later
     std::vector<SPObject*> l = const_cast<SPGroup*>(this)->childList(false, SPObject::ActionBBox);
-    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();++i){
         SPObject *o = *i;
         SPItem *item = dynamic_cast<SPItem *>(o);
         if (item && !item->isHidden()) {
@@ -294,7 +294,7 @@ Geom::OptRect SPGroup::bbox(Geom::Affine const &transform, SPItem::BBoxType bbox
 
 void SPGroup::print(SPPrintContext *ctx) {
 	std::vector<SPObject*> l=this->childList(false);
-    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();++i){
         SPObject *o = *i;
         SPItem *item = dynamic_cast<SPItem *>(o);
         if (item) {
@@ -348,7 +348,7 @@ Inkscape::DrawingItem *SPGroup::show (Inkscape::Drawing &drawing, unsigned int k
 
 void SPGroup::hide (unsigned int key) {
 	std::vector<SPObject*> l=this->childList(false, SPObject::ActionShow);
-    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();++i){
         SPObject *o = *i;
 
         SPItem *item = dynamic_cast<SPItem *>(o);
@@ -373,7 +373,7 @@ void SPGroup::snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape:
 
 void sp_item_group_ungroup_handle_clones(SPItem *parent, Geom::Affine const g)
 {
-    for(std::list<SPObject*>::const_iterator refd=parent->hrefList.begin();refd!=parent->hrefList.end();refd++){
+    for(std::list<SPObject*>::const_iterator refd=parent->hrefList.begin();refd!=parent->hrefList.end();++refd){
         SPItem *citem = dynamic_cast<SPItem *>(*refd);
         if (citem && !citem->cloned) {
             SPUse *useitem = dynamic_cast<SPUse *>(citem);
@@ -781,7 +781,7 @@ gint SPGroup::getItemCount() const {
 void SPGroup::_showChildren (Inkscape::Drawing &drawing, Inkscape::DrawingItem *ai, unsigned int key, unsigned int flags) {
     Inkscape::DrawingItem *ac = NULL;
     std::vector<SPObject*> l=this->childList(false, SPObject::ActionShow);
-    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();i++){
+    for(std::vector<SPObject*>::const_iterator i=l.begin();i!=l.end();++i){
         SPObject *o = *i;
         SPItem * child = dynamic_cast<SPItem *>(o);
         if (child) {
@@ -800,7 +800,7 @@ void SPGroup::update_patheffect(bool write) {
 
     std::vector<SPItem*> const item_list = sp_item_group_item_list(this);
 
-    for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+    for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
         SPObject *subitem = *iter;
 
         SPLPEItem *lpeItem = dynamic_cast<SPLPEItem *>(subitem);
@@ -810,7 +810,7 @@ void SPGroup::update_patheffect(bool write) {
     }
 
     if (hasPathEffect() && pathEffectsEnabled()) {
-        for (PathEffectList::iterator it = this->path_effect_list->begin(); it != this->path_effect_list->end(); it++)
+        for (PathEffectList::iterator it = this->path_effect_list->begin(); it != this->path_effect_list->end(); ++it)
         {
             LivePathEffectObject *lpeobj = (*it)->lpeobject;
 
@@ -828,7 +828,7 @@ sp_group_perform_patheffect(SPGroup *group, SPGroup *topgroup, bool write)
 {
     std::vector<SPItem*> const item_list = sp_item_group_item_list(group);
 
-    for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+    for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
         SPObject *subitem = *iter;
 
         SPGroup *subGroup = dynamic_cast<SPGroup *>(subitem);
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index 9befd2a2b..98b77cfe8 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -354,7 +354,7 @@ sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem)
     }
     if (SP_IS_GROUP(lpeitem)) {
     	std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(lpeitem));
-        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
             SPObject *subitem = *iter;
             if (SP_IS_LPE_ITEM(subitem)) {
                 sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(subitem));
@@ -388,7 +388,7 @@ sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem)
             }
         }
         std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(lpeitem));
-        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
             SPObject *subitem = *iter;
             if (SP_IS_LPE_ITEM(subitem)) {
                 sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(subitem));
@@ -681,7 +681,7 @@ SPLPEItem::apply_to_clippath(SPItem *item)
     }
     if(SP_IS_GROUP(item)){
     	std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(item));
-        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
             SPObject *subitem = *iter;
             apply_to_clippath(SP_ITEM(subitem));
         }
@@ -733,7 +733,7 @@ SPLPEItem::apply_to_mask(SPItem *item)
     }
     if(SP_IS_GROUP(item)){
     	std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(item));
-        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+        for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
             SPObject *subitem = *iter;
             apply_to_mask(SP_ITEM(subitem));
         }
@@ -747,7 +747,7 @@ SPLPEItem::apply_to_clip_or_mask_group(SPItem *group, SPItem *item)
         return;
     }
     std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(group));
-    for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();iter++) {
+    for ( std::vector<SPItem*>::const_iterator iter=item_list.begin();iter!=item_list.end();++iter) {
         SPObject *subitem = *iter;
         if (SP_IS_GROUP(subitem)) {
             apply_to_clip_or_mask_group(SP_ITEM(subitem), item);
diff --git a/src/sp-switch.cpp b/src/sp-switch.cpp
index cfc0e7d8b..d2dcde15d 100644
--- a/src/sp-switch.cpp
+++ b/src/sp-switch.cpp
@@ -97,7 +97,7 @@ void SPSwitch::_reevaluate(bool /*add_to_drawing*/) {
     _releaseLastItem(_cached_item);
 
     std::vector<SPObject*> item_list = _childList(false, SPObject::ActionShow);
-    for ( std::vector<SPObject*>::const_reverse_iterator iter=item_list.rbegin();iter!=item_list.rend();iter++) {
+    for ( std::vector<SPObject*>::const_reverse_iterator iter=item_list.rbegin();iter!=item_list.rend();++iter) {
         SPObject *o = *iter;
         if ( !SP_IS_ITEM (o) ) {
             continue;
@@ -132,7 +132,7 @@ void SPSwitch::_showChildren (Inkscape::Drawing &drawing, Inkscape::DrawingItem
 
     std::vector<SPObject*> l = this->_childList(false, SPObject::ActionShow);
 
-    for ( std::vector<SPObject*>::const_reverse_iterator iter=l.rbegin();iter!=l.rend();iter++) {
+    for ( std::vector<SPObject*>::const_reverse_iterator iter=l.rbegin();iter!=l.rend();++iter) {
         SPObject *o = *iter;
 
         if (SP_IS_ITEM (o)) {
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index 9fc862ad2..fbbbe5807 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -44,7 +44,7 @@ static SPItem *
 flowtext_in_selection(Inkscape::Selection *selection)
 {
 	std::vector<SPItem*> items = selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         if (SP_IS_FLOWTEXT(*i))
             return *i;
     }
@@ -55,7 +55,7 @@ static SPItem *
 text_or_flowtext_in_selection(Inkscape::Selection *selection)
 {
 	std::vector<SPItem*> items = selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i))
             return *i;
     }
@@ -66,7 +66,7 @@ static SPItem *
 shape_in_selection(Inkscape::Selection *selection)
 {
 	std::vector<SPItem*> items = selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         if (SP_IS_SHAPE(*i))
             return *i;
     }
@@ -197,7 +197,7 @@ text_remove_from_path()
 
     bool did = false;
     std::vector<SPItem*> items(selection->itemList());
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         SPObject *obj = *i;
 
         if (SP_IS_TEXT_TEXTPATH(obj)) {
@@ -261,7 +261,7 @@ text_remove_all_kerns()
     bool did = false;
 
     std::vector<SPItem*> items = selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         SPObject *obj = *i;
 
         if (!SP_IS_TEXT(obj) && !SP_IS_TSPAN(obj) && !SP_IS_FLOWTEXT(obj)) {
@@ -321,7 +321,7 @@ text_flow_into_shape()
 
     /* Add clones */
     std::vector<SPItem*> items = selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         SPItem *item = *i;
         if (SP_IS_SHAPE(item)){
             Inkscape::XML::Node *clone = xml_doc->createElement("svg:use");
@@ -396,7 +396,7 @@ text_unflow ()
     GSList *old_objs = NULL;
 
     std::vector<SPItem*> items = selection->itemList();
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
 
         if (!SP_IS_FLOWTEXT(*i)) {
             continue;
@@ -481,7 +481,7 @@ flowtext_to_text()
 
     std::vector<Inkscape::XML::Node*> reprs;
     std::vector<SPItem*> items(selection->itemList());
-    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();++i){
         
         SPItem *item = *i;
 
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index d9cebc625..057523b1e 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -68,7 +68,7 @@ void te_update_layout_now_recursive(SPItem *item)
 {
     if (SP_IS_GROUP(item)) {
     	std::vector<SPItem*> item_list = sp_item_group_item_list(SP_GROUP(item));
-        for(std::vector<SPItem*>::const_iterator i=item_list.begin();i!=item_list.end();i++){
+        for(std::vector<SPItem*>::const_iterator i=item_list.begin();i!=item_list.end();++i){
             SPItem* list_item = *i;
             te_update_layout_now_recursive(list_item);
         }
diff --git a/src/vanishing-point.cpp b/src/vanishing-point.cpp
index 553e3a31d..19750bd37 100644
--- a/src/vanishing-point.cpp
+++ b/src/vanishing-point.cpp
@@ -259,7 +259,7 @@ std::list<SPBox3D *>
 VanishingPoint::selectedBoxes(Inkscape::Selection *sel) {
     std::list<SPBox3D *> sel_boxes;
     std::vector<SPItem*> itemlist=sel->itemList();
-    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box && this->hasBox(box)) {
@@ -399,7 +399,7 @@ VPDragger::VPsOfSelectedBoxes() {
     // FIXME: Should we take the selection from the parent VPDrag? I guess it shouldn't make a difference.
     Inkscape::Selection *sel = SP_ACTIVE_DESKTOP->getSelection();
     std::vector<SPItem*> itemlist=sel->itemList();
-    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box) {
@@ -582,7 +582,7 @@ VPDrag::updateDraggers ()
     g_return_if_fail (this->selection != NULL);
 
     std::vector<SPItem*> itemlist=this->selection->itemList();
-    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box) {
@@ -615,7 +615,7 @@ VPDrag::updateLines ()
     g_return_if_fail (this->selection != NULL);
 
     std::vector<SPItem*> itemlist=this->selection->itemList();
-    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++) {
+    for (std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();++i) {
         SPItem *item = *i;
         SPBox3D *box = dynamic_cast<SPBox3D *>(item);
         if (box) {