diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 14:41:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 14:41:31 +0400 |
commit | b8e019d8396ed102323df234df8b1cc6b35712a1 (patch) | |
tree | 64f4fdb413336113b8c92198097831941c6fc171 /source/gameengine/Ketsji | |
parent | 3dd449ae4fbb2eb6f9eb63e9f9de61def58abe16 (diff) |
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
Diffstat (limited to 'source/gameengine/Ketsji')
73 files changed, 192 insertions, 192 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.h b/source/gameengine/Ketsji/BL_Action.h index 3efea0576fd..e5e325a2ba0 100644 --- a/source/gameengine/Ketsji/BL_Action.h +++ b/source/gameengine/Ketsji/BL_Action.h @@ -24,8 +24,8 @@ * \ingroup ketsji */ -#ifndef __BL_ACTION -#define __BL_ACTION +#ifndef __BL_ACTION_H__ +#define __BL_ACTION_H__ #include <vector> diff --git a/source/gameengine/Ketsji/BL_ActionManager.h b/source/gameengine/Ketsji/BL_ActionManager.h index 2ba84863f95..d4351e3c704 100644 --- a/source/gameengine/Ketsji/BL_ActionManager.h +++ b/source/gameengine/Ketsji/BL_ActionManager.h @@ -24,8 +24,8 @@ * \ingroup ketsji */ -#ifndef __BL_ACTIONMANAGER -#define __BL_ACTIONMANAGER +#ifndef __BL_ACTIONMANAGER_H__ +#define __BL_ACTIONMANAGER_H__ #include "BL_Action.h" diff --git a/source/gameengine/Ketsji/BL_BlenderShader.h b/source/gameengine/Ketsji/BL_BlenderShader.h index 1331899a6b2..d309b1236fc 100644 --- a/source/gameengine/Ketsji/BL_BlenderShader.h +++ b/source/gameengine/Ketsji/BL_BlenderShader.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __BL_GPUSHADER_H__ -#define __BL_GPUSHADER_H__ +#ifndef __BL_BLENDERSHADER_H__ +#define __BL_BLENDERSHADER_H__ #include "GPU_material.h" @@ -103,4 +103,4 @@ public: #endif }; -#endif//__BL_GPUSHADER_H__ +#endif//__BL_BLENDERSHADER_H__ diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h index d14d3600b48..4f560428fbb 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h @@ -30,8 +30,8 @@ * \brief Ketsji Logic Extenstion: Network Event Manager class */ -#ifndef KX_NETWORK_EVENTMANAGER_H -#define KX_NETWORK_EVENTMANAGER_H +#ifndef __KX_NETWORKEVENTMANAGER_H__ +#define __KX_NETWORKEVENTMANAGER_H__ #include "SCA_EventManager.h" @@ -52,5 +52,5 @@ public: return m_ndi; } }; -#endif //KX_NETWORK_EVENTMANAGER_H +#endif //__KX_NETWORKEVENTMANAGER_H__ diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h index f3447356055..3c8d8ec23d2 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h @@ -30,8 +30,8 @@ * \brief Ketsji Logic Extenstion: Network Message Actuator class */ -#ifndef __KX_NETWORKMESSAGEACTUATOR_H -#define __KX_NETWORKMESSAGEACTUATOR_H +#ifndef __KX_NETWORKMESSAGEACTUATOR_H__ +#define __KX_NETWORKMESSAGEACTUATOR_H__ #include "STR_String.h" #include "SCA_IActuator.h" @@ -69,5 +69,5 @@ public: }; -#endif //__KX_NETWORKMESSAGEACTUATOR_H +#endif //__KX_NETWORKMESSAGEACTUATOR_H__ diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h index 75800d9b9fa..0c76e718fa2 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h @@ -29,8 +29,8 @@ * \ingroup ketsjinet * \brief Ketsji Logic Extenstion: Network Message Sensor class */ -#ifndef __KX_NETWORKMESSAGE_SENSOR_H -#define __KX_NETWORKMESSAGE_SENSOR_H +#ifndef __KX_NETWORKMESSAGESENSOR_H__ +#define __KX_NETWORKMESSAGESENSOR_H__ #include "SCA_ISensor.h" @@ -87,5 +87,5 @@ public: }; -#endif //__KX_NETWORKMESSAGE_SENSOR_H +#endif //__KX_NETWORKMESSAGESENSOR_H__ diff --git a/source/gameengine/Ketsji/KX_ArmatureSensor.h b/source/gameengine/Ketsji/KX_ArmatureSensor.h index 683a54f65de..9c3faa355a6 100644 --- a/source/gameengine/Ketsji/KX_ArmatureSensor.h +++ b/source/gameengine/Ketsji/KX_ArmatureSensor.h @@ -30,8 +30,8 @@ * \brief Property sensor */ -#ifndef __KX_ARMATURESENSOR -#define __KX_ARMATURESENSOR +#ifndef __KX_ARMATURESENSOR_H__ +#define __KX_ARMATURESENSOR_H__ struct bConstraint; diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 18f9875a804..af6771933eb 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -3,8 +3,8 @@ * \ingroup ketsji */ -#ifndef __KX_BLENDER_MATERIAL_H__ -#define __KX_BLENDER_MATERIAL_H__ +#ifndef __KX_BLENDERMATERIAL_H__ +#define __KX_BLENDERMATERIAL_H__ #include <vector> diff --git a/source/gameengine/Ketsji/KX_BulletPhysicsController.h b/source/gameengine/Ketsji/KX_BulletPhysicsController.h index c0ff143919d..d2f56bccaa0 100644 --- a/source/gameengine/Ketsji/KX_BulletPhysicsController.h +++ b/source/gameengine/Ketsji/KX_BulletPhysicsController.h @@ -3,8 +3,8 @@ * \ingroup ketsji */ -#ifndef KX_BULLET2PHYSICS_CONTROLLER -#define KX_BULLET2PHYSICS_CONTROLLER +#ifndef __KX_BULLETPHYSICSCONTROLLER_H__ +#define __KX_BULLETPHYSICSCONTROLLER_H__ #include "KX_IPhysicsController.h" @@ -98,5 +98,5 @@ public: #endif }; -#endif //KX_BULLET2PHYSICS_CONTROLLER +#endif //__KX_BULLETPHYSICSCONTROLLER_H__ diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h index e9c4e99aa3b..2f5fe112de6 100644 --- a/source/gameengine/Ketsji/KX_Camera.h +++ b/source/gameengine/Ketsji/KX_Camera.h @@ -30,8 +30,8 @@ * \brief Camera in the gameengine. Cameras are also used for views. */ -#ifndef __KX_CAMERA -#define __KX_CAMERA +#ifndef __KX_CAMERA_H__ +#define __KX_CAMERA_H__ #include "MT_Transform.h" @@ -320,5 +320,5 @@ public: #endif }; -#endif //__KX_CAMERA +#endif //__KX_CAMERA_H__ diff --git a/source/gameengine/Ketsji/KX_CameraActuator.h b/source/gameengine/Ketsji/KX_CameraActuator.h index 1cae676fe3f..eb0a4574a8f 100644 --- a/source/gameengine/Ketsji/KX_CameraActuator.h +++ b/source/gameengine/Ketsji/KX_CameraActuator.h @@ -32,8 +32,8 @@ * \ingroup ketsji */ -#ifndef __KX_CAMERAACTUATOR -#define __KX_CAMERAACTUATOR +#ifndef __KX_CAMERAACTUATOR_H__ +#define __KX_CAMERAACTUATOR_H__ #include "SCA_IActuator.h" #include "MT_Scalar.h" @@ -135,5 +135,5 @@ private : }; -#endif //__KX_CAMERAACTUATOR +#endif //__KX_CAMERAACTUATOR_H__ diff --git a/source/gameengine/Ketsji/KX_CameraIpoSGController.h b/source/gameengine/Ketsji/KX_CameraIpoSGController.h index fb91455fed4..f24d0942290 100644 --- a/source/gameengine/Ketsji/KX_CameraIpoSGController.h +++ b/source/gameengine/Ketsji/KX_CameraIpoSGController.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_CAMERAIPOSGCONTROLLER_H -#define KX_CAMERAIPOSGCONTROLLER_H +#ifndef __KX_CAMERAIPOSGCONTROLLER_H__ +#define __KX_CAMERAIPOSGCONTROLLER_H__ #include "SG_Controller.h" #include "SG_Spatial.h" @@ -96,5 +96,5 @@ public: #endif }; -#endif // KX_CAMERAIPOSGCONTROLLER_H +#endif // __KX_CAMERAIPOSGCONTROLLER_H__ diff --git a/source/gameengine/Ketsji/KX_ClientObjectInfo.h b/source/gameengine/Ketsji/KX_ClientObjectInfo.h index 78f2f5446d4..1a94c39441f 100644 --- a/source/gameengine/Ketsji/KX_ClientObjectInfo.h +++ b/source/gameengine/Ketsji/KX_ClientObjectInfo.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_CLIENTOBJECT_INFO_H -#define __KX_CLIENTOBJECT_INFO_H +#ifndef __KX_CLIENTOBJECTINFO_H__ +#define __KX_CLIENTOBJECTINFO_H__ /* Note, the way this works with/without sumo is a bit odd */ @@ -86,5 +86,5 @@ public: #endif }; -#endif //__KX_CLIENTOBJECT_INFO_H +#endif //__KX_CLIENTOBJECTINFO_H__ diff --git a/source/gameengine/Ketsji/KX_ConstraintActuator.h b/source/gameengine/Ketsji/KX_ConstraintActuator.h index b513b141f3e..f491aedba74 100644 --- a/source/gameengine/Ketsji/KX_ConstraintActuator.h +++ b/source/gameengine/Ketsji/KX_ConstraintActuator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_CONSTRAINTACTUATOR -#define __KX_CONSTRAINTACTUATOR +#ifndef __KX_CONSTRAINTACTUATOR_H__ +#define __KX_CONSTRAINTACTUATOR_H__ #include "SCA_IActuator.h" #include "MT_Scalar.h" @@ -145,5 +145,5 @@ protected: }; -#endif //__KX_CONSTRAINTACTUATOR +#endif //__KX_CONSTRAINTACTUATOR_H__ diff --git a/source/gameengine/Ketsji/KX_ConstraintWrapper.h b/source/gameengine/Ketsji/KX_ConstraintWrapper.h index 980221bd4b3..bd27bc5b333 100644 --- a/source/gameengine/Ketsji/KX_ConstraintWrapper.h +++ b/source/gameengine/Ketsji/KX_ConstraintWrapper.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_CONSTRAINT_WRAPPER -#define KX_CONSTRAINT_WRAPPER +#ifndef __KX_CONSTRAINTWRAPPER_H__ +#define __KX_CONSTRAINTWRAPPER_H__ #include "Value.h" #include "PHY_DynamicTypes.h" @@ -57,5 +57,5 @@ private: PHY_IPhysicsEnvironment* m_physenv; }; -#endif //KX_CONSTRAINT_WRAPPER +#endif //__KX_CONSTRAINTWRAPPER_H__ diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index 9471d58bada..f1f58d7da9a 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_CONVERTPHYSICSOBJECTS -#define KX_CONVERTPHYSICSOBJECTS +#ifndef __KX_CONVERTPHYSICSOBJECT_H__ +#define __KX_CONVERTPHYSICSOBJECT_H__ class RAS_MeshObject; class KX_Scene; @@ -158,4 +158,4 @@ void KX_ClearBulletSharedShapes(); bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj); #endif -#endif //KX_CONVERTPHYSICSOBJECTS +#endif //__KX_CONVERTPHYSICSOBJECT_H__ diff --git a/source/gameengine/Ketsji/KX_EmptyObject.h b/source/gameengine/Ketsji/KX_EmptyObject.h index 845a37fa04a..7ad9984888d 100644 --- a/source/gameengine/Ketsji/KX_EmptyObject.h +++ b/source/gameengine/Ketsji/KX_EmptyObject.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_EMPTYOBJECT -#define __KX_EMPTYOBJECT +#ifndef __KX_EMPTYOBJECT_H__ +#define __KX_EMPTYOBJECT_H__ #include "KX_GameObject.h" class KX_EmptyObject : public KX_GameObject @@ -49,5 +49,5 @@ public: #endif }; -#endif //__KX_EMPTYOBJECT +#endif //__KX_EMPTYOBJECT_H__ diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h index 958a6cd3360..2466a32dad4 100644 --- a/source/gameengine/Ketsji/KX_FontObject.h +++ b/source/gameengine/Ketsji/KX_FontObject.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_FONTOBJECT -#define __KX_FONTOBJECT +#ifndef __KX_FONTOBJECT_H__ +#define __KX_FONTOBJECT_H__ #include "KX_GameObject.h" #include "DNA_vfont_types.h" #include "RAS_IRenderTools.h" @@ -84,4 +84,4 @@ public: }; -#endif //__KX_FONTOBJECT +#endif //__KX_FONTOBJECT_H__ diff --git a/source/gameengine/Ketsji/KX_GameActuator.h b/source/gameengine/Ketsji/KX_GameActuator.h index ebc6712a2dd..8356bc1068b 100644 --- a/source/gameengine/Ketsji/KX_GameActuator.h +++ b/source/gameengine/Ketsji/KX_GameActuator.h @@ -30,8 +30,8 @@ * \brief actuator for global game stuff */ -#ifndef __KX_GAMEACTUATOR -#define __KX_GAMEACTUATOR +#ifndef __KX_GAMEACTUATOR_H__ +#define __KX_GAMEACTUATOR_H__ #include "SCA_IActuator.h" diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h index a35e6f1b2cd..895140528e8 100644 --- a/source/gameengine/Ketsji/KX_GameObject.h +++ b/source/gameengine/Ketsji/KX_GameObject.h @@ -30,8 +30,8 @@ * \brief General KX game object. */ -#ifndef __KX_GAMEOBJECT -#define __KX_GAMEOBJECT +#ifndef __KX_GAMEOBJECT_H__ +#define __KX_GAMEOBJECT_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) // get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo @@ -1008,5 +1008,5 @@ public: -#endif //__KX_GAMEOBJECT +#endif //__KX_GAMEOBJECT_H__ diff --git a/source/gameengine/Ketsji/KX_IInterpolator.h b/source/gameengine/Ketsji/KX_IInterpolator.h index ed843962bd0..2e30d77f8e5 100644 --- a/source/gameengine/Ketsji/KX_IInterpolator.h +++ b/source/gameengine/Ketsji/KX_IInterpolator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_IINTERPOLATOR_H -#define KX_IINTERPOLATOR_H +#ifndef __KX_IINTERPOLATOR_H__ +#define __KX_IINTERPOLATOR_H__ #include <vector> diff --git a/source/gameengine/Ketsji/KX_IPOTransform.h b/source/gameengine/Ketsji/KX_IPOTransform.h index c028b4c49d2..43019f3e54a 100644 --- a/source/gameengine/Ketsji/KX_IPOTransform.h +++ b/source/gameengine/Ketsji/KX_IPOTransform.h @@ -30,8 +30,8 @@ * \brief An abstract object you can move around in a 3d world, and has some logic */ -#ifndef KX_IPOTRANSFORM_H -#define KX_IPOTRANSFORM_H +#ifndef __KX_IPOTRANSFORM_H__ +#define __KX_IPOTRANSFORM_H__ #include "MT_Transform.h" diff --git a/source/gameengine/Ketsji/KX_IPO_SGController.h b/source/gameengine/Ketsji/KX_IPO_SGController.h index f7e57014839..3abcaa3a39e 100644 --- a/source/gameengine/Ketsji/KX_IPO_SGController.h +++ b/source/gameengine/Ketsji/KX_IPO_SGController.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __IPO_SGCONTROLLER_H -#define __IPO_SGCONTROLLER_H +#ifndef __KX_IPO_SGCONTROLLER_H__ +#define __KX_IPO_SGCONTROLLER_H__ #include "SG_Controller.h" #include "SG_Spatial.h" @@ -127,6 +127,6 @@ public: #endif }; -#endif //__IPO_SGCONTROLLER_H +#endif //__KX_IPO_SGCONTROLLER_H__ diff --git a/source/gameengine/Ketsji/KX_IPhysicsController.h b/source/gameengine/Ketsji/KX_IPhysicsController.h index 2d08ef3a0da..5fc9f5c2473 100644 --- a/source/gameengine/Ketsji/KX_IPhysicsController.h +++ b/source/gameengine/Ketsji/KX_IPhysicsController.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_IPHYSICSCONTROLLER_H -#define __KX_IPHYSICSCONTROLLER_H +#ifndef __KX_IPHYSICSCONTROLLER_H__ +#define __KX_IPHYSICSCONTROLLER_H__ #include "SG_Controller.h" #include "MT_Vector3.h" @@ -138,5 +138,5 @@ public: #endif }; -#endif //__KX_IPHYSICSCONTROLLER_H +#endif //__KX_IPHYSICSCONTROLLER_H__ diff --git a/source/gameengine/Ketsji/KX_IScalarInterpolator.h b/source/gameengine/Ketsji/KX_IScalarInterpolator.h index 0ac765abb4f..72842f311c9 100644 --- a/source/gameengine/Ketsji/KX_IScalarInterpolator.h +++ b/source/gameengine/Ketsji/KX_IScalarInterpolator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_ISCALARINTERPOLATOR_H -#define KX_ISCALARINTERPOLATOR_H +#ifndef __KX_ISCALARINTERPOLATOR_H__ +#define __KX_ISCALARINTERPOLATOR_H__ #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" diff --git a/source/gameengine/Ketsji/KX_ISceneConverter.h b/source/gameengine/Ketsji/KX_ISceneConverter.h index 5afdaa971bc..dce97ea039f 100644 --- a/source/gameengine/Ketsji/KX_ISceneConverter.h +++ b/source/gameengine/Ketsji/KX_ISceneConverter.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_ISCENECONVERTER_H -#define __KX_ISCENECONVERTER_H +#ifndef __KX_ISCENECONVERTER_H__ +#define __KX_ISCENECONVERTER_H__ #include "STR_String.h" #include "KX_Python.h" @@ -95,5 +95,5 @@ public: #endif }; -#endif //__KX_ISCENECONVERTER_H +#endif //__KX_ISCENECONVERTER_H__ diff --git a/source/gameengine/Ketsji/KX_ISystem.h b/source/gameengine/Ketsji/KX_ISystem.h index d0a51490e28..4a6f7223d0a 100644 --- a/source/gameengine/Ketsji/KX_ISystem.h +++ b/source/gameengine/Ketsji/KX_ISystem.h @@ -30,8 +30,8 @@ * \brief Abstract system */ -#ifndef __KX_ISYSTEM -#define __KX_ISYSTEM +#ifndef __KX_ISYSTEM_H__ +#define __KX_ISYSTEM_H__ #include <vector> using namespace std; diff --git a/source/gameengine/Ketsji/KX_IpoActuator.h b/source/gameengine/Ketsji/KX_IpoActuator.h index 6b172ba8603..a8b7a362bd9 100644 --- a/source/gameengine/Ketsji/KX_IpoActuator.h +++ b/source/gameengine/Ketsji/KX_IpoActuator.h @@ -30,8 +30,8 @@ * \brief Do an object ipo */ -#ifndef __KX_IPOACTUATOR -#define __KX_IPOACTUATOR +#ifndef __KX_IPOACTUATOR_H__ +#define __KX_IPOACTUATOR_H__ #include "SCA_IActuator.h" @@ -150,5 +150,5 @@ public: }; -#endif //__KX_IPOACTUATOR +#endif //__KX_IPOACTUATOR_H__ diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h index 96b737b686d..ab3126d90a0 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.h +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h @@ -30,8 +30,8 @@ * \ingroup ketsji */ -#ifndef __KX_KETSJI_ENGINE -#define __KX_KETSJI_ENGINE +#ifndef __KX_KETSJIENGINE_H__ +#define __KX_KETSJIENGINE_H__ #include "MT_CmMatrix4x4.h" #include "MT_Matrix4x4.h" @@ -450,6 +450,6 @@ public: #endif }; -#endif //__KX_KETSJI_ENGINE +#endif //__KX_KETSJIENGINE_H__ diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h index bb081e6a444..c2815e7afaa 100644 --- a/source/gameengine/Ketsji/KX_Light.h +++ b/source/gameengine/Ketsji/KX_Light.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_LIGHT -#define __KX_LIGHT +#ifndef __KX_LIGHT_H__ +#define __KX_LIGHT_H__ #include "RAS_LightObject.h" #include "KX_GameObject.h" @@ -82,5 +82,5 @@ public: #endif }; -#endif //__KX_LIGHT +#endif //__KX_LIGHT_H__ diff --git a/source/gameengine/Ketsji/KX_LightIpoSGController.h b/source/gameengine/Ketsji/KX_LightIpoSGController.h index 61618c20183..78466e822e7 100644 --- a/source/gameengine/Ketsji/KX_LightIpoSGController.h +++ b/source/gameengine/Ketsji/KX_LightIpoSGController.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_LIGHTIPOSGCONTROLLER_H -#define KX_LIGHTIPOSGCONTROLLER_H +#ifndef __KX_LIGHTIPOSGCONTROLLER_H__ +#define __KX_LIGHTIPOSGCONTROLLER_H__ #include "SG_Controller.h" #include "SG_Spatial.h" @@ -104,5 +104,5 @@ public: #endif }; -#endif // KX_LIGHTIPOSGCONTROLLER_H +#endif // __KX_LIGHTIPOSGCONTROLLER_H__ diff --git a/source/gameengine/Ketsji/KX_MeshProxy.h b/source/gameengine/Ketsji/KX_MeshProxy.h index f59418a5de2..dfaf1eba009 100644 --- a/source/gameengine/Ketsji/KX_MeshProxy.h +++ b/source/gameengine/Ketsji/KX_MeshProxy.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_MESHPROXY -#define __KX_MESHPROXY +#ifndef __KX_MESHPROXY_H__ +#define __KX_MESHPROXY_H__ #ifdef WITH_PYTHON @@ -79,5 +79,5 @@ public: #endif // WITH_PYTHON -#endif //__KX_MESHPROXY +#endif //__KX_MESHPROXY_H__ diff --git a/source/gameengine/Ketsji/KX_MotionState.h b/source/gameengine/Ketsji/KX_MotionState.h index b18a745ad92..02470f88c5e 100644 --- a/source/gameengine/Ketsji/KX_MotionState.h +++ b/source/gameengine/Ketsji/KX_MotionState.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_MOTIONSTATE -#define __KX_MOTIONSTATE +#ifndef __KX_MOTIONSTATE_H__ +#define __KX_MOTIONSTATE_H__ #include "PHY_IMotionState.h" @@ -63,5 +63,5 @@ public: #endif }; -#endif //__KX_MOTIONSTATE +#endif //__KX_MOTIONSTATE_H__ diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.h b/source/gameengine/Ketsji/KX_MouseFocusSensor.h index 43bf6bc5302..a4c15fe0968 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.h +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.h @@ -30,8 +30,8 @@ * \brief KX_MouseFocusSensor determines mouse in/out/over events. */ -#ifndef __KX_MOUSEFOCUSSENSOR -#define __KX_MOUSEFOCUSSENSOR +#ifndef __KX_MOUSEFOCUSSENSOR_H__ +#define __KX_MOUSEFOCUSSENSOR_H__ #include "SCA_MouseSensor.h" diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.h b/source/gameengine/Ketsji/KX_NavMeshObject.h index ad128a0891d..b9c1fcc66db 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.h +++ b/source/gameengine/Ketsji/KX_NavMeshObject.h @@ -24,8 +24,8 @@ * * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __KX_NAVMESHOBJECT -#define __KX_NAVMESHOBJECT +#ifndef __KX_NAVMESHOBJECT_H__ +#define __KX_NAVMESHOBJECT_H__ #include "DetourStatNavMesh.h" #include "KX_GameObject.h" #include "PyObjectPlus.h" @@ -77,5 +77,5 @@ public: #endif }; -#endif //__KX_NAVMESHOBJECT +#endif //__KX_NAVMESHOBJECT_H__ diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index a81d621e8fc..ffe077b9738 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -30,8 +30,8 @@ * \brief Sense if other objects are near */ -#ifndef KX_NEARSENSOR_H -#define KX_NEARSENSOR_H +#ifndef __KX_NEARSENSOR_H__ +#define __KX_NEARSENSOR_H__ #include "KX_TouchSensor.h" #include "KX_ClientObjectInfo.h" @@ -104,5 +104,5 @@ public: }; -#endif //KX_NEARSENSOR_H +#endif //__KX_NEARSENSOR_H__ diff --git a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h index 230ef93905b..d2d69d6db12 100644 --- a/source/gameengine/Ketsji/KX_ObColorIpoSGController.h +++ b/source/gameengine/Ketsji/KX_ObColorIpoSGController.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_OBCOLORIPOSGCONTROLLER_H -#define KX_OBCOLORIPOSGCONTROLLER_H +#ifndef __KX_OBCOLORIPOSGCONTROLLER_H__ +#define __KX_OBCOLORIPOSGCONTROLLER_H__ #include "SG_Controller.h" #include "SG_Spatial.h" @@ -79,5 +79,5 @@ public: #endif }; -#endif // KX_OBCOLORIPOSGCONTROLLER_H +#endif // __KX_OBCOLORIPOSGCONTROLLER_H__ diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.h b/source/gameengine/Ketsji/KX_ObjectActuator.h index aa0f844eb88..397234488b7 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.h +++ b/source/gameengine/Ketsji/KX_ObjectActuator.h @@ -30,8 +30,8 @@ * \brief Do translation/rotation actions */ -#ifndef __KX_OBJECTACTUATOR -#define __KX_OBJECTACTUATOR +#ifndef __KX_OBJECTACTUATOR_H__ +#define __KX_OBJECTACTUATOR_H__ #include "SCA_IActuator.h" #include "MT_Vector3.h" @@ -222,5 +222,5 @@ public: }; -#endif //__KX_OBJECTACTUATOR +#endif //__KX_OBJECTACTUATOR_H__ diff --git a/source/gameengine/Ketsji/KX_ObstacleSimulation.h b/source/gameengine/Ketsji/KX_ObstacleSimulation.h index f429d7480c9..d9bda34f112 100644 --- a/source/gameengine/Ketsji/KX_ObstacleSimulation.h +++ b/source/gameengine/Ketsji/KX_ObstacleSimulation.h @@ -23,8 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __KX_OBSTACLESIMULATION -#define __KX_OBSTACLESIMULATION +#ifndef __KX_OBSTACLESIMULATION_H__ +#define __KX_OBSTACLESIMULATION_H__ #include <vector> #include "MT_Point2.h" diff --git a/source/gameengine/Ketsji/KX_OrientationInterpolator.h b/source/gameengine/Ketsji/KX_OrientationInterpolator.h index c9aacbafae2..1a4ed534d16 100644 --- a/source/gameengine/Ketsji/KX_OrientationInterpolator.h +++ b/source/gameengine/Ketsji/KX_OrientationInterpolator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_ORIENTATIONINTERPOLATOR -#define KX_ORIENTATIONINTERPOLATOR +#ifndef __KX_ORIENTATIONINTERPOLATOR_H__ +#define __KX_ORIENTATIONINTERPOLATOR_H__ #include "KX_IInterpolator.h" diff --git a/source/gameengine/Ketsji/KX_ParentActuator.h b/source/gameengine/Ketsji/KX_ParentActuator.h index d9509894748..6191b889da3 100644 --- a/source/gameengine/Ketsji/KX_ParentActuator.h +++ b/source/gameengine/Ketsji/KX_ParentActuator.h @@ -30,8 +30,8 @@ * \brief Set or remove an objects parent */ -#ifndef __KX_PARENTACTUATOR -#define __KX_PARENTACTUATOR +#ifndef __KX_PARENTACTUATOR_H__ +#define __KX_PARENTACTUATOR_H__ #include "SCA_IActuator.h" #include "SCA_LogicManager.h" diff --git a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h index 11474c678af..f20bab578d1 100644 --- a/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h +++ b/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_PHYSICSENGINEENUMS -#define __KX_PHYSICSENGINEENUMS +#ifndef __KX_PHYSICSENGINEENUMS_H__ +#define __KX_PHYSICSENGINEENUMS_H__ enum e_PhysicsEngine { @@ -43,5 +43,5 @@ enum e_PhysicsEngine UseBullet = 5, }; -#endif //__KX_PHYSICSENGINEENUMS +#endif //__KX_PHYSICSENGINEENUMS_H__ diff --git a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h index 4f03c8fbfb1..a074ff9a3bd 100644 --- a/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h +++ b/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef PHYP_PHYSICSOBJECT_WRAPPER -#define PHYP_PHYSICSOBJECT_WRAPPER +#ifndef __KX_PHYSICSOBJECTWRAPPER_H__ +#define __KX_PHYSICSOBJECTWRAPPER_H__ #include "Value.h" #include "PHY_DynamicTypes.h" @@ -56,5 +56,5 @@ private: PHY_IPhysicsEnvironment* m_physenv; }; -#endif //PHYP_PHYSICSOBJECT_WRAPPER +#endif //__KX_PHYSICSOBJECTWRAPPER_H__ diff --git a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h index bb2fb08644c..86ba2500763 100644 --- a/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h +++ b/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h @@ -30,8 +30,8 @@ * \todo check if this file is still needed */ -#ifndef KX_PROPSH -#define KX_PROPSH +#ifndef __KX_PHYSICSPROPERTIESOBSOLETE_H__ +#define __KX_PHYSICSPROPERTIESOBSOLETE_H__ #include <MT_Scalar.h> @@ -58,5 +58,5 @@ struct KX_MaterialProps { bool m_fh_normal; // Should the object slide off slopes? }; -#endif //KX_PROPSH +#endif //__KX_PHYSICSPROPERTIESOBSOLETE_H__ diff --git a/source/gameengine/Ketsji/KX_PositionInterpolator.h b/source/gameengine/Ketsji/KX_PositionInterpolator.h index 88124cfd085..ef5dfc8ac6b 100644 --- a/source/gameengine/Ketsji/KX_PositionInterpolator.h +++ b/source/gameengine/Ketsji/KX_PositionInterpolator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_POSITIONINTERPOLATOR -#define KX_POSITIONINTERPOLATOR +#ifndef __KX_POSITIONINTERPOLATOR_H__ +#define __KX_POSITIONINTERPOLATOR_H__ #include "KX_IInterpolator.h" diff --git a/source/gameengine/Ketsji/KX_PyConstraintBinding.h b/source/gameengine/Ketsji/KX_PyConstraintBinding.h index a5846d91a5c..2c98e6347da 100644 --- a/source/gameengine/Ketsji/KX_PyConstraintBinding.h +++ b/source/gameengine/Ketsji/KX_PyConstraintBinding.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef PHY_PYTHON_CONSTRAINTBINDING -#define PHY_PYTHON_CONSTRAINTBINDING +#ifndef __KX_PYCONSTRAINTBINDING_H__ +#define __KX_PYCONSTRAINTBINDING_H__ #ifdef WITH_PYTHON @@ -42,5 +42,5 @@ void PHY_SetActiveEnvironment(class PHY_IPhysicsEnvironment* env); PHY_IPhysicsEnvironment* PHY_GetActiveEnvironment(); #endif // WITH_PYTHON -#endif //PHY_PYTHON_CONSTRAINTBINDING +#endif //__KX_PYCONSTRAINTBINDING_H__ diff --git a/source/gameengine/Ketsji/KX_PythonInit.h b/source/gameengine/Ketsji/KX_PythonInit.h index 40d2d38a465..d8346018b55 100644 --- a/source/gameengine/Ketsji/KX_PythonInit.h +++ b/source/gameengine/Ketsji/KX_PythonInit.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_PYTHON_INIT -#define __KX_PYTHON_INIT +#ifndef __KX_PYTHONINIT_H__ +#define __KX_PYTHONINIT_H__ #include "KX_Python.h" #include "STR_String.h" @@ -74,5 +74,5 @@ void KX_RasterizerDrawDebugCircle(const MT_Vector3& center, const MT_Scalar rad const MT_Vector3& normal, int nsector); -#endif //__KX_PYTHON_INIT +#endif //__KX_PYTHONINIT_H__ diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h index ee803d9bdb9..f647189ab35 100644 --- a/source/gameengine/Ketsji/KX_RadarSensor.h +++ b/source/gameengine/Ketsji/KX_RadarSensor.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_RADAR_SENSOR_H -#define __KX_RADAR_SENSOR_H +#ifndef __KX_RADARSENSOR_H__ +#define __KX_RADARSENSOR_H__ #include "KX_NearSensor.h" #include "MT_Point3.h" @@ -95,5 +95,5 @@ public: }; -#endif //__KX_RADAR_SENSOR_H +#endif //__KX_RADARSENSOR_H__ diff --git a/source/gameengine/Ketsji/KX_RayEventManager.h b/source/gameengine/Ketsji/KX_RayEventManager.h index 0b1e525eccf..fee2fe53227 100644 --- a/source/gameengine/Ketsji/KX_RayEventManager.h +++ b/source/gameengine/Ketsji/KX_RayEventManager.h @@ -30,8 +30,8 @@ * \brief Manager for ray events */ -#ifndef __KX_RAYEVENTMGR -#define __KX_RAYEVENTMGR +#ifndef __KX_RAYEVENTMANAGER_H__ +#define __KX_RAYEVENTMANAGER_H__ #include "SCA_EventManager.h" #include <vector> using namespace std; @@ -52,5 +52,5 @@ public: #endif }; -#endif //__KX_RAYEVENTMGR +#endif //__KX_RAYEVENTMANAGER_H__ diff --git a/source/gameengine/Ketsji/KX_RaySensor.h b/source/gameengine/Ketsji/KX_RaySensor.h index 4c0009a5a4c..f5d1c72d098 100644 --- a/source/gameengine/Ketsji/KX_RaySensor.h +++ b/source/gameengine/Ketsji/KX_RaySensor.h @@ -30,8 +30,8 @@ * \brief Cast a ray and feel for objects */ -#ifndef __KX_RAYSENSOR_H -#define __KX_RAYSENSOR_H +#ifndef __KX_RAYSENSOR_H__ +#define __KX_RAYSENSOR_H__ #include "SCA_ISensor.h" #include "MT_Point3.h" @@ -100,5 +100,5 @@ public: }; -#endif //__KX_RAYSENSOR_H +#endif //__KX_RAYSENSOR_H__ diff --git a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h index ec5cf305c3e..d9cd1b5ff24 100644 --- a/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h @@ -30,8 +30,8 @@ * Please look here for revision history. */ -#ifndef __KX_SCA_AddObjectActuator -#define __KX_SCA_AddObjectActuator +#ifndef __KX_SCA_ADDOBJECTACTUATOR_H__ +#define __KX_SCA_ADDOBJECTACTUATOR_H__ /* Actuator tree */ #include "SCA_IActuator.h" diff --git a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h index 5fefbb8cca5..885c7a0297f 100644 --- a/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h @@ -30,8 +30,8 @@ * \brief Add object to the game world on action of this actuator */ -#ifndef __KX_SCA_DYNAMICACTUATOR -#define __KX_SCA_DYNAMICACTUATOR +#ifndef __KX_SCA_DYNAMICACTUATOR_H__ +#define __KX_SCA_DYNAMICACTUATOR_H__ #include "SCA_IActuator.h" #include "SCA_PropertyActuator.h" diff --git a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h index 7a325257e59..374d5f2f211 100644 --- a/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h @@ -32,8 +32,8 @@ * Please look here for revision history. */ -#ifndef __KX_SCA_ENDOBJECTACTUATOR -#define __KX_SCA_ENDOBJECTACTUATOR +#ifndef __KX_SCA_ENDOBJECTACTUATOR_H__ +#define __KX_SCA_ENDOBJECTACTUATOR_H__ #include "SCA_IActuator.h" diff --git a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h index 3e07ec2665c..c8e6123024d 100644 --- a/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h +++ b/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h @@ -32,8 +32,8 @@ * Please look here for revision history. */ -#ifndef __KX_SCA_REPLACEMESHACTUATOR -#define __KX_SCA_REPLACEMESHACTUATOR +#ifndef __KX_SCA_REPLACEMESHACTUATOR_H__ +#define __KX_SCA_REPLACEMESHACTUATOR_H__ #include "SCA_IActuator.h" #include "SCA_PropertyActuator.h" diff --git a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h index 0eff0ea62ba..734f82731b8 100644 --- a/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h +++ b/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h @@ -30,8 +30,8 @@ * \ingroup ketsji */ -#ifndef __KX_SG_BONEPARENTRELATION_H__ -#define __KX_SG_BONEPARENTRELATION_H__ +#ifndef __KX_SG_BONEPARENTNODERELATIONSHIP_H__ +#define __KX_SG_BONEPARENTNODERELATIONSHIP_H__ #include "SG_Spatial.h" #include "SG_ParentRelation.h" diff --git a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h index 94fea9687a5..44864c87cd7 100644 --- a/source/gameengine/Ketsji/KX_SG_NodeRelationships.h +++ b/source/gameengine/Ketsji/KX_SG_NodeRelationships.h @@ -39,8 +39,8 @@ * inherited by the child. */ -#ifndef __KX_SG_NODERELATIONS_H__ -#define __KX_SG_NODERELATIONS_H__ +#ifndef __KX_SG_NODERELATIONSHIPS_H__ +#define __KX_SG_NODERELATIONSHIPS_H__ #include "SG_Spatial.h" #include "SG_ParentRelation.h" diff --git a/source/gameengine/Ketsji/KX_ScalarInterpolator.h b/source/gameengine/Ketsji/KX_ScalarInterpolator.h index 9e5a43ecff9..d08a32ce0aa 100644 --- a/source/gameengine/Ketsji/KX_ScalarInterpolator.h +++ b/source/gameengine/Ketsji/KX_ScalarInterpolator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_SCALARINTERPOLATOR -#define KX_SCALARINTERPOLATOR +#ifndef __KX_SCALARINTERPOLATOR_H__ +#define __KX_SCALARINTERPOLATOR_H__ #include "MT_Scalar.h" #include "KX_IInterpolator.h" diff --git a/source/gameengine/Ketsji/KX_ScalingInterpolator.h b/source/gameengine/Ketsji/KX_ScalingInterpolator.h index 520706b9721..ae8b25f9185 100644 --- a/source/gameengine/Ketsji/KX_ScalingInterpolator.h +++ b/source/gameengine/Ketsji/KX_ScalingInterpolator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_SCALINGINTERPOLATOR -#define KX_SCALINGINTERPOLATOR +#ifndef __KX_SCALINGINTERPOLATOR_H__ +#define __KX_SCALINGINTERPOLATOR_H__ #include "KX_IInterpolator.h" diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index 8fcfe46e643..ca57548be2a 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_SCENE_H -#define __KX_SCENE_H +#ifndef __KX_SCENE_H__ +#define __KX_SCENE_H__ #include "KX_PhysicsEngineEnums.h" @@ -665,5 +665,5 @@ public: typedef std::vector<KX_Scene*> KX_SceneList; -#endif //__KX_SCENE_H +#endif //__KX_SCENE_H__ diff --git a/source/gameengine/Ketsji/KX_SceneActuator.h b/source/gameengine/Ketsji/KX_SceneActuator.h index 9064146a1d4..774f740dd00 100644 --- a/source/gameengine/Ketsji/KX_SceneActuator.h +++ b/source/gameengine/Ketsji/KX_SceneActuator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_SCENEACTUATOR -#define __KX_SCENEACTUATOR +#ifndef __KX_SCENEACTUATOR_H__ +#define __KX_SCENEACTUATOR_H__ #include "SCA_IActuator.h" #include "SCA_IScene.h" /* Replace_IScene only */ diff --git a/source/gameengine/Ketsji/KX_SoundActuator.h b/source/gameengine/Ketsji/KX_SoundActuator.h index b9119677f4f..71ec3ae2f59 100644 --- a/source/gameengine/Ketsji/KX_SoundActuator.h +++ b/source/gameengine/Ketsji/KX_SoundActuator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_SOUNDACTUATOR -#define __KX_SOUNDACTUATOR +#ifndef __KX_SOUNDACTUATOR_H__ +#define __KX_SOUNDACTUATOR_H__ #include "SCA_IActuator.h" @@ -127,5 +127,5 @@ public: }; -#endif //__KX_SOUNDACTUATOR +#endif //__KX_SOUNDACTUATOR_H__ diff --git a/source/gameengine/Ketsji/KX_StateActuator.h b/source/gameengine/Ketsji/KX_StateActuator.h index aa17b687463..5ed065d3604 100644 --- a/source/gameengine/Ketsji/KX_StateActuator.h +++ b/source/gameengine/Ketsji/KX_StateActuator.h @@ -30,8 +30,8 @@ * \brief Actuator to toggle visibility/invisibility of objects */ -#ifndef __KX_STATEACTUATOR -#define __KX_STATEACTUATOR +#ifndef __KX_STATEACTUATOR_H__ +#define __KX_STATEACTUATOR_H__ #include "SCA_IActuator.h" diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.h b/source/gameengine/Ketsji/KX_SteeringActuator.h index 0e9d4c7e3a0..f0c3e73ddec 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.h +++ b/source/gameengine/Ketsji/KX_SteeringActuator.h @@ -24,8 +24,8 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef __KX_STEERINGACTUATOR -#define __KX_STEERINGACTUATOR +#ifndef __KX_STEERINGACTUATOR_H__ +#define __KX_STEERINGACTUATOR_H__ #include "SCA_IActuator.h" #include "SCA_LogicManager.h" diff --git a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h index 9c9df290e43..f01e405d3df 100644 --- a/source/gameengine/Ketsji/KX_TimeCategoryLogger.h +++ b/source/gameengine/Ketsji/KX_TimeCategoryLogger.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_TIME_CATEGORY_LOGGER_H -#define __KX_TIME_CATEGORY_LOGGER_H +#ifndef __KX_TIMECATEGORYLOGGER_H__ +#define __KX_TIMECATEGORYLOGGER_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) #pragma warning (disable:4786) // suppress stl-MSVC debug info warning @@ -135,5 +135,5 @@ public: #endif }; -#endif // __KX_TIME_CATEGORY_LOGGER_H +#endif // __KX_TIMECATEGORYLOGGER_H__ diff --git a/source/gameengine/Ketsji/KX_TimeLogger.h b/source/gameengine/Ketsji/KX_TimeLogger.h index 0f29f44e726..16d97c1fe41 100644 --- a/source/gameengine/Ketsji/KX_TimeLogger.h +++ b/source/gameengine/Ketsji/KX_TimeLogger.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_TIME_LOGGER_H -#define __KX_TIME_LOGGER_H +#ifndef __KX_TIMELOGGER_H__ +#define __KX_TIMELOGGER_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) #pragma warning (disable:4786) // suppress stl-MSVC debug info warning @@ -113,5 +113,5 @@ public: #endif }; -#endif // __KX_TIME_LOGGER_H +#endif // __KX_TIMELOGGER_H__ diff --git a/source/gameengine/Ketsji/KX_TouchEventManager.h b/source/gameengine/Ketsji/KX_TouchEventManager.h index b219f334b84..38286cba9aa 100644 --- a/source/gameengine/Ketsji/KX_TouchEventManager.h +++ b/source/gameengine/Ketsji/KX_TouchEventManager.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_TOUCHEVENTMANAGER -#define __KX_TOUCHEVENTMANAGER +#ifndef __KX_TOUCHEVENTMANAGER_H__ +#define __KX_TOUCHEVENTMANAGER_H__ #include "SCA_EventManager.h" @@ -87,5 +87,5 @@ public: #endif }; -#endif //__KX_TOUCHEVENTMANAGER +#endif //__KX_TOUCHEVENTMANAGER_H__ diff --git a/source/gameengine/Ketsji/KX_TouchSensor.h b/source/gameengine/Ketsji/KX_TouchSensor.h index 1fae766aa13..1ce1742ed46 100644 --- a/source/gameengine/Ketsji/KX_TouchSensor.h +++ b/source/gameengine/Ketsji/KX_TouchSensor.h @@ -30,8 +30,8 @@ * \brief Senses touch and collision events */ -#ifndef __KX_TOUCHSENSOR -#define __KX_TOUCHSENSOR +#ifndef __KX_TOUCHSENSOR_H__ +#define __KX_TOUCHSENSOR_H__ #include "SCA_ISensor.h" #include "ListValue.h" @@ -132,5 +132,5 @@ public: }; -#endif //__KX_TOUCHSENSOR +#endif //__KX_TOUCHSENSOR_H__ diff --git a/source/gameengine/Ketsji/KX_TrackToActuator.h b/source/gameengine/Ketsji/KX_TrackToActuator.h index 30e276c0021..8eb69b1ad08 100644 --- a/source/gameengine/Ketsji/KX_TrackToActuator.h +++ b/source/gameengine/Ketsji/KX_TrackToActuator.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_TrackToActuator -#define __KX_TrackToActuator +#ifndef __KX_TRACKTOACTUATOR_H__ +#define __KX_TRACKTOACTUATOR_H__ #include "SCA_IActuator.h" #include "SCA_IObject.h" diff --git a/source/gameengine/Ketsji/KX_VehicleWrapper.h b/source/gameengine/Ketsji/KX_VehicleWrapper.h index f6e360d34a8..3684019277c 100644 --- a/source/gameengine/Ketsji/KX_VehicleWrapper.h +++ b/source/gameengine/Ketsji/KX_VehicleWrapper.h @@ -3,8 +3,8 @@ * \ingroup ketsji */ -#ifndef KX_VEHICLE_WRAPPER -#define KX_VEHICLE_WRAPPER +#ifndef __KX_VEHICLEWRAPPER_H__ +#define __KX_VEHICLEWRAPPER_H__ #include "Value.h" #include "PHY_DynamicTypes.h" @@ -59,4 +59,4 @@ private: PHY_IPhysicsEnvironment* m_physenv; }; -#endif //KX_VEHICLE_WRAPPER +#endif //__KX_VEHICLEWRAPPER_H__ diff --git a/source/gameengine/Ketsji/KX_VertexProxy.h b/source/gameengine/Ketsji/KX_VertexProxy.h index 905a4e0f4ab..baed5330f7e 100644 --- a/source/gameengine/Ketsji/KX_VertexProxy.h +++ b/source/gameengine/Ketsji/KX_VertexProxy.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_VERTEXPROXY -#define __KX_VERTEXPROXY +#ifndef __KX_VERTEXPROXY_H__ +#define __KX_VERTEXPROXY_H__ #ifdef WITH_PYTHON @@ -107,5 +107,5 @@ public: #endif // WITH_PYTHON -#endif //__KX_VERTEXPROXY +#endif //__KX_VERTEXPROXY_H__ diff --git a/source/gameengine/Ketsji/KX_VisibilityActuator.h b/source/gameengine/Ketsji/KX_VisibilityActuator.h index f5c45ecbd99..a207844db74 100644 --- a/source/gameengine/Ketsji/KX_VisibilityActuator.h +++ b/source/gameengine/Ketsji/KX_VisibilityActuator.h @@ -30,8 +30,8 @@ * \brief Actuator to toggle visibility/invisibility of objects */ -#ifndef __KX_VISIBILITYACTUATOR -#define __KX_VISIBILITYACTUATOR +#ifndef __KX_VISIBILITYACTUATOR_H__ +#define __KX_VISIBILITYACTUATOR_H__ #include "SCA_IActuator.h" diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h index c5ce5480409..cb4e9de50c2 100644 --- a/source/gameengine/Ketsji/KX_WorldInfo.h +++ b/source/gameengine/Ketsji/KX_WorldInfo.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef __KX_WORLDINFO_H -#define __KX_WORLDINFO_H +#ifndef __KX_WORLDINFO_H__ +#define __KX_WORLDINFO_H__ #include "MT_Scalar.h" @@ -76,5 +76,5 @@ public: #endif }; -#endif //__KX_WORLDINFO_H +#endif //__KX_WORLDINFO_H__ diff --git a/source/gameengine/Ketsji/KX_WorldIpoController.h b/source/gameengine/Ketsji/KX_WorldIpoController.h index 5c55e4fdc63..1f60280e355 100644 --- a/source/gameengine/Ketsji/KX_WorldIpoController.h +++ b/source/gameengine/Ketsji/KX_WorldIpoController.h @@ -29,8 +29,8 @@ * \ingroup ketsji */ -#ifndef KX_WORLDIPOCONTROLLER_H -#define KX_WORLDIPOCONTROLLER_H +#ifndef __KX_WORLDIPOCONTROLLER_H__ +#define __KX_WORLDIPOCONTROLLER_H__ #include "SG_Controller.h" #include "SG_Spatial.h" @@ -102,5 +102,5 @@ public: #endif }; -#endif // KX_LIGHTIPOSGCONTROLLER_H +#endif // __KX_WORLDIPOCONTROLLER_H__ |