Revision: 44726
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44726
Author: campbellbarton
Date: 2012-03-08 03:05:57 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
style cleanup - remove unneeded ';'s
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Expressions/Operator1Expr.h
trunk/blender/source/gameengine/Expressions/Operator2Expr.h
trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
trunk/blender/source/gameengine/Ketsji/BL_Action.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.h
trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
trunk/blender/source/gameengine/Ketsji/KX_Dome.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.h
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
trunk/blender/source/gameengine/Network/NG_NetworkMessage.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
Modified: trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
2012-03-08 02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
2012-03-08 03:05:57 UTC (rev 44726)
@@ -45,7 +45,7 @@
public:
KX_BlenderSystem();
- virtual ~KX_BlenderSystem() {};
+ virtual ~KX_BlenderSystem() {}
virtual double GetTimeInSeconds();
#ifdef WITH_CXX_GUARDEDALLOC
Modified: trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h 2012-03-08
02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h 2012-03-08
03:05:57 UTC (rev 44726)
@@ -63,16 +63,16 @@
m_lastDeformUpdate(-1)
{};
virtual ~BL_MeshDeformer();
- virtual void SetSimulatedTime(double time){};
+ virtual void SetSimulatedTime(double time){}
virtual bool Apply(class RAS_IPolyMaterial *mat);
- virtual bool Update(void){ return false; };
- virtual bool UpdateBuckets(void){ return false; };
- virtual RAS_Deformer* GetReplica(){return NULL;};
+ virtual bool Update(void){ return false; }
+ virtual bool UpdateBuckets(void){ return false; }
+ virtual RAS_Deformer* GetReplica(){return NULL;}
virtual void ProcessReplica();
- struct Mesh* GetMesh() { return m_bmesh; };
- virtual class RAS_MeshObject* GetRasMesh() { return
(RAS_MeshObject*)m_pMeshObject; };
+ struct Mesh* GetMesh() { return m_bmesh; }
+ virtual class RAS_MeshObject* GetRasMesh() { return
(RAS_MeshObject*)m_pMeshObject; }
virtual float (* GetTransVerts(int *tot))[3] { *tot= m_tvtot;
return m_transverts; }
- // virtual void InitDeform(double time){};
+ // virtual void InitDeform(double time){}
protected:
class RAS_MeshObject* m_pMeshObject;
Modified:
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
2012-03-08 02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
2012-03-08 03:05:57 UTC (rev 44726)
@@ -48,7 +48,7 @@
virtual ~BL_ScalarInterpolator() {}
virtual float GetValue(float currentTime) const;
- struct FCurve *GetFCurve() { return m_fcu;};
+ struct FCurve *GetFCurve() { return m_fcu; }
private:
struct FCurve *m_fcu;
Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2012-03-08 02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2012-03-08 03:05:57 UTC (rev 44726)
@@ -143,7 +143,7 @@
struct Scene* GetBlenderSceneForName(const STR_String& name);
-// struct Main* GetMain() { return m_maggie; };
+// struct Main* GetMain() { return m_maggie; }
struct Main* GetMainDynamicPath(const char *path);
vector<struct Main*> &GetMainDynamic();
Modified: trunk/blender/source/gameengine/Expressions/Operator1Expr.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Operator1Expr.h 2012-03-08
02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Expressions/Operator1Expr.h 2012-03-08
03:05:57 UTC (rev 44726)
@@ -31,7 +31,7 @@
virtual bool MergeExpression(CExpression* otherexpr);
virtual void BroadcastOperators(VALUE_OPERATOR op);
- virtual unsigned char GetExpressionID() { return
COPERATOR1EXPRESSIONID;};
+ virtual unsigned char GetExpressionID() { return
COPERATOR1EXPRESSIONID; }
CExpression* CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks);
//virtual bool IsInside(float x,float y,float z,bool bBorderInclude =
true);
virtual bool NeedsRecalculated();
Modified: trunk/blender/source/gameengine/Expressions/Operator2Expr.h
===================================================================
--- trunk/blender/source/gameengine/Expressions/Operator2Expr.h 2012-03-08
02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Expressions/Operator2Expr.h 2012-03-08
03:05:57 UTC (rev 44726)
@@ -29,7 +29,7 @@
public:
virtual bool MergeExpression(CExpression* otherexpr);
- virtual unsigned char GetExpressionID() { return
COPERATOR2EXPRESSIONID;};
+ virtual unsigned char GetExpressionID() { return
COPERATOR2EXPRESSIONID; }
virtual void BroadcastOperators(VALUE_OPERATOR op);
CExpression* CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks);
//virtual bool IsInside(float x,float y,float z,bool
bBorderInclude=true);
Modified: trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
2012-03-08 02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/GameLogic/SCA_LogicManager.h
2012-03-08 03:05:57 UTC (rev 44726)
@@ -127,8 +127,8 @@
// for the scripting... needs a FactoryManager later (if we would have
time... ;)
void RegisterMeshName(const STR_String& meshname,void* mesh);
void UnregisterMeshName(const STR_String& meshname,void* mesh);
- CTR_Map<STR_HashedString,void*>& GetMeshMap() { return
m_mapStringToMeshes; };
- CTR_Map<STR_HashedString,void*>& GetActionMap() { return
m_mapStringToActions; };
+ CTR_Map<STR_HashedString,void*>& GetMeshMap() { return
m_mapStringToMeshes; }
+ CTR_Map<STR_HashedString,void*>& GetActionMap() { return
m_mapStringToActions; }
void RegisterActionName(const STR_String& actname,void* action);
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
2012-03-08 02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
2012-03-08 03:05:57 UTC (rev 44726)
@@ -55,14 +55,14 @@
virtual void SetMousePosition(int x, int y);
virtual void SetMouseState(RAS_MouseState mousestate);
virtual void SwapBuffers();
- virtual int GetMouseX(int x){return x;};
- virtual int GetMouseY(int y){return y;};
+ virtual int GetMouseX(int x) { return x; }
+ virtual int GetMouseY(int y) { return y; }
virtual float GetMouseNormalizedX(int x);
virtual float GetMouseNormalizedY(int y);
virtual void ResizeWindow(int width, int height);
- bool BeginDraw() { return true;};
+ bool BeginDraw() { return true; }
void EndDraw() {};
};
Modified: trunk/blender/source/gameengine/Ketsji/BL_Action.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Action.cpp 2012-03-08
02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Ketsji/BL_Action.cpp 2012-03-08
03:05:57 UTC (rev 44726)
@@ -25,6 +25,7 @@
*/
#include <cstdlib>
+#include <stdio.h>
#include "BL_Action.h"
#include "BL_ArmatureObject.h"
Modified: trunk/blender/source/gameengine/Ketsji/BL_Shader.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Shader.h 2012-03-08 02:19:41 UTC
(rev 44725)
+++ trunk/blender/source/gameengine/Ketsji/BL_Shader.h 2012-03-08 03:05:57 UTC
(rev 44726)
@@ -194,7 +194,7 @@
bool Ok()const;
unsigned int GetProg();
void SetProg(bool enable);
- int GetAttribute(){return mAttr;};
+ int GetAttribute() { return mAttr; }
// --
// Apply methods : sets colected uniforms
Modified: trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
2012-03-08 02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Ketsji/KX_ConstraintWrapper.h
2012-03-08 03:05:57 UTC (rev 44726)
@@ -41,7 +41,7 @@
public:
KX_ConstraintWrapper(PHY_ConstraintType ctype,int constraintId,class
PHY_IPhysicsEnvironment* physenv);
virtual ~KX_ConstraintWrapper ();
- int getConstraintId() { return m_constraintId;};
+ int getConstraintId() { return m_constraintId; }
#ifdef WITH_PYTHON
KX_PYMETHOD_NOARGS(KX_ConstraintWrapper,GetConstraintId);
Modified: trunk/blender/source/gameengine/Ketsji/KX_Dome.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Dome.h 2012-03-08 02:19:41 UTC
(rev 44725)
+++ trunk/blender/source/gameengine/Ketsji/KX_Dome.h 2012-03-08 03:05:57 UTC
(rev 44726)
@@ -112,7 +112,7 @@
int nfacestop, nfacesbottom, nfacesleft, nfacesright, nfacesfront,
nfacesback;
int nfacesleftback, nfacesrightback;
- int GetNumberRenders(){return m_numfaces;};
+ int GetNumberRenders() { return m_numfaces; }
void RenderDome(void);
void RenderDomeFrame(KX_Scene* scene, KX_Camera* cam, int i);
Modified: trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h 2012-03-08
02:19:41 UTC (rev 44725)
+++ trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h 2012-03-08
03:05:57 UTC (rev 44726)
@@ -72,12 +72,12 @@
{
private:
- class RAS_ICanvas* m_canvas; // 2D Canvas
(2D Rendering Device Context)
+ class RAS_ICanvas* m_canvas; // 2D
Canvas (2D Rendering Device Context)
class RAS_IRasterizer* m_rasterizer; // 3D
Rasterizer (3D Rendering)
- class KX_ISystem* m_kxsystem;
+ class KX_ISystem* m_kxsystem;
class RAS_IRenderTools* m_rendertools;
class KX_ISceneConverter* m_sceneconverter;
- class NG_NetworkDeviceInterface* m_networkdevice;
+ class NG_NetworkDeviceInterface* m_networkdevice;
#ifdef WITH_PYTHON
/* borrowed from sys.modules["__main__"], dont manage ref's */
PyObject* m_pythondictionary;
@@ -222,16 +222,16 @@
void SetRasterizer(RAS_IRasterizer* rasterizer);
#ifdef WITH_PYTHON
void SetPyNamespace(PyObject* pythondictionary);
- PyObject* GetPyNamespace(){return m_pythondictionary;};
+ PyObject* GetPyNamespace() { return m_pythondictionary; }
#endif
void SetSceneConverter(KX_ISceneConverter*
sceneconverter);
void SetAnimRecordMode(bool animation_record, int
startFrame);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
