style cleanup (mostly whitespace)

16 files changed, 45 insertions, 46 deletions

diff --git a/intern/boolop/intern/BOP_MathUtils.cpp b/intern/boolop/intern/BOP_MathUtils.cpp
index bcc0cca194e..020de2163a3 100644
--- a/intern/boolop/intern/BOP_MathUtils.cpp
+++ b/intern/boolop/intern/BOP_MathUtils.cpp
@@ -233,17 +233,17 @@ bool BOP_intersect(const MT_Vector3& vL1, const MT_Point3& pL1, const MT_Vector3
 	MT_Scalar den = (vL1.y()*vL2.x() - vL1.x() * vL2.y());
 	
 	if (!BOP_fuzzyZero(den)) {
-		t =  (pL2.y()*vL1.x() - vL1.y()*pL2.x() + pL1.x()*vL1.y() - pL1.y()*vL1.x()) / den ;
+		t =  (pL2.y()*vL1.x() - vL1.y()*pL2.x() + pL1.x()*vL1.y() - pL1.y()*vL1.x()) / den;
 	}
 	else {
 		den = (vL1.y()*vL2.z() - vL1.z() * vL2.y());
 		if (!BOP_fuzzyZero(den)) {
-			t =  (pL2.y()*vL1.z() - vL1.y()*pL2.z() + pL1.z()*vL1.y() - pL1.y()*vL1.z()) / den ;
+			t =  (pL2.y()*vL1.z() - vL1.y()*pL2.z() + pL1.z()*vL1.y() - pL1.y()*vL1.z()) / den;
 		}
 		else {
 			den = (vL1.x()*vL2.z() - vL1.z() * vL2.x());
 			if (!BOP_fuzzyZero(den)) {
-				t =  (pL2.x()*vL1.z() - vL1.x()*pL2.z() + pL1.z()*vL1.x() - pL1.x()*vL1.z()) / den ;
+				t =  (pL2.x()*vL1.z() - vL1.x()*pL2.z() + pL1.z()*vL1.x() - pL1.x()*vL1.z()) / den;
 			}
 			else {
 				return false;
diff --git a/intern/boolop/intern/BOP_Merge2.cpp b/intern/boolop/intern/BOP_Merge2.cpp
index 9028743bee3..6bec9ba8222 100644
--- a/intern/boolop/intern/BOP_Merge2.cpp
+++ b/intern/boolop/intern/BOP_Merge2.cpp
@@ -289,7 +289,7 @@ void BOP_Merge2::cleanup( void )
 		BOP_Indexs faces = (*edge)->getFaces();
 		for (BOP_IT_Indexs face = faces.begin(); face != faces.end(); ++face) {
 			BOP_Face *f = m_mesh->getFace(*face);
-			if(f->getTAG()== UNCLASSIFIED) ;
+			if (f->getTAG()== UNCLASSIFIED);
 			else (*edge)->removeFace(*face);
 		}
 		if( (*edge)->getFaces().size() == 0) (*edge)->setUsed(false);
diff --git a/intern/bsp/intern/BSP_CSGMesh.h b/intern/bsp/intern/BSP_CSGMesh.h
index 3fd1f0cebaf..4754f3bdc71 100644
--- a/intern/bsp/intern/BSP_CSGMesh.h
+++ b/intern/bsp/intern/BSP_CSGMesh.h
@@ -108,11 +108,10 @@ public :
 
 		std::vector<BSP_MVertex> &
 	VertexSet(
-	) const ;		
-
+	) const;
 		std::vector<BSP_MFace> &
 	FaceSet(
-	) const ;
+	) const;
 
 		std::vector<BSP_MEdge> &
 	EdgeSet(
diff --git a/intern/container/CTR_List.h b/intern/container/CTR_List.h
index 7eb8dce7241..404a08fddf2 100644
--- a/intern/container/CTR_List.h
+++ b/intern/container/CTR_List.h
@@ -37,42 +37,42 @@
 class CTR_Link {
 public:
 	CTR_Link(
-	) ;
+	);
 
 	CTR_Link(
 		CTR_Link *next,
 		CTR_Link *prev
-	) ;
+	);
 
 		CTR_Link *
 	getNext(
-	) const ;
+	) const;
 
 		CTR_Link *
 	getPrev(
-	) const ;
+	) const;
 
 		bool 
 	isHead(
-	) const ;
+	) const;
 
 		bool 
 	isTail(
-	) const ;
+	) const;
 
 		void 
 	insertBefore(
 		CTR_Link *link
-	) ;
+	);
 
 		void 
 	insertAfter(
 		CTR_Link *link
-	) ;
+	);
 
 		void 
 	remove(
-	) ;
+	);
 
 private:  
 	CTR_Link  *m_next;
@@ -83,25 +83,25 @@ class CTR_List {
 public:
 
 	CTR_List(
-	) ;
+	);
 
 		CTR_Link *
 	getHead(
-	) const ;
+	) const;
  
 		CTR_Link *
 	getTail(
-	) const ;
+	) const;
 
 		void 
 	addHead(
 		CTR_Link *link
-	) ;
+	);
 
 		void 
 	addTail(
 		CTR_Link *link
-	) ;
+	);
 
 private:
 	CTR_Link m_head;
diff --git a/intern/decimation/intern/LOD_ExternNormalEditor.h b/intern/decimation/intern/LOD_ExternNormalEditor.h
index 1c637453467..52135196dc5 100644
--- a/intern/decimation/intern/LOD_ExternNormalEditor.h
+++ b/intern/decimation/intern/LOD_ExternNormalEditor.h
@@ -122,7 +122,7 @@ private :
 		MT_Vector3 
 	ComputeNormal(
 		const LOD_TriFace &face
-	) const ;
+	) const;
 
 	const 
 		MT_Vector3
diff --git a/intern/decimation/intern/LOD_FaceNormalEditor.h b/intern/decimation/intern/LOD_FaceNormalEditor.h
index b2f941f990f..a221ab0bd7a 100644
--- a/intern/decimation/intern/LOD_FaceNormalEditor.h
+++ b/intern/decimation/intern/LOD_FaceNormalEditor.h
@@ -128,7 +128,7 @@ private :
 		MT_Vector3 
 	ComputeNormal(
 		const LOD_TriFace &face
-	) const ;
+	) const;
 
 	const 
 		MT_Vector3
diff --git a/intern/decimation/intern/LOD_ManMesh2.h b/intern/decimation/intern/LOD_ManMesh2.h
index 63ea7912c2d..5d4e1aff4e6 100644
--- a/intern/decimation/intern/LOD_ManMesh2.h
+++ b/intern/decimation/intern/LOD_ManMesh2.h
@@ -76,11 +76,11 @@ public:
 
 		std::vector<LOD_Vertex> &
 	VertexSet(
-	) const ;		
+	) const;
 
 		std::vector<LOD_TriFace> &
 	FaceSet(
-	) const ;
+	) const;
 
 		std::vector<LOD_Edge> &
 	EdgeSet(
diff --git a/intern/decimation/intern/LOD_MeshPrimitives.h b/intern/decimation/intern/LOD_MeshPrimitives.h
index a43e29f3fe7..ea2d157308b 100644
--- a/intern/decimation/intern/LOD_MeshPrimitives.h
+++ b/intern/decimation/intern/LOD_MeshPrimitives.h
@@ -50,7 +50,7 @@ public :
 	bool m_select_tag;
 
 	LOD_Vertex(
-	) ;
+	);
 
 		bool
 	RemoveEdge(
@@ -109,13 +109,13 @@ public :
 		LOD_FaceInd
 	OpFace(
 		LOD_FaceInd f
-	) const ;
+	) const;
 
 		void
 	SwapFace(
 		LOD_FaceInd old_f,
 		LOD_FaceInd new_f
-	) ;
+	);
 
 
 	// return the half edge face - the half edge is defined
@@ -139,11 +139,11 @@ public :
 	SwapVertex(
 		LOD_VertexInd v_old,
 		LOD_VertexInd v_new
-	) ;			
+	);
 
 		bool
 	SelectTag(
-	) const ;
+	) const;
 
 		void
 	SetSelectTag(
@@ -157,7 +157,7 @@ public :
 		void
 	SetOpenTag(
 		int tag
-	) ;
+	);
 
 		bool
 	Degenerate(
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index b47c4444081..a22b6bc371c 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -494,7 +494,7 @@ extern void GHOST_SetTimerTaskUserData(GHOST_TimerTaskHandle timertaskhandle,
  * @param windowhandle The handle to the window
  * @return The validity of the window.
  */
-extern int GHOST_GetValid(GHOST_WindowHandle windowhandle) ;
+extern int GHOST_GetValid(GHOST_WindowHandle windowhandle);
 
 /**
  * Returns the type of drawing context used in this window.
@@ -592,7 +592,7 @@ extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
 								 GHOST_TInt32 inX,
 								 GHOST_TInt32 inY,
 								 GHOST_TInt32* outX,
-								 GHOST_TInt32* outY) ;
+								 GHOST_TInt32* outY);
 
 /**
  * Converts a point in screen coordinates to client rectangle coordinates
diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
index 726149138ed..6dad3661a57 100644
--- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
@@ -47,7 +47,7 @@
 #endif
 
 #ifdef PREFIX
-static const char *static_path= PREFIX "/share" ;
+static const char *static_path= PREFIX "/share";
 #else
 static const char *static_path= NULL;
 #endif
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 98c4785797d..f4b39d01d9e 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -716,7 +716,7 @@ GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, RAWINP
 	GHOST_EventKey* event;
 
 	if (key != GHOST_kKeyUnknown) {
-		char utf8_char[6] = {0} ;
+		char utf8_char[6] = {0};
 		char ascii = 0;
 
 		wchar_t utf16[2]={0};
diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h
index 62f5ba341d4..d236c73dabd 100644
--- a/intern/ghost/intern/GHOST_SystemX11.h
+++ b/intern/ghost/intern/GHOST_SystemX11.h
@@ -174,7 +174,7 @@ public:
 		GHOST_TSuccess 
 	getModifierKeys(
 		GHOST_ModifierKeys& keys
-	) const ;
+	) const;
 
 	/**
 	 * Returns the state of the mouse buttons (ouside the message queue).
@@ -310,7 +310,7 @@ private :
 		GHOST_WindowX11 * 
 	findGhostWindow(
 		Window xwind
-	) const ;
+	) const;
 
 		void
 	processEvent(
diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp
index dce844949ad..b8cbf9b474d 100644
--- a/intern/ghost/intern/GHOST_WindowSDL.cpp
+++ b/intern/ghost/intern/GHOST_WindowSDL.cpp
@@ -67,7 +67,7 @@ GHOST_WindowSDL::GHOST_WindowSDL(GHOST_SystemSDL *system,
 	m_sdl_glcontext= SDL_GL_CreateContext(m_sdl_win);
 
 	//fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n",
-	//	theEvent->error_code, theEvent->request_code) ;
+	//	theEvent->error_code, theEvent->request_code);
 
 	setTitle(title);
 }
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 3ceafcab3ce..85a9163ec91 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -373,7 +373,7 @@ GHOST_WindowX11(
 	XFree(xsizehints);
 
 	XClassHint * xclasshint = XAllocClassHint();
-	int len = title.Length() +1 ;
+	const int len = title.Length() + 1;
 	char *wmclass = (char *)malloc(sizeof(char) * len);
 	strncpy(wmclass, (const char*)title, sizeof(char) * len);
 	xclasshint->res_name = wmclass;
@@ -485,10 +485,10 @@ GHOST_WindowX11(
 static int ApplicationErrorHandler(Display *display, XErrorEvent *theEvent)
 {
 	fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n",
-		theEvent->error_code, theEvent->request_code) ;
+		theEvent->error_code, theEvent->request_code);
 
 	/* No exit! - but keep lint happy */
-	return 0 ;
+	return 0;
 }
 
 /* These C functions are copied from Wine 1.1.13's wintab.c */
@@ -588,7 +588,7 @@ static BOOL is_eraser(const char *name, const char *type)
 
 void GHOST_WindowX11::initXInputDevices()
 {
-	static XErrorHandler old_handler = (XErrorHandler) 0 ;
+	static XErrorHandler old_handler = (XErrorHandler) 0;
 	XExtensionVersion *version = XGetExtensionVersion(m_display, INAME);
 
 	if(version && (version != (XExtensionVersion*)NoSuchExtension)) {
@@ -600,7 +600,7 @@ void GHOST_WindowX11::initXInputDevices()
 			m_xtablet.CommonData.Active= GHOST_kTabletModeNone;
 
 			/* Install our error handler to override Xlib's termination behavior */
-			old_handler = XSetErrorHandler(ApplicationErrorHandler) ;
+			old_handler = XSetErrorHandler(ApplicationErrorHandler);
 
 			for(int i=0; i<device_count; ++i) {
 				char *device_type = device_info[i].type ? XGetAtomName(m_display, device_info[i].type) : NULL;
@@ -648,7 +648,7 @@ void GHOST_WindowX11::initXInputDevices()
 			}
 
 			/* Restore handler */
-			(void) XSetErrorHandler(old_handler) ;
+			(void) XSetErrorHandler(old_handler);
 
 			XFreeDeviceList(device_info);
 
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h
index 5430c5916fc..cb3c1415a28 100644
--- a/intern/ghost/intern/GHOST_WindowX11.h
+++ b/intern/ghost/intern/GHOST_WindowX11.h
@@ -146,7 +146,7 @@ public:
 	
 		GHOST_TWindowState 
 	getState(
-	) const ;
+	) const;
 
 		GHOST_TSuccess 
 	setState(
diff --git a/intern/guardedalloc/test/simpletest/memtest.c b/intern/guardedalloc/test/simpletest/memtest.c
index d484e6f51ff..fdc91730d6f 100644
--- a/intern/guardedalloc/test/simpletest/memtest.c
+++ b/intern/guardedalloc/test/simpletest/memtest.c
@@ -118,7 +118,7 @@ int main (int argc, char *argv[])
 	}
 
 	/* now corrupt a few blocks...*/
-	ip = (int*) p[5] - 50 ;
+	ip = (int*) p[5] - 50;
 	for (i = 0; i< 1000; i++,ip++) *ip = i+1;
 	ip = (int*) p[6];
 	*(ip+10005) = 0;