[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47435] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Jun 4 22:11:18 CEST 2012
Revision: 47435
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47435
Author: campbellbarton
Date: 2012-06-04 20:11:09 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
trunk/blender/intern/container/intern/CTR_List.cpp
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerNULL.h
trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h
trunk/blender/intern/ghost/test/multitest/EventToBuf.c
trunk/blender/intern/memutil/MEM_Allocator.h
trunk/blender/intern/memutil/MEM_RefCountPtr.h
trunk/blender/intern/memutil/MEM_SmartPtr.h
trunk/blender/intern/mikktspace/mikktspace.c
trunk/blender/intern/raskter/raskter.c
trunk/blender/intern/utfconv/utfconv.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/intern/math_color.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/compositor/operations/COM_ImageOperation.cpp
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.cpp
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/python/intern/bpy_library.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
Modified: trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
===================================================================
--- trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h 2012-06-04 20:11:09 UTC (rev 47435)
@@ -127,10 +127,10 @@
BSP_CSGMesh_VertexIt * v_it = new BSP_CSGMesh_VertexIt;
v_it->mesh = mesh;
- if( output->num_elements > 0 )
+ if ( output->num_elements > 0 )
v_it->pos = &mesh->VertexSet()[0];
output->it = v_it;
-};
+}
/**
Modified: trunk/blender/intern/container/intern/CTR_List.cpp
===================================================================
--- trunk/blender/intern/container/intern/CTR_List.cpp 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/container/intern/CTR_List.cpp 2012-06-04 20:11:09 UTC (rev 47435)
@@ -33,118 +33,95 @@
#include "CTR_List.h"
-CTR_Link::
-CTR_Link(
-) :
+CTR_Link::CTR_Link() :
m_next(0),
m_prev(0)
{
}
-CTR_Link::
-CTR_Link(
- CTR_Link *next,
- CTR_Link *prev
-) :
+CTR_Link::CTR_Link(CTR_Link *next, CTR_Link *prev) :
m_next(next),
m_prev(prev)
{
}
- CTR_Link *
-CTR_Link::
-getNext(
-) const {
+CTR_Link *
+CTR_Link::getNext() const
+{
return m_next;
}
- CTR_Link *
-CTR_Link::
-getPrev(
-) const {
+CTR_Link *
+CTR_Link::getPrev() const
+{
return m_prev;
}
- bool
-CTR_Link::
-isHead(
-) const {
+bool
+CTR_Link::isHead() const
+{
return m_prev == 0;
}
- bool
-CTR_Link::
-isTail(
-) const {
+bool
+CTR_Link::isTail() const
+{
return m_next == 0;
}
- void
-CTR_Link::
-insertBefore(
- CTR_Link *link
-) {
- m_next = link;
- m_prev = link->m_prev;
- m_next->m_prev = this;
- m_prev->m_next = this;
+void
+CTR_Link::insertBefore(CTR_Link *link)
+{
+ m_next = link;
+ m_prev = link->m_prev;
+ m_next->m_prev = this;
+ m_prev->m_next = this;
}
- void
-CTR_Link::
-insertAfter(
- CTR_Link *link
-) {
- m_next = link->m_next;
- m_prev = link;
- m_next->m_prev = this;
- m_prev->m_next = this;
+void
+CTR_Link::insertAfter(CTR_Link *link)
+{
+ m_next = link->m_next;
+ m_prev = link;
+ m_next->m_prev = this;
+ m_prev->m_next = this;
}
- void
-CTR_Link::
-remove(
-) {
- m_next->m_prev = m_prev;
- m_prev->m_next = m_next;
+void
+CTR_Link::remove()
+{
+ m_next->m_prev = m_prev;
+ m_prev->m_next = m_next;
}
-CTR_List::
-CTR_List(
-) :
+CTR_List::CTR_List() :
m_head(&m_tail, 0),
m_tail(0, &m_head)
{
}
- CTR_Link *
-CTR_List::
-getHead(
-) const {
+CTR_Link *
+CTR_List:: getHead() const
+{
return m_head.getNext();
}
- CTR_Link *
-CTR_List::
-getTail(
-) const {
+CTR_Link *
+CTR_List::getTail() const
+{
return m_tail.getPrev();
}
- void
-CTR_List::
-addHead(
- CTR_Link *link
-) {
+void
+CTR_List::addHead(CTR_Link *link)
+{
link->insertAfter(&m_head);
}
- void
-CTR_List::
-addTail(
- CTR_Link *link
-) {
+void
+CTR_List::addTail(CTR_Link *link)
+{
link->insertBefore(&m_tail);
}
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerNULL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerNULL.h 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerNULL.h 2012-06-04 20:11:09 UTC (rev 47435)
@@ -41,7 +41,7 @@
GHOST_TSuccess getNumDisplaySettings( GHOST_TUns8 display, GHOST_TInt32& numSettings ) const{ return GHOST_kFailure; }
GHOST_TSuccess getDisplaySetting( GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting ) const { return GHOST_kFailure; }
GHOST_TSuccess getCurrentDisplaySetting( GHOST_TUns8 display, GHOST_DisplaySetting& setting ) const { return getDisplaySetting(display,GHOST_TInt32(0),setting); }
- GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ){ return GHOST_kSuccess; }
+ GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ) { return GHOST_kSuccess; }
private:
GHOST_SystemNULL * m_system;
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h 2012-06-04 20:11:09 UTC (rev 47435)
@@ -60,27 +60,27 @@
}
protected:
- GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ){ return GHOST_kSuccess; }
- GHOST_TSuccess removeDrawingContext( ){ return GHOST_kSuccess; }
- GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ){ return GHOST_kSuccess; }
- GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ){ return GHOST_kSuccess; }
+ GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ) { return GHOST_kSuccess; }
+ GHOST_TSuccess removeDrawingContext( ) { return GHOST_kSuccess; }
+ GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ) { return GHOST_kSuccess; }
+ GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ) { return GHOST_kSuccess; }
GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY ) { return GHOST_kSuccess; }
- GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ){ return GHOST_kSuccess; }
+ GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ) { return GHOST_kSuccess; }
bool getValid( ) const { return true; }
- void setTitle( const STR_String& title ){ /* nothing */ }
+ void setTitle( const STR_String& title ) { /* nothing */ }
void getTitle( STR_String& title ) const { title= "untitled"; }
void getWindowBounds( GHOST_Rect& bounds ) const { getClientBounds(bounds); }
void getClientBounds( GHOST_Rect& bounds ) const { /* nothing */ }
- GHOST_TSuccess setClientWidth( GHOST_TUns32 width ){ return GHOST_kFailure; }
- GHOST_TSuccess setClientHeight( GHOST_TUns32 height ){ return GHOST_kFailure; }
- GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ){ return GHOST_kFailure; }
+ GHOST_TSuccess setClientWidth( GHOST_TUns32 width ) { return GHOST_kFailure; }
+ GHOST_TSuccess setClientHeight( GHOST_TUns32 height ) { return GHOST_kFailure; }
+ GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ) { return GHOST_kFailure; }
void screenToClient( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
void clientToScreen( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; }
- GHOST_TSuccess swapBuffers( ){ return GHOST_kFailure; }
- GHOST_TSuccess activateDrawingContext( ){ return GHOST_kFailure; }
- ~GHOST_WindowNULL( ){ /* nothing */ }
- GHOST_TSuccess setWindowCursorVisibility( bool visible ){ return GHOST_kSuccess; }
+ GHOST_TSuccess swapBuffers( ) { return GHOST_kFailure; }
+ GHOST_TSuccess activateDrawingContext( ) { return GHOST_kFailure; }
+ ~GHOST_WindowNULL( ) { /* nothing */ }
+ GHOST_TSuccess setWindowCursorVisibility( bool visible ) { return GHOST_kSuccess; }
GHOST_TSuccess setState(GHOST_TWindowState state) { return GHOST_kSuccess; }
GHOST_TWindowState getState() const { return GHOST_kWindowStateNormal; }
GHOST_TSuccess invalidate() { return GHOST_kSuccess; }
Modified: trunk/blender/intern/ghost/test/multitest/EventToBuf.c
===================================================================
--- trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/ghost/test/multitest/EventToBuf.c 2012-06-04 20:11:09 UTC (rev 47435)
@@ -36,7 +36,7 @@
char *eventtype_to_string(GHOST_TEventType type)
{
- switch(type) {
+ switch (type) {
case GHOST_kEventCursorMove: return "CursorMove";
case GHOST_kEventButtonDown: return "ButtonDown";
case GHOST_kEventButtonUp: return "ButtonUp";
Modified: trunk/blender/intern/memutil/MEM_Allocator.h
===================================================================
--- trunk/blender/intern/memutil/MEM_Allocator.h 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/memutil/MEM_Allocator.h 2012-06-04 20:11:09 UTC (rev 47435)
@@ -72,7 +72,7 @@
}
// __p is not permitted to be a null pointer.
- void deallocate(pointer __p, size_type){
+ void deallocate(pointer __p, size_type) {
MEM_freeN(__p);
}
Modified: trunk/blender/intern/memutil/MEM_RefCountPtr.h
===================================================================
--- trunk/blender/intern/memutil/MEM_RefCountPtr.h 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/memutil/MEM_RefCountPtr.h 2012-06-04 20:11:09 UTC (rev 47435)
@@ -98,7 +98,7 @@
*
* static
* MEM_RefCountPtr<RcUsefullClass>
- * New(...){
+ * New(...) {
* return MEM_RefCountPtr<RcUsefullClass> output(
* new UsefullClass(...)
* );
Modified: trunk/blender/intern/memutil/MEM_SmartPtr.h
===================================================================
--- trunk/blender/intern/memutil/MEM_SmartPtr.h 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/memutil/MEM_SmartPtr.h 2012-06-04 20:11:09 UTC (rev 47435)
@@ -119,7 +119,7 @@
MEM_SmartPtr(
const MEM_SmartPtr &rhs
- ){
+ ) {
m_val = rhs.Release();
}
Modified: trunk/blender/intern/mikktspace/mikktspace.c
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.c 2012-06-04 19:53:50 UTC (rev 47434)
+++ trunk/blender/intern/mikktspace/mikktspace.c 2012-06-04 20:11:09 UTC (rev 47435)
@@ -258,7 +258,7 @@
{
const int verts = pContext->m_pInterface->m_getNumVerticesOfFace(pContext, f);
if (verts==3) ++iNrTrianglesIn;
- else if(verts==4) iNrTrianglesIn += 2;
+ else if (verts==4) iNrTrianglesIn += 2;
}
if (iNrTrianglesIn<=0) return TFALSE;
@@ -470,11 +470,11 @@
const SVec3 vP = GetPosition(pContext, index);
if (vMin.x > vP.x) vMin.x = vP.x;
- else if(vMax.x < vP.x) vMax.x = vP.x;
+ else if (vMax.x < vP.x) vMax.x = vP.x;
if (vMin.y > vP.y) vMin.y = vP.y;
- else if(vMax.y < vP.y) vMax.y = vP.y;
+ else if (vMax.y < vP.y) vMax.y = vP.y;
if (vMin.z > vP.z) vMin.z = vP.z;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list