Yet another big style clean-up patch by Bastien Montagne, thanks a lot!

Now the code style is acceptable for the merge now, according to Bastien.
Thanks again Bastien for having this done! :)

1 files changed, 76 insertions, 61 deletions

diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
index 078fc5f2c98..cc711fedece 100644
--- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h
+++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
@@ -1,93 +1,108 @@
-//
-//  Filename         : GridDensityProvider.h
-//  Author(s)        : Alexander Beels
-//  Purpose          : Class to define a cell grid surrounding
-//                     the projected image of a scene
-//  Date of creation : 2011-2-5
-//
-///////////////////////////////////////////////////////////////////////////////
-
-
-//
-//  Copyright (C) : Please refer to the COPYRIGHT file distributed 
-//   with this source distribution. 
-//
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef GRIDDENSITYPROVIDER_H
-#define GRIDDENSITYPROVIDER_H
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2010 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __FREESTYLE_GRID_DENSITY_PROVIDER_H__
+#define __FREESTYLE_GRID_DENSITY_PROVIDER_H__
+
+/** \file blender/freestyle/intern/view_map/GridDensityProvider.h
+ *  \ingroup freestyle
+ *  \brief Class to define a cell grid surrounding the projected image of a scene
+ *  \author Alexander Beels
+ *  \date 2011-2-5
+ */
 
 #include <stdexcept>
 #include <memory>
+
 #include "OccluderSource.h"
+
 #include "../geometry/BBox.h"
 
-class GridDensityProvider {
+class GridDensityProvider
+{
 	// Disallow copying and assignment
-	GridDensityProvider (const GridDensityProvider& other);
-	GridDensityProvider& operator= (const GridDensityProvider& other);
+	GridDensityProvider(const GridDensityProvider& other);
+	GridDensityProvider& operator=(const GridDensityProvider& other);
 
 public:
-	GridDensityProvider (OccluderSource& source)
-		: source(source) {
-	}
+	GridDensityProvider(OccluderSource& source) : source(source) {}
 
 	virtual ~GridDensityProvider() {};
 
-	float cellSize() {
+	float cellSize()
+	{
 		return _cellSize;
 	}
 
-	unsigned cellsX() {
+	unsigned cellsX()
+	{
 		return _cellsX;
 	}
 
-	unsigned cellsY() {
+	unsigned cellsY()
+	{
 		return _cellsY;
 	}
 
-	float cellOrigin(int index) {
-		if ( index < 2 ) {
+	float cellOrigin(int index)
+	{
+		if (index < 2) {
 			return _cellOrigin[index];
-		} else {
+		}
+		else {
 			throw new out_of_range("GridDensityProvider::cellOrigin can take only indexes of 0 or 1.");
 		}
 	}
 
-	static void calculateOptimalProscenium(OccluderSource& source, real proscenium[4]) {
+	static void calculateOptimalProscenium(OccluderSource& source, real proscenium[4])
+	{
 		source.begin();
-		if ( source.isValid() ) {
+		if (source.isValid()) {
 			const Vec3r& initialPoint = source.getGridSpacePolygon().getVertices()[0];
 			proscenium[0] = proscenium[1] = initialPoint[0];
 			proscenium[2] = proscenium[3] = initialPoint[1];
-			while ( source.isValid() ) {
+			while (source.isValid()) {
 				GridHelpers::expandProscenium (proscenium, source.getGridSpacePolygon());
 				source.next();
 			}
 		}
-		cout << "Proscenium: (" << proscenium[0] << ", " << proscenium[1] << ", " << proscenium[2] << ", " << proscenium[3] << ")" << endl;
+		cout << "Proscenium: (" << proscenium[0] << ", " << proscenium[1] << ", " << proscenium[2]
+		     << ", " << proscenium[3] << ")" << endl;
 	}
 
-	static void calculateQuickProscenium(const GridHelpers::Transform& transform, const BBox<Vec3r>& bbox, real proscenium[4]) {
+	static void calculateQuickProscenium(const GridHelpers::Transform& transform, const BBox<Vec3r>& bbox,
+	                                     real proscenium[4])
+	{
 		real z;
 		// We want to use the z-coordinate closest to the camera to determine the proscenium face
-		if ( ::fabs(bbox.getMin()[2]) < ::fabs(bbox.getMax()[2]) ) {
+		if (::fabs(bbox.getMin()[2]) < ::fabs(bbox.getMax()[2])) {
 			z = bbox.getMin()[2];
-		} else {
+		}
+		else {
 			z = bbox.getMax()[2];
 		}
 		// Now calculate the proscenium according to the min and max values of the x and y coordinates
@@ -98,7 +113,8 @@ public:
 		proscenium[1] = std::max(minPoint[0], maxPoint[0]);
 		proscenium[2] = std::min(minPoint[1], maxPoint[1]);
 		proscenium[3] = std::max(minPoint[1], maxPoint[1]);
-		cout << "Proscenium  : " << proscenium[0] << ", " << proscenium[1] << ", " << proscenium[2] << ", " << proscenium[3] << endl;
+		cout << "Proscenium  : " << proscenium[0] << ", " << proscenium[1] << ", " << proscenium[2] << ", "
+		     << proscenium[3] << endl;
 	}
 
 protected:
@@ -108,24 +124,23 @@ protected:
 	float _cellOrigin[2];
 };
 
-class GridDensityProviderFactory {
+class GridDensityProviderFactory
+{
 	// Disallow copying and assignment
 	GridDensityProviderFactory (const GridDensityProviderFactory& other);
 	GridDensityProviderFactory& operator= (const GridDensityProviderFactory& other);
 
 public:
-	GridDensityProviderFactory() 
-	{
-	}
+	GridDensityProviderFactory() {}
 
-	virtual auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const real proscenium[4]) =0;
+	virtual auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const real proscenium[4]) = 0;
 
-	virtual auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, const GridHelpers::Transform& transform) =0;
+	virtual auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox,
+	                                                             const GridHelpers::Transform& transform) = 0;
 
-	virtual auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source) =0;
+	virtual auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source) = 0;
 
 	virtual ~GridDensityProviderFactory () {}
 };
 
-#endif // GRIDDENSITYPROVIDER_H
-
+#endif // __FREESTYLE_GRID_DENSITY_PROVIDER_H__