style cleanup - remove unneeded ';'s
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Mar 2012 03:05:57 +0000 (03:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Mar 2012 03:05:57 +0000 (03:05 +0000)
25 files changed:
source/gameengine/BlenderRoutines/KX_BlenderSystem.h
source/gameengine/Converter/BL_MeshDeformer.h
source/gameengine/Converter/KX_BlenderScalarInterpolator.h
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Expressions/Operator1Expr.h
source/gameengine/Expressions/Operator2Expr.h
source/gameengine/GameLogic/SCA_LogicManager.h
source/gameengine/GamePlayer/ghost/GPG_Canvas.h
source/gameengine/Ketsji/BL_Action.cpp
source/gameengine/Ketsji/BL_Shader.h
source/gameengine/Ketsji/KX_ConstraintWrapper.h
source/gameengine/Ketsji/KX_Dome.h
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_MouseFocusSensor.h
source/gameengine/Ketsji/KX_NavMeshObject.cpp
source/gameengine/Ketsji/KX_NavMeshObject.h
source/gameengine/Ketsji/KX_NearSensor.h
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_SteeringActuator.cpp
source/gameengine/Ketsji/KX_SteeringActuator.h
source/gameengine/Network/NG_NetworkMessage.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
source/gameengine/Rasterizer/RAS_BucketManager.h
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h

index 90685e426e6d803fea2fe2e4db973e2e84f87881..2674c9a7aa1345d42239a989cfcf5420eb0448f7 100644 (file)
@@ -45,7 +45,7 @@ class KX_BlenderSystem : public KX_ISystem
 
 public:
        KX_BlenderSystem();
-       virtual ~KX_BlenderSystem() {};
+       virtual ~KX_BlenderSystem() {}
        virtual double GetTimeInSeconds();
 
 #ifdef WITH_CXX_GUARDEDALLOC
index 48775d6031a45407418cd1e736c2a679d66df354..b7d527d83eb45c3213e9ca10101e29bd08c6f717 100644 (file)
@@ -63,16 +63,16 @@ public:
                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;
index fc08d3b54d691257ba11c2080a555c84f141891e..cd18bd8c1d6be9f00bf521905cccfa7b5f259782 100644 (file)
@@ -48,7 +48,7 @@ public:
        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;
index f3c4627693bcc004af104e93915e26b157e6920b..258fb1ebdccc9e9405fa132deb4e435da89fc4f4 100644 (file)
@@ -143,7 +143,7 @@ public:
 
        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();
        
index c2e005c81965332746da7ada03c93a3d50d06cf0..9815ce16e9549f721ca490cf87436b2570533e9f 100644 (file)
@@ -31,7 +31,7 @@ public:
        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();
index 8064aeec3fc00da5b6175a2c54f5a507d43032c6..f003696b58008a3f884edeaf961ae51029e6a174 100644 (file)
@@ -29,7 +29,7 @@ class COperator2Expr : public CExpression
 
 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);
index d0bd49e71af3e81ae77c8f192e68a1cda9c5cde1..751c03bc712b183299a09b277a99be0f5742de8f 100644 (file)
@@ -127,8 +127,8 @@ public:
        // 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);
 
index e96cd50b9f4c74e16bf019f44ee889ea03b10cb2..d931f605a648963ebf761c75678907736cc887b7 100644 (file)
@@ -55,14 +55,14 @@ public:
        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() {};
 };
 
index 1d5a3dd461a62e69e1e15c776db300da2e6feb27..c187199c8d0fb330af6a40ffd174ab8f14f966b1 100644 (file)
@@ -25,6 +25,7 @@
  */
 
 #include <cstdlib>
+#include <stdio.h>
 
 #include "BL_Action.h"
 #include "BL_ArmatureObject.h"
index 32872592cc53a62a614fcce3f0bd23247df56267..3015dd204c82d3de677883c5af9feb00d5adc8cb 100644 (file)
@@ -194,7 +194,7 @@ public:
        bool                            Ok()const;
        unsigned int            GetProg();
        void                            SetProg(bool enable);
-       int                                     GetAttribute(){return mAttr;};
+       int                                     GetAttribute() { return mAttr; }
 
        // -- 
        // Apply methods : sets colected uniforms
index bd27bc5b3332aee614b9bf579f5b3b039be40916..a92ae83e7f0e3c675fe48bf500c4b1dcd38c2b06 100644 (file)
@@ -41,7 +41,7 @@ class KX_ConstraintWrapper : public PyObjectPlus
 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);
index 0436e910469d50c3b58a1de6be61bdd86ba4a769..922e2d4efb38d62fdc4ca8cd00c65e4bdc4f79e7 100644 (file)
@@ -112,7 +112,7 @@ public:
        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);
index 7a29e2a2731e1c5dac4c500758aecf99b950774e..b37ebd250a59ed4496729e5cbbff3329c1b85498 100644 (file)
@@ -72,12 +72,12 @@ class KX_KetsjiEngine
 {
 
 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 @@ public:
        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);
 
-       RAS_IRasterizer*                GetRasterizer(){return m_rasterizer;};
-       RAS_ICanvas*                GetCanvas(){return m_canvas;};
-       RAS_IRenderTools*           GetRenderTools(){return m_rendertools;};
-       SCA_IInputDevice*               GetKeyboardDevice(){return m_keyboarddevice;};
-       SCA_IInputDevice*               GetMouseDevice(){return m_mousedevice;};
+       RAS_IRasterizer*                GetRasterizer() { return m_rasterizer; }
+       RAS_ICanvas*                GetCanvas() { return m_canvas; }
+       RAS_IRenderTools*           GetRenderTools() { return m_rendertools; }
+       SCA_IInputDevice*               GetKeyboardDevice() { return m_keyboarddevice; }
+       SCA_IInputDevice*               GetMouseDevice() { return m_mousedevice; }
 
        /// Dome functions
        void                    InitDome(short res, short mode, short angle, float resbuf, short tilt, struct Text* text); 
@@ -265,7 +265,7 @@ public:
        void                    GetSceneViewport(KX_Scene* scene, KX_Camera* cam, RAS_Rect& area, RAS_Rect& viewport);
 
        void SetDrawType(int drawingtype);
-       int  GetDrawType(){return m_drawingmode;};
+       int  GetDrawType() { return m_drawingmode; }
 
        void SetCameraZoom(float camzoom);
        
index c8e9dc6b6b7193d50608de444b6a80785c6f5117..f8f5426dc8d154b11cfee53c91db3b6bf46c5b33 100644 (file)
@@ -61,7 +61,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
                                                KX_KetsjiEngine* kxengine,
                                                SCA_IObject* gameobj);
 
-       virtual ~KX_MouseFocusSensor() { ; };
+       virtual ~KX_MouseFocusSensor() { }
        virtual CValue* GetReplica() {
                CValue* replica = new KX_MouseFocusSensor(*this);
                // this will copy properties and so on...
index e6f8d7175dc57de8090f9ab4c13ce48d06931275..79e9c28a81c87bc92b30fae6d8bea67cdb7f4840 100644 (file)
@@ -620,7 +620,7 @@ void KX_NavMeshObject::DrawPath(const float *path, int pathLen, const MT_Vector3
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 //----------------------------------------------------------------------------
 //Python
 
@@ -718,4 +718,4 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_NavMeshObject, rebuild,
        Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index b9c1fcc66dbaed6f90e303b768606284c5303b1d..db35a011c16392075c7c952dcb53d74436c12a0a 100644 (file)
@@ -65,7 +65,7 @@ public:
 
        MT_Point3 TransformToLocalCoords(const MT_Point3& wpos);
        MT_Point3 TransformToWorldCoords(const MT_Point3& lpos);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
@@ -74,7 +74,7 @@ public:
        KX_PYMETHOD_DOC(KX_NavMeshObject, raycast);
        KX_PYMETHOD_DOC(KX_NavMeshObject, draw);
        KX_PYMETHOD_DOC_NOARGS(KX_NavMeshObject, rebuild);
-#endif
+#endif // WITH_PYTHON
 };
 
 #endif //__KX_NAVMESHOBJECT_H__
index ffe077b973842190effc0079a167ad8d57e529a7..1327f0aea379db57ced2609c9cca1f78bdcc3e04 100644 (file)
@@ -76,7 +76,7 @@ public:
        virtual bool    NewHandleCollision(void* obj1,void* obj2,
                                                 const PHY_CollData * coll_data); 
        virtual bool    BroadPhaseFilterCollision(void*obj1,void*obj2);
-       virtual bool    BroadPhaseSensorFilterCollision(void*obj1,void*obj2) { return false; };
+       virtual bool    BroadPhaseSensorFilterCollision(void* obj1,void* obj2) { return false; }
        virtual sensortype GetSensorType() { return ST_NEAR; }
 
 #ifdef WITH_PYTHON
index e89f1ed83a9a5720a7739e45cdadcd3631b13299..9f12d9473bc1aba8157d0d8a18118a8aa6d48ad7 100644 (file)
@@ -558,10 +558,10 @@ public:
        bool IsClearingZBuffer();
        void EnableZBufferClearing(bool isclearingZbuffer);
        // use of DBVT tree for camera culling
-       void SetDbvtCulling(bool b) { m_dbvt_culling = b; };
-       bool GetDbvtCulling() { return m_dbvt_culling; };
-       void SetDbvtOcclusionRes(int i) { m_dbvt_occlusion_res = i; };
-       int GetDbvtOcclusionRes() { return m_dbvt_occlusion_res; };
+       void SetDbvtCulling(bool b) { m_dbvt_culling = b; }
+       bool GetDbvtCulling() { return m_dbvt_culling; }
+       void SetDbvtOcclusionRes(int i) { m_dbvt_occlusion_res = i; }
+       int GetDbvtOcclusionRes() { return m_dbvt_occlusion_res; }
        
        void SetSceneConverter(class KX_BlenderSceneConverter* sceneConverter);
 
@@ -587,7 +587,7 @@ public:
        void Update2DFilter(std::vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
        void Render2DFilters(RAS_ICanvas* canvas);
 
-       KX_ObstacleSimulation* GetObstacleSimulation() {return m_obstacleSimulation;};
+       KX_ObstacleSimulation* GetObstacleSimulation() { return m_obstacleSimulation; }
 
 #ifdef WITH_PYTHON
        /* --------------------------------------------------------------------- */
@@ -628,8 +628,8 @@ public:
         */
        void RunDrawingCallbacks(PyObject* cb_list);
        
-       PyObject* GetPreDrawCB() { return m_draw_call_pre; };
-       PyObject* GetPostDrawCB() { return m_draw_call_post; };
+       PyObject* GetPreDrawCB() { return m_draw_call_pre; }
+       PyObject* GetPostDrawCB() { return m_draw_call_post; }
 #endif
 
        /**
index f9af9fc3b8e52cc039f588baa103a6718feac4d9..c4688af687b31e53a2af60030dfde8827e6b847d 100644 (file)
@@ -502,7 +502,7 @@ void KX_SteeringActuator::HandleActorFace(MT_Vector3& velocity)
 
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -620,7 +620,7 @@ PyObject* KX_SteeringActuator::pyattr_get_steeringVec(void *self, const struct K
        return PyObjectFrom(steeringVec);
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
 
index f0c3e73ddecd9f9c0ef583550083f022bc262d80..cd55f574e8ed41486048f86130f4c013c1ee7390 100644 (file)
@@ -99,7 +99,7 @@ public:
        virtual bool UnlinkObject(SCA_IObject* clientobj);
        const MT_Vector3& GetSteeringVec();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -113,7 +113,7 @@ public:
        static PyObject* pyattr_get_steeringVec(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; /* end of class KX_SteeringActuator : public SCA_PropertyActuator */
 
index a0c61784e9fe9195498fe5abca512598a5c3a0cc..7a55891552f65a28197c1207b6cb559caaa14359 100644 (file)
@@ -84,17 +84,17 @@ public:
        /**
         * get the (read-only) To part of this message
         */
-       const STR_String& GetDestinationName() { return m_to;};
+       const STR_String& GetDestinationName() { return m_to; }
 
        /**
         * get the (read-only) From part of this message
         */
-       const STR_String& GetSenderName() { return m_from;};
+       const STR_String& GetSenderName() { return m_from; }
 
        /**
         * get the (read-only) Subject part of this message
         */
-       const STR_String& GetSubject() { return m_subject;};
+       const STR_String& GetSubject() { return m_subject; }
 
        /**
         * get the (read-only) Body part of this message
index dba76c8d5facf2a36b28766dbb764e78409acced..552cca801debb0f22cc2fe57d973636a7cc311c5 100644 (file)
@@ -132,7 +132,7 @@ protected:
                }
                //returns 0.f if no fixed timestep is used
 
-               virtual float           getFixedTimeStep(){ return 0.f;};
+               virtual float           getFixedTimeStep() { return 0.f; }
 
                virtual void            setDebugMode(int debugMode);
 
index 032d9b03299cbae209f607ffd4f3d48233bfe232..dade2ad7c11938ace2c2d8e5594cd4476c0efd24 100644 (file)
@@ -65,8 +65,8 @@ public:
 
        /* for merging */
        void MergeBucketManager(RAS_BucketManager *other, SCA_IScene *scene);
-       BucketList & GetSolidBuckets() {return m_SolidBuckets;};
-       BucketList & GetAlphaBuckets() {return m_AlphaBuckets;};
+       BucketList & GetSolidBuckets() {return m_SolidBuckets;}
+       BucketList & GetAlphaBuckets() {return m_AlphaBuckets;}
 
        /*void PrintStats(int verbose_level) {
                printf("\nMappings...\n");
index 3257682649f477b01fd55c8aeebae6cfa94e317b..527114b300f3debb478d422885f5404af9bbdf3b 100644 (file)
@@ -130,7 +130,7 @@ public:
                                        bool image,
                                        struct GameSettings* game);
 
-       virtual ~RAS_IPolyMaterial() {};
+       virtual ~RAS_IPolyMaterial() {}
  
        /**
         * Returns the caching information for this material,
index e10d006994fe93954b91491ff4721aa183eb183a..3b4a6c4900c3435b8f093d81279803b73972ce66 100644 (file)
@@ -298,8 +298,8 @@ public:
        
        virtual void    EnableMotionBlur(float motionblurvalue);
        virtual void    DisableMotionBlur();
-       virtual float   GetMotionBlurValue(){return m_motionblurvalue;};
-       virtual int             GetMotionBlurState(){return m_motionblur;};
+       virtual float   GetMotionBlurValue() { return m_motionblurvalue; }
+       virtual int             GetMotionBlurState() { return m_motionblur; }
        virtual void    SetMotionBlurState(int newstate)
        {
                if(newstate<0)