Another big code clean-up patch by Bastien Montagne (GPL headers, indentation,

spaces around operators, and so forth).  Many thanks!

1 files changed, 71 insertions, 51 deletions

diff --git a/source/blender/freestyle/intern/application/AppConfig.cpp b/source/blender/freestyle/intern/application/AppConfig.cpp
index fe6a8fb5e53..f687117c762 100644
--- a/source/blender/freestyle/intern/application/AppConfig.cpp
+++ b/source/blender/freestyle/intern/application/AppConfig.cpp
@@ -1,53 +1,66 @@
-//
-//  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.
-//
-///////////////////////////////////////////////////////////////////////////////
+/*
+ * ***** 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 *****
+ */
+
+/** \file blender/freestyle/intern/application/AppConfig.cpp
+ *  \ingroup freestyle
+ */
 
 #include "AppConfig.h"
 #include <iostream>
 
 #include "../system/StringUtils.h"
+
 using namespace std;
 
 extern "C" {
-	#include "BLI_path_util.h"
+#include "BLI_path_util.h"
 }
 
 namespace Config {
+
 Path* Path::_pInstance = 0;
-Path::Path() {
+Path::Path()
+{
 	// get the root directory
-	//soc
-	setRootDir( BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, NULL) );
+	// soc
+	setRootDir(BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, NULL));
 
 	_pInstance = this;
 }
-void Path::setRootDir(const string& iRootDir) {
+
+void Path::setRootDir(const string& iRootDir)
+{
 	_ProjectDir = iRootDir + string(DIR_SEP.c_str()) + "freestyle";
 	_ModelsPath = "";
-	_PatternsPath = _ProjectDir + string(DIR_SEP.c_str()) + "data"
-			+ string(DIR_SEP.c_str()) + "textures" + string(DIR_SEP.c_str())
-			+ "variation_patterns" + string(DIR_SEP.c_str());
-	_BrushesPath = _ProjectDir + string(DIR_SEP.c_str()) + "data"
-			+ string(DIR_SEP.c_str()) + "textures" + string(DIR_SEP.c_str())
-			+ "brushes" + string(DIR_SEP.c_str());
-	_PythonPath = _ProjectDir + string(DIR_SEP.c_str())
-+ "style_modules" + string(DIR_SEP.c_str()) ;
+	_PatternsPath = _ProjectDir + string(DIR_SEP.c_str()) + "data" + string(DIR_SEP.c_str()) + "textures" +
+	                string(DIR_SEP.c_str()) + "variation_patterns" + string(DIR_SEP.c_str());
+	_BrushesPath = _ProjectDir + string(DIR_SEP.c_str()) + "data" + string(DIR_SEP.c_str()) + "textures" +
+	               string(DIR_SEP.c_str()) + "brushes" + string(DIR_SEP.c_str());
+	_PythonPath = _ProjectDir + string(DIR_SEP.c_str()) + "style_modules" + string(DIR_SEP.c_str());
 	if (getenv("PYTHONPATH")) {
 		_PythonPath += string(PATH_SEP.c_str()) + string(getenv("PYTHONPATH"));
 	}
@@ -56,37 +69,44 @@ void Path::setRootDir(const string& iRootDir) {
 #else
 	_BrowserCmd = "mozilla %s";
 #endif
-	_HelpIndexPath = _ProjectDir + string(DIR_SEP.c_str()) + "doc"
-			+ string(DIR_SEP.c_str()) + "html" + string(DIR_SEP.c_str())
-			+ "index.html";
-	_EnvMapDir = _ProjectDir + string(DIR_SEP.c_str()) + "data"
-			+ string(DIR_SEP.c_str()) + "env_map" + string(DIR_SEP.c_str());
-	_MapsDir = _ProjectDir + string(DIR_SEP.c_str()) + "data"
-			+ string(DIR_SEP.c_str()) + "maps" + string(DIR_SEP.c_str());
+	_HelpIndexPath = _ProjectDir + string(DIR_SEP.c_str()) + "doc" + string(DIR_SEP.c_str()) + "html" +
+	                 string(DIR_SEP.c_str()) + "index.html";
+	_EnvMapDir = _ProjectDir + string(DIR_SEP.c_str()) + "data" + string(DIR_SEP.c_str()) + "env_map" +
+	             string(DIR_SEP.c_str());
+	_MapsDir = _ProjectDir + string(DIR_SEP.c_str()) + "data" + string(DIR_SEP.c_str()) + "maps" +
+	           string(DIR_SEP.c_str());
 }
-void Path::setHomeDir(const string& iHomeDir) {
+
+void Path::setHomeDir(const string& iHomeDir)
+{
 	_HomeDir = iHomeDir;
 }
-Path::~Path() {
+
+Path::~Path()
+{
 	_pInstance = 0;
 }
-Path* Path::getInstance() {
+
+Path* Path::getInstance()
+{
 	return _pInstance;
 }
-string Path::getEnvVar(const string& iEnvVarName) {
+
+string Path::getEnvVar(const string& iEnvVarName)
+{
 	string value;
-	if (!getenv(StringUtils::toAscii(iEnvVarName).c_str() ) ) {
+	if (!getenv(StringUtils::toAscii(iEnvVarName).c_str())) {
 		cerr << "Warning: You may want to set the $"
-				<< StringUtils::toAscii(iEnvVarName)
-				<< " environment variable to use Freestyle." << endl
-				<< "         Otherwise, the current directory will be used instead."
-				<< endl;
+		     << StringUtils::toAscii(iEnvVarName)
+		     << " environment variable to use Freestyle." << endl
+		     << "         Otherwise, the current directory will be used instead."
+		     << endl;
 		value = ".";
-	} else {
-		value = getenv(StringUtils::toAscii(iEnvVarName).c_str() );
+	}
+	else {
+		value = getenv(StringUtils::toAscii(iEnvVarName).c_str());
 	}
 	return value;
 }
 
 } // End of namepace Config
-