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/Converter | |
parent | 3dd449ae4fbb2eb6f9eb63e9f9de61def58abe16 (diff) |
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
Diffstat (limited to 'source/gameengine/Converter')
21 files changed, 54 insertions, 54 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h index 29300281bb5..640a9a9ccb7 100644 --- a/source/gameengine/Converter/BL_ActionActuator.h +++ b/source/gameengine/Converter/BL_ActionActuator.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_ACTIONACTUATOR -#define BL_ACTIONACTUATOR +#ifndef __BL_ACTIONACTUATOR_H__ +#define __BL_ACTIONACTUATOR_H__ #include "CTR_HashedPtr.h" #include "SCA_IActuator.h" diff --git a/source/gameengine/Converter/BL_ArmatureActuator.h b/source/gameengine/Converter/BL_ArmatureActuator.h index 344b76ec278..761d429f784 100644 --- a/source/gameengine/Converter/BL_ArmatureActuator.h +++ b/source/gameengine/Converter/BL_ArmatureActuator.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_ARMATUREACTUATOR -#define BL_ARMATUREACTUATOR +#ifndef __BL_ARMATUREACTUATOR_H__ +#define __BL_ARMATUREACTUATOR_H__ #include "SCA_IActuator.h" #include "BL_ArmatureConstraint.h" @@ -91,6 +91,6 @@ private: int m_type; }; -#endif //BL_ARMATUREACTUATOR +#endif //__BL_ARMATUREACTUATOR_H__ diff --git a/source/gameengine/Converter/BL_ArmatureChannel.h b/source/gameengine/Converter/BL_ArmatureChannel.h index 585b6093a2b..3fd49c276ae 100644 --- a/source/gameengine/Converter/BL_ArmatureChannel.h +++ b/source/gameengine/Converter/BL_ArmatureChannel.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __BL_ARMATURECHANNEL -#define __BL_ARMATURECHANNEL +#ifndef __BL_ARMATURECHANNEL_H__ +#define __BL_ARMATURECHANNEL_H__ #include "DNA_action_types.h" #include "CTR_HashedPtr.h" @@ -94,5 +94,5 @@ public: }; -#endif //__BL_ARMATURECHANNEL +#endif //__BL_ARMATURECHANNEL_H__ diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.h b/source/gameengine/Converter/BL_ArmatureConstraint.h index 2abb36ff937..89bad520563 100644 --- a/source/gameengine/Converter/BL_ArmatureConstraint.h +++ b/source/gameengine/Converter/BL_ArmatureConstraint.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __BL_ARMATURECONSTRAINT -#define __BL_ARMATURECONSTRAINT +#ifndef __BL_ARMATURECONSTRAINT_H__ +#define __BL_ARMATURECONSTRAINT_H__ #include "DNA_constraint_types.h" #include "CTR_HashedPtr.h" @@ -117,5 +117,5 @@ public: #endif // WITH_PYTHON }; -#endif //__BL_ARMATURECONSTRAINT +#endif //__BL_ARMATURECONSTRAINT_H__ diff --git a/source/gameengine/Converter/BL_ArmatureObject.h b/source/gameengine/Converter/BL_ArmatureObject.h index 745ffac0cb2..a6848cf57df 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.h +++ b/source/gameengine/Converter/BL_ArmatureObject.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_ARMATUREOBJECT -#define BL_ARMATUREOBJECT +#ifndef __BL_ARMATUREOBJECT_H__ +#define __BL_ARMATUREOBJECT_H__ #include "KX_GameObject.h" #include "BL_ArmatureConstraint.h" diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.h b/source/gameengine/Converter/BL_BlenderDataConversion.h index 6da3ac90aef..e6c35c20f4c 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.h +++ b/source/gameengine/Converter/BL_BlenderDataConversion.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __BLENDER_CONVERT -#define __BLENDER_CONVERT +#ifndef __BL_BLENDERDATACONVERSION_H__ +#define __BL_BLENDERDATACONVERSION_H__ #include "CTR_HashedPtr.h" #include "STR_String.h" @@ -52,5 +52,5 @@ void BL_ConvertBlenderObjects(struct Main* maggie, SCA_IInputDevice::KX_EnumInputs ConvertKeyCode(int key_code); -#endif // __BLENDER_CONVERT +#endif // __BL_BLENDERDATACONVERSION_H__ diff --git a/source/gameengine/Converter/BL_DeformableGameObject.h b/source/gameengine/Converter/BL_DeformableGameObject.h index e86fff4fe69..b86069bca1b 100644 --- a/source/gameengine/Converter/BL_DeformableGameObject.h +++ b/source/gameengine/Converter/BL_DeformableGameObject.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_DEFORMABLEGAMEOBJECT -#define BL_DEFORMABLEGAMEOBJECT +#ifndef __BL_DEFORMABLEGAMEOBJECT_H__ +#define __BL_DEFORMABLEGAMEOBJECT_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h index 9c2065bddb8..48775d6031a 100644 --- a/source/gameengine/Converter/BL_MeshDeformer.h +++ b/source/gameengine/Converter/BL_MeshDeformer.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_MESHDEFORMER -#define BL_MESHDEFORMER +#ifndef __BL_MESHDEFORMER_H__ +#define __BL_MESHDEFORMER_H__ #include "RAS_Deformer.h" #include "DNA_object_types.h" diff --git a/source/gameengine/Converter/BL_ModifierDeformer.h b/source/gameengine/Converter/BL_ModifierDeformer.h index c9cd9153153..163b2dd108f 100644 --- a/source/gameengine/Converter/BL_ModifierDeformer.h +++ b/source/gameengine/Converter/BL_ModifierDeformer.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_MODIFIERDEFORMER -#define BL_MODIFIERDEFORMER +#ifndef __BL_MODIFIERDEFORMER_H__ +#define __BL_MODIFIERDEFORMER_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.h b/source/gameengine/Converter/BL_ShapeActionActuator.h index 90f44acb672..b88631c89d6 100644 --- a/source/gameengine/Converter/BL_ShapeActionActuator.h +++ b/source/gameengine/Converter/BL_ShapeActionActuator.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_SHAPEACTIONACTUATOR -#define BL_SHAPEACTIONACTUATOR +#ifndef __BL_SHAPEACTIONACTUATOR_H__ +#define __BL_SHAPEACTIONACTUATOR_H__ #include "CTR_HashedPtr.h" #include "SCA_IActuator.h" diff --git a/source/gameengine/Converter/BL_ShapeDeformer.h b/source/gameengine/Converter/BL_ShapeDeformer.h index c768b2e1e75..6b55d5b26f9 100644 --- a/source/gameengine/Converter/BL_ShapeDeformer.h +++ b/source/gameengine/Converter/BL_ShapeDeformer.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_SHAPEDEFORMER -#define BL_SHAPEDEFORMER +#ifndef __BL_SHAPEDEFORMER_H__ +#define __BL_SHAPEDEFORMER_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h index afec027e099..dd8577b382e 100644 --- a/source/gameengine/Converter/BL_SkinDeformer.h +++ b/source/gameengine/Converter/BL_SkinDeformer.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef BL_SKINDEFORMER -#define BL_SKINDEFORMER +#ifndef __BL_SKINDEFORMER_H__ +#define __BL_SKINDEFORMER_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning diff --git a/source/gameengine/Converter/BlenderWorldInfo.h b/source/gameengine/Converter/BlenderWorldInfo.h index 5d6ee6eaf19..e6f274b777e 100644 --- a/source/gameengine/Converter/BlenderWorldInfo.h +++ b/source/gameengine/Converter/BlenderWorldInfo.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __BLENDERWORLDINFO_H -#define __BLENDERWORLDINFO_H +#ifndef __BLENDERWORLDINFO_H__ +#define __BLENDERWORLDINFO_H__ #include "MT_CmMatrix4x4.h" #include "KX_WorldInfo.h" #include "KX_BlenderGL.h" @@ -106,5 +106,5 @@ public: #endif }; -#endif //__BLENDERWORLDINFO_H +#endif //__BLENDERWORLDINFO_H__ diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h index 23aef75e48f..fc08d3b54d6 100644 --- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.h +++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __KX_SCALARINTERPOLATOR_H -#define __KX_SCALARINTERPOLATOR_H +#ifndef __KX_BLENDERSCALARINTERPOLATOR_H__ +#define __KX_BLENDERSCALARINTERPOLATOR_H__ #include <vector> @@ -77,5 +77,5 @@ public: #endif }; -#endif //__KX_SCALARINTERPOLATOR_H +#endif //__KX_BLENDERSCALARINTERPOLATOR_H__ diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.h b/source/gameengine/Converter/KX_BlenderSceneConverter.h index 9c2143d2cab..f3c4627693b 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.h +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __KX_BLENDERSCENECONVERTER_H -#define __KX_BLENDERSCENECONVERTER_H +#ifndef __KX_BLENDERSCENECONVERTER_H__ +#define __KX_BLENDERSCENECONVERTER_H__ #include "KX_HashedPtr.h" #include "CTR_Map.h" @@ -197,5 +197,5 @@ public: #endif }; -#endif //__KX_BLENDERSCENECONVERTER_H +#endif //__KX_BLENDERSCENECONVERTER_H__ diff --git a/source/gameengine/Converter/KX_ConvertActuators.h b/source/gameengine/Converter/KX_ConvertActuators.h index 836bcd860fa..b7c890458cc 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.h +++ b/source/gameengine/Converter/KX_ConvertActuators.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __KX_CONVERTACTUATORS_H -#define __KX_CONVERTACTUATORS_H +#ifndef __KX_CONVERTACTUATORS_H__ +#define __KX_CONVERTACTUATORS_H__ void BL_ConvertActuators(const char* maggiename, struct Object* blenderobject, @@ -44,5 +44,5 @@ void BL_ConvertActuators(const char* maggiename, class KX_BlenderSceneConverter* converter); -#endif //__KX_CONVERTACTUATORS_H +#endif //__KX_CONVERTACTUATORS_H__ diff --git a/source/gameengine/Converter/KX_ConvertControllers.h b/source/gameengine/Converter/KX_ConvertControllers.h index 19045dc26d1..d1d52f866ec 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.h +++ b/source/gameengine/Converter/KX_ConvertControllers.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __KX_CONVERTCONTROLLERS_H -#define __KX_CONVERTCONTROLLERS_H +#ifndef __KX_CONVERTCONTROLLERS_H__ +#define __KX_CONVERTCONTROLLERS_H__ #include "KX_Python.h" @@ -44,5 +44,5 @@ void BL_ConvertControllers( ); -#endif //__KX_CONVERTCONTROLLERS_H +#endif //__KX_CONVERTCONTROLLERS_H__ diff --git a/source/gameengine/Converter/KX_ConvertProperties.h b/source/gameengine/Converter/KX_ConvertProperties.h index b151b70019d..5bfe202a539 100644 --- a/source/gameengine/Converter/KX_ConvertProperties.h +++ b/source/gameengine/Converter/KX_ConvertProperties.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __KX_CONVERTPROPERTIES -#define __KX_CONVERTPROPERTIES +#ifndef __KX_CONVERTPROPERTIES_H__ +#define __KX_CONVERTPROPERTIES_H__ void BL_ConvertProperties(struct Object* object, class KX_GameObject* gameobj, @@ -38,5 +38,5 @@ void BL_ConvertProperties(struct Object* object, class SCA_IScene* scene, bool isInActiveLayer); -#endif //__KX_CONVERTPROPERTIES +#endif //__KX_CONVERTPROPERTIES_H__ diff --git a/source/gameengine/Converter/KX_ConvertSensors.h b/source/gameengine/Converter/KX_ConvertSensors.h index 1405aee8701..0694815c77e 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.h +++ b/source/gameengine/Converter/KX_ConvertSensors.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __KX_CONVERTSENSOR_H -#define __KX_CONVERTSENSOR_H +#ifndef __KX_CONVERTSENSORS_H__ +#define __KX_CONVERTSENSORS_H__ void BL_ConvertSensors(struct Object* blenderobject, class KX_GameObject* gameobj, @@ -42,5 +42,5 @@ void BL_ConvertSensors(struct Object* blenderobject, class RAS_ICanvas* canvas, class KX_BlenderSceneConverter* converter); -#endif //__KX_CONVERTSENSOR_H +#endif //__KX_CONVERTSENSORS_H__ diff --git a/source/gameengine/Converter/KX_IpoConvert.h b/source/gameengine/Converter/KX_IpoConvert.h index 49ac6f0b89a..7bb2df978f6 100644 --- a/source/gameengine/Converter/KX_IpoConvert.h +++ b/source/gameengine/Converter/KX_IpoConvert.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef __KX_IPOCONVERT_H -#define __KX_IPOCONVERT_H +#ifndef __KX_IPOCONVERT_H__ +#define __KX_IPOCONVERT_H__ struct Object; @@ -66,5 +66,5 @@ void BL_ConvertMaterialIpos(struct Object* blenderobject, class KX_BlenderSceneConverter *converter); -#endif //__KX_IPOCONVERT_H +#endif //__KX_IPOCONVERT_H__ diff --git a/source/gameengine/Converter/KX_SoftBodyDeformer.h b/source/gameengine/Converter/KX_SoftBodyDeformer.h index 6e3ca739501..5235c91ce89 100644 --- a/source/gameengine/Converter/KX_SoftBodyDeformer.h +++ b/source/gameengine/Converter/KX_SoftBodyDeformer.h @@ -29,8 +29,8 @@ * \ingroup bgeconv */ -#ifndef KX_SOFTBODYDEFORMER -#define KX_SOFTBODYDEFORMER +#ifndef __KX_SOFTBODYDEFORMER_H__ +#define __KX_SOFTBODYDEFORMER_H__ #if defined(WIN32) && !defined(FREE_WINDOWS) #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning |