cppcheck: performance + variable type

(bzr r12603)

5 files changed, 17 insertions, 17 deletions

diff --git a/src/libavoid/vertices.h b/src/libavoid/vertices.h
index b07c87f95..619692c23 100644
--- a/src/libavoid/vertices.h
+++ b/src/libavoid/vertices.h
@@ -129,7 +129,7 @@ class VertInfList
         unsigned int shapesSize(void) const;
         void stats(FILE *fp = stderr)
         {
-            fprintf(fp, "Conns %d, shapes %d\n", _connVertices, 
+            fprintf(fp, "Conns %u, shapes %u\n", _connVertices, 
                     _shapeVertices);
         }
     private:
diff --git a/src/libcola/connected_components.cpp b/src/libcola/connected_components.cpp
index 1afec55b4..823f7cf6e 100644
--- a/src/libcola/connected_components.cpp
+++ b/src/libcola/connected_components.cpp
@@ -77,7 +77,7 @@ namespace cola {
         }
         vector<Edge>::const_iterator ei;
         SimpleConstraints::const_iterator ci;
-        for(ei=es.begin();ei!=es.end();ei++) {
+        for(ei=es.begin();ei!=es.end();++ei) {
             vs[ei->first].neighbours.push_back(&vs[ei->second]);
             vs[ei->second].neighbours.push_back(&vs[ei->first]);
         }
@@ -88,13 +88,13 @@ namespace cola {
             dfs(v,remaining,component,cmap);
             components.push_back(component);
         }
-        for(ei=es.begin();ei!=es.end();ei++) {
+        for(ei=es.begin();ei!=es.end();++ei) {
             pair<Component*,unsigned> u=cmap[ei->first],
                                       v=cmap[ei->second];
             assert(u.first==v.first);
             u.first->edges.push_back(make_pair(u.second,v.second));
         }
-        for(ci=scx.begin();ci!=scx.end();ci++) {
+        for(ci=scx.begin();ci!=scx.end();++ci) {
             SimpleConstraint *c=*ci;
             pair<Component*,unsigned> u=cmap[c->left],
                                       v=cmap[c->right];
@@ -102,7 +102,7 @@ namespace cola {
             u.first->scx.push_back(
                     new SimpleConstraint(u.second,v.second,c->gap));
         }
-        for(ci=scy.begin();ci!=scy.end();ci++) {
+        for(ci=scy.begin();ci!=scy.end();++ci) {
             SimpleConstraint *c=*ci;
             pair<Component*,unsigned> u=cmap[c->left],
                                       v=cmap[c->right];
diff --git a/src/libcola/cycle_detector.cpp b/src/libcola/cycle_detector.cpp
index 89a2ccaae..11e24a0ba 100644
--- a/src/libcola/cycle_detector.cpp
+++ b/src/libcola/cycle_detector.cpp
@@ -53,7 +53,7 @@ void CycleDetector::make_matrix()  {
   assert(traverse.empty());
 
   // from the edges passed, fill the adjacency matrix
-  for (ei = edges->begin(); ei != edges->end(); ei++)  {
+  for (ei = edges->begin(); ei != edges->end(); ++ei)  {
     anEdge = *ei;
     // the matrix is indexed by the first vertex of the edge
     // the second vertex of the edge is pushed onto another
@@ -241,7 +241,7 @@ bool CycleDetector::find_node(std::vector<Node *> *& list, unsigned k)  {
 }
 
 pair< bool, vector<unsigned>::iterator > CycleDetector::find_node(std::vector<unsigned>& list, unsigned k)  {
-  for (vector<unsigned>::iterator ti = traverse.begin(); ti != traverse.end(); ti++)  {
+  for (vector<unsigned>::iterator ti = traverse.begin(); ti != traverse.end(); ++ti)  {
     if (*ti == k)  { return pair< bool, vector<unsigned>::iterator >(true, ti); }
   }
 
diff --git a/src/libcola/gradient_projection.cpp b/src/libcola/gradient_projection.cpp
index 47109a4b0..3e41aceac 100644
--- a/src/libcola/gradient_projection.cpp
+++ b/src/libcola/gradient_projection.cpp
@@ -222,7 +222,7 @@ void GradientProjection::destroyVPSC(IncSolver *vpsc) {
     delete vpsc;
     delete [] cs;
     delete [] vs;
-    for(vector<Constraint*>::iterator i=lcs.begin();i!=lcs.end();i++) {
+    for(vector<Constraint*>::iterator i=lcs.begin();i!=lcs.end();++i) {
             delete *i;
     }
     lcs.clear();
diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp
index 650f41aac..fab30d48d 100644
--- a/src/libcola/straightener.cpp
+++ b/src/libcola/straightener.cpp
@@ -90,7 +90,7 @@ namespace straightener {
                     ds.erase(copyit);
                 }
             }
-            for(set<pair<double,unsigned> >::iterator j=pntsOnLineSegment.begin();j!=pntsOnLineSegment.end();j++) {
+            for(set<pair<double,unsigned> >::iterator j=pntsOnLineSegment.begin();j!=pntsOnLineSegment.end();++j) {
                 path.push_back(j->second);
             }
             //printf("\n");
@@ -144,11 +144,11 @@ namespace straightener {
                 e->ypos(conjpos,bs);
             }
             //cerr << "edge(intersections="<<bs.size()<<":("<<e->startNode<<","<<e->endNode<<"))"<<endl;
-            for(vector<double>::iterator it=bs.begin();it!=bs.end();it++) {
+            for(vector<double>::iterator it=bs.begin();it!=bs.end();++it) {
                 sortedEdges.insert(make_pair(*it,e));
             }
         }
-        for(set<PosEdgePair>::iterator i=sortedEdges.begin();i!=sortedEdges.end();i++) {
+        for(set<PosEdgePair>::iterator i=sortedEdges.begin();i!=sortedEdges.end();++i) {
             double pos=i->first;
             if(pos < minpos) continue;
             if(pos > v->scanpos) break;
@@ -169,7 +169,7 @@ namespace straightener {
         if(r!=NULL) {
             maxpos=r->scanpos;
         }
-        for(set<PosEdgePair>::iterator i=sortedEdges.begin();i!=sortedEdges.end();i++) {
+        for(set<PosEdgePair>::iterator i=sortedEdges.begin();i!=sortedEdges.end();++i) {
             if(i->first < v->scanpos) continue;
             if(i->first > maxpos) break;
             double pos=i->first;
@@ -262,7 +262,7 @@ namespace straightener {
                 // Case A: create constraints between adjacent edges skipping edges joined
                 // to l,v or r.
                 Node* lastNode=NULL;
-                for(vector<Node*>::iterator i=L.begin();i!=L.end();i++) {
+                for(vector<Node*>::iterator i=L.begin();i!=L.end();++i) {
                     if((*i)->dummy) {
                         // node is on an edge
                         Edge *edge=(*i)->edge;
@@ -284,7 +284,7 @@ namespace straightener {
                 // their own end, also in the scan line
                 vector<Node*> skipList;
                 lastNode=NULL;
-                for(vector<Node*>::iterator i=L.begin();i!=L.end();i++) {
+                for(vector<Node*>::iterator i=L.begin();i!=L.end();++i) {
                     if((*i)->dummy) {
                         // node is on an edge
                         if(lastNode!=NULL) {
@@ -292,7 +292,7 @@ namespace straightener {
                                 skipList.push_back(*i);
                             } else {
                                 for(vector<Node*>::iterator j=skipList.begin();
-                                        j!=skipList.end();j++) {
+                                        j!=skipList.end();++j) {
                                     //printf("  Rule B: Constraint: v%d +g <= v%d\n",(*j)->id,(*i)->id);
                                     cs.push_back(createConstraint(*j,*i,dim));
                                 }
@@ -309,7 +309,7 @@ namespace straightener {
                 skipList.clear();
                 // Case C: reverse of B
                 lastNode=NULL;
-                for(vector<Node*>::reverse_iterator i=L.rbegin();i!=L.rend();i++) {
+                for(vector<Node*>::reverse_iterator i=L.rbegin();i!=L.rend();++i) {
                     if((*i)->dummy) {
                         // node is on an edge
                         if(lastNode!=NULL) {
@@ -317,7 +317,7 @@ namespace straightener {
                                 skipList.push_back(*i);
                             } else {
                                 for(vector<Node*>::iterator j=skipList.begin();
-                                        j!=skipList.end();j++) {
+                                        j!=skipList.end();++j) {
                                     //printf("  Rule C: Constraint: v%d +g <= v%d\n",(*i)->id,(*j)->id);
                                     cs.push_back(createConstraint(*i,*j,dim));
                                 }