Another big code clean-up patch from Bastien Montagne, thanks again!

8 files changed, 24 insertions, 23 deletions

diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
index 64b897c5596..5cf45a2a934 100644
--- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp
+++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
@@ -64,8 +64,8 @@ static bool angle_obtuse(WVertex *v, WFace *f)
 	WOEdge *e;
 	f->getOppositeEdge(v, e);
 
-	Vec3r vec1(e->GetaVertex()->GetVertex()-v->GetVertex());
-	Vec3r vec2(e->GetbVertex()->GetVertex()-v->GetVertex());
+	Vec3r vec1(e->GetaVertex()->GetVertex() - v->GetVertex());
+	Vec3r vec2(e->GetbVertex()->GetVertex() - v->GetVertex());
 	return ((vec1 * vec2) < 0);
 }
 
@@ -147,12 +147,12 @@ bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &Kh)
 
 	WVertex::incoming_edge_iterator itE;
 
-	for (itE=v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++)
+	for (itE = v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++)
 		area += (*itE)->GetaFace()->getArea();
 
 	Kh = Vec3r(0.0, 0.0, 0.0);
 
-	for (itE=v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) {
+	for (itE = v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) {
 		WOEdge *e = (*itE)->getPrevOnFace();
 #if 0
 		if ((e->GetaVertex() == v) || (e->GetbVertex() == v))
@@ -348,12 +348,12 @@ void gts_vertex_principal_directions(WVertex *v, Vec3r Kh, real Kg, Vec3r &e1, V
 
 	aterm_da = bterm_da = cterm_da = const_da = 0.0;
 	aterm_db = bterm_db = cterm_db = const_db = 0.0;
-	int nb_edges=v->GetEdges().size();
+	int nb_edges = v->GetEdges().size();
 
-	weights = (real *)malloc(sizeof (real) * nb_edges);
-	kappas = (real *)malloc(sizeof (real) * nb_edges);
-	d1s = (real *)malloc(sizeof (real) * nb_edges);
-	d2s = (real *)malloc(sizeof (real) * nb_edges);
+	weights = (real *)malloc(sizeof(real) * nb_edges);
+	kappas = (real *)malloc(sizeof(real) * nb_edges);
+	d1s = (real *)malloc(sizeof(real) * nb_edges);
+	d2s = (real *)malloc(sizeof(real) * nb_edges);
 	edge_count = 0;
 
 	for (itE = v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) {
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 6201d23f9bf..b3ac888361b 100644
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -314,7 +314,7 @@ WOEdge *WFace::MakeEdge(WVertex *v1, WVertex *v2)
 			// Adds the edge to the face
 			//AddEdge((*it1)->GetaOEdge());
 			AddEdge(woea);
-			(*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+			(*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges() + 1);
 			//sets these vertices as border:
 			v1->setBorder(true);
 			v2->setBorder(true);
@@ -330,7 +330,7 @@ WOEdge *WFace::MakeEdge(WVertex *v1, WVertex *v2)
 			// Adds the edge to the face
 			//AddEdge((*it1)->GetaOEdge());
 			AddEdge(woeb);
-			(*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges()+1);
+			(*it1)->setNumberOfOEdges((*it1)->GetNumberOfOEdges() + 1);
 			//sets these vertices as border:
 			v1->setBorder(true);
 			v2->setBorder(true);
@@ -402,7 +402,7 @@ WOEdge *WFace::MakeEdge(WVertex *v1, WVertex *v2)
 }
 
 
-bool WFace::getOppositeEdge (const WVertex *v, WOEdge *&e)
+bool WFace::getOppositeEdge(const WVertex *v, WOEdge *&e)
 {
 	if (_OEdgeList.size() != 3)
 		return false;
@@ -441,7 +441,7 @@ real WFace::getArea ()
 }
 
 
-WOEdge *WFace::GetPrevOEdge(WOEdge* iOEdge)
+WOEdge *WFace::GetPrevOEdge(WOEdge *iOEdge)
 {
 	vector<WOEdge *>::iterator woe, woend, woefirst;
 	woefirst = _OEdgeList.begin();
@@ -645,7 +645,8 @@ WFace *WShape::MakeFace(vector<WVertex *>& iVertexList, vector<bool>& iFaceEdgeM
 	if (3 == iVertexList.size()) {
 		if ((iVertexList[0] == iVertexList[1]) ||
 		    (iVertexList[0] == iVertexList[2]) ||
-		    (iVertexList[2] == iVertexList[1])) {
+		    (iVertexList[2] == iVertexList[1]))
+		{
 			cerr << "Warning: degenerated triangle detected, correcting" << endl;
 			return NULL;
 		}
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index be9181329d6..1646d995a22 100644
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -235,7 +235,7 @@ public:
 
 		virtual bool operator==(const incoming_edge_iterator& b) const
 		{
-			return ((_current)== (b._current));
+			return ((_current) == (b._current));
 		}
 
 		// dereferencing
@@ -311,7 +311,7 @@ public:
 
 		virtual bool operator==(const face_iterator& b) const
 		{
-			return ((_edge_it)== (b._edge_it));
+			return ((_edge_it) == (b._edge_it));
 		}
 
 		// dereferencing
@@ -973,7 +973,7 @@ public:
 	/*! For triangles, returns the edge opposite to the vertex in e.
 	 *  returns flase if the face is not a triangle or if the vertex is not found
 	 */
-	bool getOppositeEdge (const WVertex *v, WOEdge* &e);
+	bool getOppositeEdge (const WVertex *v, WOEdge *&e);
 
 	/*! compute the area of the face */
 	real getArea ();
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
index 719ed10925d..6190318e415 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
@@ -59,7 +59,7 @@ unsigned int WXFaceLayer::GetSmoothEdgeIndex() const
 	int i = 0;
 	int nEdges = _pWXFace->numberOfEdges();
 	for (i = 0; i < nEdges; ++i) {
-		if ((_DotP[i] == 0) && (_DotP[(i+1)%nEdges] == 0)) {
+		if ((_DotP[i] == 0) && (_DotP[(i + 1) % nEdges] == 0)) {
 			return i;
 		}
 	}
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index 9f3522e4e70..cb111dd516c 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -765,13 +765,13 @@ public:
 		// Reset Edges
 		vector<WEdge *>& wedges = getEdgeList();
 		for (vector<WEdge *>::iterator we = wedges.begin(), weend = wedges.end(); we != weend; ++we) {
-			((WXEdge*)(*we))->Reset();
+			((WXEdge *)(*we))->Reset();
 		}
 
 		//Reset faces:
 		vector<WFace *>& wfaces = GetFaceList();
 		for (vector<WFace *>::iterator wf = wfaces.begin(), wfend = wfaces.end(); wf != wfend; ++wf) {
-			((WXFace*)(*wf))->Reset();
+			((WXFace *)(*wf))->Reset();
 		}
 	}
 	/*! accessors */
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
index 51e93f34fa3..772a88a05af 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/freestyle/intern/winged_edge/WSBuilder.cpp
+/** \file blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
  *  \ingroup freestyle
  *  \brief Class inherited from WingedEdgeBuilder and designed to build a WX (WingedEdge + extended info
  *         (silhouette etc...)) structure from a polygonal model
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
index 91e9b389f7c..690126c533e 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
@@ -28,7 +28,7 @@
 #ifndef __FREESTYLE_WX_EDGE_BUILDER_H__
 #define __FREESTYLE_WX_EDGE_BUILDER_H__
 
-/** \file blender/freestyle/intern/winged_edge/WSBuilder.h
+/** \file blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
  *  \ingroup freestyle
  *  \brief Class inherited from WingedEdgeBuilder and designed to build a WX (WingedEdge + extended info
  *         (silhouette etc...)) structure from a polygonal model
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index 4ef34bbe3ee..c1a93f70a7e 100644
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -199,7 +199,7 @@ void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs)
 				break;
 			}
 		}
-		if (normalsSet.size() !=1 ) {
+		if (normalsSet.size() != 1) {
 			(*wv)->setSmooth(false);
 		}
 	}