use __ prefix on header guards to avoid mixing up defines with api functions / classes.

This commit is contained in:
Campbell Barton 2012-02-23 10:41:31 +00:00
parent 3dd449ae4f
commit b8e019d839
212 changed files with 570 additions and 570 deletions

@ -31,8 +31,8 @@
* \ingroup blroutines
*/
#ifndef BL_SYSTEM_H
#define BL_SYSTEM_H
#ifndef __BL_SYSTEM_H__
#define __BL_SYSTEM_H__
#ifdef __cplusplus
extern "C" {
@ -66,5 +66,5 @@ extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar,
}
#endif
#endif /* BL_SYSTEM_H */
#endif /* __BL_SYSTEM_H__ */

@ -29,8 +29,8 @@
* \ingroup blroutines
*/
#ifndef __KX_BLENDERCANVAS
#define __KX_BLENDERCANVAS
#ifndef __KX_BLENDERCANVAS_H__
#define __KX_BLENDERCANVAS_H__
#ifdef WIN32
#include <windows.h>
@ -200,5 +200,5 @@ public:
#endif
};
#endif // __KX_BLENDERCANVAS
#endif // __KX_BLENDERCANVAS_H__

@ -29,8 +29,8 @@
* \ingroup blroutines
*/
#ifndef __BLENDERGL
#define __BLENDERGL
#ifndef __KX_BLENDERGL_H__
#define __KX_BLENDERGL_H__
#ifdef __cplusplus
extern "C" {
@ -60,5 +60,5 @@ void BL_print_gamedebug_line_padded(const char* text, int xco, int yco, int widt
}
#endif //__cplusplus
#endif //__BLENDERGL
#endif //__KX_BLENDERGL_H__

@ -29,8 +29,8 @@
* \ingroup blroutines
*/
#ifndef __KX_BLENDERINPUTDEVICE
#define __KX_BLENDERINPUTDEVICE
#ifndef __KX_BLENDERINPUTDEVICE_H__
#define __KX_BLENDERINPUTDEVICE_H__
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning(disable : 4786) // shut off 255 char limit debug template warning
@ -77,5 +77,5 @@ public:
void operator delete(void *mem) { MEM_freeN(mem); }
#endif
};
#endif //__KX_BLENDERINPUTDEVICE
#endif //__KX_BLENDERINPUTDEVICE_H__

@ -29,8 +29,8 @@
* \ingroup blroutines
*/
#ifndef __KX_BLENDERKEYBOARDDEVICE
#define __KX_BLENDERKEYBOARDDEVICE
#ifndef __KX_BLENDERKEYBOARDDEVICE_H__
#define __KX_BLENDERKEYBOARDDEVICE_H__
#include "KX_BlenderInputDevice.h"
@ -61,5 +61,5 @@ public:
#endif
};
#endif //__KX_BLENDERKEYBOARDDEVICE
#endif //__KX_BLENDERKEYBOARDDEVICE_H__

@ -29,8 +29,8 @@
* \ingroup blroutines
*/
#ifndef __KX_BLENDERMOUSEDEVICE
#define __KX_BLENDERMOUSEDEVICE
#ifndef __KX_BLENDERMOUSEDEVICE_H__
#define __KX_BLENDERMOUSEDEVICE_H__
#include "KX_BlenderInputDevice.h"
@ -57,5 +57,5 @@ public:
#endif
};
#endif //__KX_BLENDERMOUSEDEVICE
#endif //__KX_BLENDERMOUSEDEVICE_H__

@ -29,8 +29,8 @@
* \ingroup blroutines
*/
#ifndef __KX_BLENDERRENDERTOOLS
#define __KX_BLENDERRENDERTOOLS
#ifndef __KX_BLENDERRENDERTOOLS_H__
#define __KX_BLENDERRENDERTOOLS_H__
#if defined(WIN32) && !defined(FREE_WINDOWS)
// don't show stl-warnings
@ -114,7 +114,7 @@ public:
#endif
};
#endif //__KX_BLENDERRENDERTOOLS
#endif //__KX_BLENDERRENDERTOOLS_H__

@ -30,8 +30,8 @@
* \brief Blender System embedding. Needed when gameengine runs embedded within Blender.
*/
#ifndef __KX_BLENDERSYSTEM
#define __KX_BLENDERSYSTEM
#ifndef __KX_BLENDERSYSTEM_H__
#define __KX_BLENDERSYSTEM_H__
#include "KX_ISystem.h"
@ -55,5 +55,5 @@ public:
#endif
};
#endif //__KX_BLENDERSYSTEM
#endif //__KX_BLENDERSYSTEM_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"

@ -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__

@ -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__

@ -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__

@ -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"

@ -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__

@ -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

@ -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"

@ -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

@ -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"

@ -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

@ -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

@ -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__

@ -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__

@ -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__

@ -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__

@ -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__

@ -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__

@ -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__

@ -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__

@ -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

@ -29,8 +29,8 @@
* \ingroup expressions
*/
#ifndef __EXPRESSION_INCLUDE
#define __EXPRESSION_INCLUDE
#ifndef __EXP_C_API_H__
#define __EXP_C_API_H__
#define EXP_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
@ -64,5 +64,5 @@ const char* EXP_GetText(EXP_ValueHandle);
}
#endif
#endif //__EXPRESSION_INCLUDE
#endif //__EXP_C_API_H__

@ -29,8 +29,8 @@
* \ingroup expressions
*/
#ifndef __IDENTIFIER_EXPR
#define __IDENTIFIER_EXPR
#ifndef __IDENTIFIEREXPR_H__
#define __IDENTIFIEREXPR_H__
#include "Expression.h"
@ -58,5 +58,5 @@ public:
#endif
};
#endif //__IDENTIFIER_EXPR
#endif //__IDENTIFIEREXPR_H__

@ -29,8 +29,8 @@
* \ingroup expressions
*/
#ifndef __KX_HASHEDPTR
#define __KX_HASHEDPTR
#ifndef __KX_HASHEDPTR_H__
#define __KX_HASHEDPTR_H__
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
@ -60,5 +60,5 @@ public:
#endif
};
#endif //__KX_HASHEDPTR
#endif //__KX_HASHEDPTR_H__

@ -29,8 +29,8 @@
* \ingroup expressions
*/
#ifndef KX_PYTHON_H
#define KX_PYTHON_H
#ifndef __KX_PYTHON_H__
#define __KX_PYTHON_H__
//#define USE_DL_EXPORT
@ -79,5 +79,5 @@
#undef toupper
#endif
#endif // KX_PYTHON_H
#endif // __KX_PYTHON_H__

@ -29,8 +29,8 @@
* \ingroup expressions
*/
#ifndef _PY_OBJECT_PLUS_H
#define _PY_OBJECT_PLUS_H
#ifndef __PYOBJECTPLUS_H__
#define __PYOBJECTPLUS_H__
/* for now keep weakrefs optional */
#define USE_WEAKREFS
@ -652,4 +652,4 @@ PyObject *py_getattr_dict(PyObject *pydict, PyObject *tp_dict);
PyObject *PyUnicode_From_STR_String(const STR_String& str);
#endif
#endif // _PY_OBJECT_PLUS_H
#endif // __PYOBJECTPLUS_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef _SCA_JOYSTICK_H_
#define _SCA_JOYSTICK_H_
#ifndef __SCA_JOYSTICK_H__
#define __SCA_JOYSTICK_H__
#include "SCA_JoystickDefines.h"
#ifdef WITH_SDL

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef _SCA_JOYSTICKDEFINES_H_
#define _SCA_JOYSTICKDEFINES_H_
#ifndef __SCA_JOYSTICKDEFINES_H__
#define __SCA_JOYSTICKDEFINES_H__
#ifdef main
#undef main

@ -28,8 +28,8 @@
* \ingroup gamelogic
*/
#ifndef __SCA_2DFILETRACTUATOR_H__
#define __SCA_2DFILETRACTUATOR_H__
#ifndef __SCA_2DFILTERACTUATOR_H__
#define __SCA_2DFILTERACTUATOR_H__
#include "RAS_IRasterizer.h"
#include "SCA_IActuator.h"

@ -32,8 +32,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ANDCONTROLLER
#define __KX_ANDCONTROLLER
#ifndef __SCA_ANDCONTROLLER_H__
#define __SCA_ANDCONTROLLER_H__
#include "SCA_IController.h"
@ -48,5 +48,5 @@ public:
virtual void Trigger(SCA_LogicManager* logicmgr);
};
#endif //__KX_ANDCONTROLLER
#endif //__SCA_ANDCONTROLLER_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ACTUATOREVENTMANAGER
#define __KX_ACTUATOREVENTMANAGER
#ifndef __SCA_ACTUATOREVENTMANAGER_H__
#define __SCA_ACTUATOREVENTMANAGER_H__
#include "SCA_EventManager.h"
@ -55,5 +55,5 @@ public:
#endif
};
#endif //__KX_ACTUATOREVENTMANAGER
#endif //__SCA_ACTUATOREVENTMANAGER_H__

@ -32,8 +32,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ACTUATORSENSOR
#define __KX_ACTUATORSENSOR
#ifndef __SCA_ACTUATORSENSOR_H__
#define __SCA_ACTUATORSENSOR_H__
#include "SCA_ISensor.h"
#include "SCA_IActuator.h"

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ALWAYSEVENTMGR
#define __KX_ALWAYSEVENTMGR
#ifndef __SCA_ALWAYSEVENTMANAGER_H__
#define __SCA_ALWAYSEVENTMANAGER_H__
#include "SCA_EventManager.h"
#include <vector>
@ -49,5 +49,5 @@ public:
#endif
};
#endif //__KX_ALWAYSEVENTMGR
#endif //__SCA_ALWAYSEVENTMANAGER_H__

@ -32,8 +32,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ALWAYSSENSOR
#define __KX_ALWAYSSENSOR
#ifndef __SCA_ALWAYSSENSOR_H__
#define __SCA_ALWAYSSENSOR_H__
#include "SCA_ISensor.h"
class SCA_AlwaysSensor : public SCA_ISensor
@ -50,5 +50,5 @@ public:
virtual void Init();
};
#endif //__KX_ALWAYSSENSOR
#endif //__SCA_ALWAYSSENSOR_H__

@ -32,8 +32,8 @@
* \ingroup gamelogic
*/
#ifndef __SCA_BASICEVENTMGR
#define __SCA_BASICEVENTMGR
#ifndef __SCA_BASICEVENTMANAGER_H__
#define __SCA_BASICEVENTMANAGER_H__
#include "SCA_EventManager.h"
#include <vector>
@ -56,5 +56,5 @@ public:
#endif
};
#endif //__SCA_BASICEVENTMGR
#endif //__SCA_BASICEVENTMANAGER_H__

@ -32,8 +32,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_DELAYSENSOR
#define __KX_DELAYSENSOR
#ifndef __SCA_DELAYSENSOR_H__
#define __SCA_DELAYSENSOR_H__
#include "SCA_ISensor.h"
class SCA_DelaySensor : public SCA_ISensor

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_EVENTMANAGER
#define __KX_EVENTMANAGER
#ifndef __SCA_EVENTMANAGER_H__
#define __SCA_EVENTMANAGER_H__
#include <vector>
#include <set>

@ -32,8 +32,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_EXPRESSIONCONTROLLER
#define __KX_EXPRESSIONCONTROLLER
#ifndef __SCA_EXPRESSIONCONTROLLER_H__
#define __SCA_EXPRESSIONCONTROLLER_H__
#include "SCA_IController.h"
@ -65,5 +65,5 @@ public:
#endif
};
#endif //__KX_EXPRESSIONCONTROLLER
#endif //__SCA_EXPRESSIONCONTROLLER_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_IACTUATOR
#define __KX_IACTUATOR
#ifndef __SCA_IACTUATOR_H__
#define __SCA_IACTUATOR_H__
#include "SCA_IController.h"
#include <vector>
@ -166,5 +166,5 @@ public:
#endif
};
#endif //__KX_IACTUATOR
#endif //__SCA_IACTUATOR_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ICONTROLLER
#define __KX_ICONTROLLER
#ifndef __SCA_ICONTROLLER_H__
#define __SCA_ICONTROLLER_H__
#include "SCA_ILogicBrick.h"
#include "PyObjectPlus.h"

@ -32,8 +32,8 @@
*
*/
#ifndef KX_INPUTDEVICE_H
#define KX_INPUTDEVICE_H
#ifndef __SCA_IINPUTDEVICE_H__
#define __SCA_IINPUTDEVICE_H__
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
@ -322,5 +322,5 @@ public:
#endif
};
#endif //KX_INPUTDEVICE_H
#endif //__SCA_IINPUTDEVICE_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ILOGICBRICK
#define __KX_ILOGICBRICK
#ifndef __SCA_ILOGICBRICK_H__
#define __SCA_ILOGICBRICK_H__
#include "Value.h"
#include "SCA_IObject.h"

@ -31,8 +31,8 @@
* SceneGraph
*/
#ifndef SCA_IOBJECT_H
#define SCA_IOBJECT_H
#ifndef __SCA_IOBJECT_H__
#define __SCA_IOBJECT_H__
#include "Value.h"
#include <vector>
@ -225,5 +225,5 @@ public:
};
#endif //SCA_IOBJECT_H
#endif //__SCA_IOBJECT_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ISCENE_H
#define __KX_ISCENE_H
#ifndef __SCA_ISCENE_H__
#define __SCA_ISCENE_H__
#include <vector>
@ -80,5 +80,5 @@ public:
#endif
};
#endif //__KX_ISCENE_H
#endif //__SCA_ISCENE_H__

@ -31,8 +31,8 @@
* pulsemode and pulsefrequency, and event suppression.
*/
#ifndef __SCA_ISENSOR
#define __SCA_ISENSOR
#ifndef __SCA_ISENSOR_H__
#define __SCA_ISENSOR_H__
#include "SCA_IController.h"
@ -215,5 +215,5 @@ public:
#endif // WITH_PYTHON
};
#endif //__SCA_ISENSOR
#endif //__SCA_ISENSOR_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __JOYSTICKMANAGER_H_
#define __JOYSTICKMANAGER_H_
#ifndef __SCA_JOYSTICKMANAGER_H__
#define __SCA_JOYSTICKMANAGER_H__
#include "SCA_EventManager.h"
#include "Joystick/SCA_Joystick.h"

@ -31,8 +31,8 @@
*
*/
#ifndef __KX_KEYBOARDMANAGER
#define __KX_KEYBOARDMANAGER
#ifndef __SCA_KEYBOARDMANAGER_H__
#define __SCA_KEYBOARDMANAGER_H__
#include "SCA_EventManager.h"
@ -65,5 +65,5 @@ public:
#endif
};
#endif //__KX_KEYBOARDMANAGER
#endif //__SCA_KEYBOARDMANAGER_H__

@ -30,8 +30,8 @@
* \brief Sensor for keyboard input
*/
#ifndef __KX_KEYBOARDSENSOR
#define __KX_KEYBOARDSENSOR
#ifndef __SCA_KEYBOARDSENSOR_H__
#define __SCA_KEYBOARDSENSOR_H__
#include "SCA_ISensor.h"
#include "BoolValue.h"
@ -137,7 +137,7 @@ bool IsPrintable(int keyIndex);
bool IsDelete(int keyIndex);
#endif //__KX_KEYBOARDSENSOR
#endif //__SCA_KEYBOARDSENSOR_H__

@ -28,8 +28,8 @@
* \ingroup gamelogic
* \brief Regulates the top-level logic behaviour for one scene.
*/
#ifndef __KX_LOGICMANAGER
#define __KX_LOGICMANAGER
#ifndef __SCA_LOGICMANAGER_H__
#define __SCA_LOGICMANAGER_H__
#if defined(WIN32) && !defined(FREE_WINDOWS)
#pragma warning (disable:4786)
@ -153,5 +153,5 @@ public:
#endif
};
#endif //__KX_LOGICMANAGER
#endif //__SCA_LOGICMANAGER_H__

@ -32,8 +32,8 @@
*/
#ifndef __KX_MOUSEMANAGER
#define __KX_MOUSEMANAGER
#ifndef __SCA_MOUSEMANAGER_H__
#define __SCA_MOUSEMANAGER_H__
#include "SCA_EventManager.h"
@ -74,5 +74,5 @@ public:
#endif
};
#endif //__KX_MOUSEMANAGER
#endif //__SCA_MOUSEMANAGER_H__

@ -30,8 +30,8 @@
* \brief Senses mouse events
*/
#ifndef __KX_MOUSESENSOR
#define __KX_MOUSESENSOR
#ifndef __SCA_MOUSESENSOR_H__
#define __SCA_MOUSESENSOR_H__
#include "SCA_ISensor.h"
#include "BoolValue.h"
@ -117,5 +117,5 @@ class SCA_MouseSensor : public SCA_ISensor
#endif
};
#endif //__KX_MOUSESENSOR
#endif //__SCA_MOUSESENSOR_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_NANDCONTROLLER
#define __KX_NANDCONTROLLER
#ifndef __SCA_NANDCONTROLLER_H__
#define __SCA_NANDCONTROLLER_H__
#include "SCA_IController.h"
@ -49,5 +49,5 @@ public:
/* --------------------------------------------------------------------- */
};
#endif //__KX_NANDCONTROLLER
#endif //__SCA_NANDCONTROLLER_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_NORCONTROLLER
#define __KX_NORCONTROLLER
#ifndef __SCA_NORCONTROLLER_H__
#define __SCA_NORCONTROLLER_H__
#include "SCA_IController.h"
@ -45,5 +45,5 @@ public:
virtual void Trigger(SCA_LogicManager* logicmgr);
};
#endif //__KX_NORCONTROLLER
#endif //__SCA_NORCONTROLLER_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_ORCONTROLLER
#define __KX_ORCONTROLLER
#ifndef __SCA_ORCONTROLLER_H__
#define __SCA_ORCONTROLLER_H__
#include "SCA_IController.h"
@ -46,5 +46,5 @@ public:
virtual void Trigger(SCA_LogicManager* logicmgr);
};
#endif //__KX_ORCONTROLLER
#endif //__SCA_ORCONTROLLER_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_PROPERTYACTUATOR
#define __KX_PROPERTYACTUATOR
#ifndef __SCA_PROPERTYACTUATOR_H__
#define __SCA_PROPERTYACTUATOR_H__
#include "SCA_IActuator.h"

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_PROPERTYEVENTMANAGER
#define __KX_PROPERTYEVENTMANAGER
#ifndef __SCA_PROPERTYEVENTMANAGER_H__
#define __SCA_PROPERTYEVENTMANAGER_H__
#include "SCA_EventManager.h"
@ -54,5 +54,5 @@ public:
#endif
};
#endif //__KX_PROPERTYEVENTMANAGER
#endif //__SCA_PROPERTYEVENTMANAGER_H__

@ -30,8 +30,8 @@
* \brief Property sensor
*/
#ifndef __KX_PROPERTYSENSOR
#define __KX_PROPERTYSENSOR
#ifndef __SCA_PROPERTYSENSOR_H__
#define __SCA_PROPERTYSENSOR_H__
#include "SCA_ISensor.h"

@ -30,8 +30,8 @@
* \brief Execute Python scripts
*/
#ifndef KX_PYTHONCONTROLLER_H
#define KX_PYTHONCONTROLLER_H
#ifndef __SCA_PYTHONCONTROLLER_H__
#define __SCA_PYTHONCONTROLLER_H__
#include "SCA_IController.h"
#include "SCA_LogicManager.h"
@ -115,5 +115,5 @@ class SCA_PythonController : public SCA_IController
#endif
};
#endif //KX_PYTHONCONTROLLER_H
#endif //__SCA_PYTHONCONTROLLER_H__

@ -24,8 +24,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_PYKEYBOARD
#define __KX_PYKEYBOARD
#ifndef __SCA_PYTHONKEYBOARD_H__
#define __SCA_PYTHONKEYBOARD_H__
#include "PyObjectPlus.h"
@ -47,5 +47,5 @@ public:
#endif
};
#endif //__KX_PYKEYBOARD
#endif //__SCA_PYTHONKEYBOARD_H__

@ -24,8 +24,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_PYMOUSE
#define __KX_PYMOUSE
#ifndef __SCA_PYTHONMOUSE_H__
#define __SCA_PYTHONMOUSE_H__
#include "PyObjectPlus.h"
@ -56,5 +56,5 @@ public:
#endif
};
#endif //__KX_PYMOUSE
#endif //__SCA_PYTHONMOUSE_H__

@ -30,8 +30,8 @@
* \brief Draw a random number, and put it in a property
*/
#ifndef __KX_RANDOMACTUATOR
#define __KX_RANDOMACTUATOR
#ifndef __SCA_RANDOMACTUATOR_H__
#define __SCA_RANDOMACTUATOR_H__
#include "SCA_IActuator.h"
#include "SCA_RandomNumberGenerator.h"

@ -30,8 +30,8 @@
* \brief Manager for random events
*/
#ifndef __KX_RANDOMEVENTMGR
#define __KX_RANDOMEVENTMGR
#ifndef __SCA_RANDOMEVENTMANAGER_H__
#define __SCA_RANDOMEVENTMANAGER_H__
#include "SCA_EventManager.h"
#include <vector>
@ -53,5 +53,5 @@ public:
#endif
};
#endif //__KX_RANDOMEVENTMGR
#endif //__SCA_RANDOMEVENTMANAGER_H__

@ -32,8 +32,8 @@
* on a per-generator basis.
*/
#ifndef __KX_RANDOMNUMBERGENERATOR
#define __KX_RANDOMNUMBERGENERATOR
#ifndef __SCA_RANDOMNUMBERGENERATOR_H__
#define __SCA_RANDOMNUMBERGENERATOR_H__
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
@ -83,5 +83,5 @@ public:
#endif
};
#endif /* __KX_RANDOMNUMBERGENERATOR */
#endif /* __SCA_RANDOMNUMBERGENERATOR_H__ */

@ -30,8 +30,8 @@
* \brief Generate random pulses
*/
#ifndef __KX_RANDOMSENSOR
#define __KX_RANDOMSENSOR
#ifndef __SCA_RANDOMSENSOR_H__
#define __SCA_RANDOMSENSOR_H__
#include "SCA_ISensor.h"
#include "BoolValue.h"
@ -68,5 +68,5 @@ public:
#endif
};
#endif //__KX_RANDOMSENSOR
#endif //__SCA_RANDOMSENSOR_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_TIMEEVENTMANAGER
#define __KX_TIMEEVENTMANAGER
#ifndef __SCA_TIMEEVENTMANAGER_H__
#define __SCA_TIMEEVENTMANAGER_H__
#include "SCA_EventManager.h"
#include "Value.h"
@ -61,5 +61,5 @@ public:
#endif
};
#endif //__KX_TIMEEVENTMANAGER
#endif //__SCA_TIMEEVENTMANAGER_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_XNORCONTROLLER
#define __KX_XNORCONTROLLER
#ifndef __SCA_XNORCONTROLLER_H__
#define __SCA_XNORCONTROLLER_H__
#include "SCA_IController.h"
@ -50,5 +50,5 @@ public:
};
#endif //__KX_XNORCONTROLLER
#endif //__SCA_XNORCONTROLLER_H__

@ -29,8 +29,8 @@
* \ingroup gamelogic
*/
#ifndef __KX_XORCONTROLLER
#define __KX_XORCONTROLLER
#ifndef __SCA_XORCONTROLLER_H__
#define __SCA_XORCONTROLLER_H__
#include "SCA_IController.h"
@ -45,5 +45,5 @@ public:
virtual void Trigger(SCA_LogicManager* logicmgr);
};
#endif //__KX_XORCONTROLLER
#endif //__SCA_XORCONTROLLER_H__

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef _GPC_CANVAS_H_
#define _GPC_CANVAS_H_
#ifndef __GPC_CANVAS_H__
#define __GPC_CANVAS_H__
#include "RAS_ICanvas.h"
#include "RAS_Rect.h"
@ -270,5 +270,5 @@ protected:
static TBannerId s_bannerId;
};
#endif // _GPC_CANVAS_H_
#endif // __GPC_CANVAS_H__

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef __GPC_ENGINE_H
#define __GPC_ENGINE_H
#ifndef __GPC_ENGINE_H__
#define __GPC_ENGINE_H__
#include "GPC_Canvas.h"
#include "GPC_System.h"
@ -121,5 +121,5 @@ private:
};
#endif // __GPC_ENGINE_H
#endif // __GPC_ENGINE_H__

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef __GPC_KEYBOARDDEVICE_H
#define __GPC_KEYBOARDDEVICE_H
#ifndef __GPC_KEYBOARDDEVICE_H__
#define __GPC_KEYBOARDDEVICE_H__
#ifdef WIN32
#pragma warning (disable : 4786)

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef __GPC_MOUSE_DEVICE_H
#define __GPC_MOUSE_DEVICE_H
#ifndef __GPC_MOUSEDEVICE_H__
#define __GPC_MOUSEDEVICE_H__
#ifdef WIN32
#pragma warning (disable : 4786)
@ -102,5 +102,5 @@ protected:
virtual bool ConvertEvent(KX_EnumInputs kxevent, int eventval);
};
#endif // __GPC_MOUSE_DEVICE_H
#endif // __GPC_MOUSEDEVICE_H__

@ -29,10 +29,10 @@
* \ingroup player
*/
#ifndef __GPC_RAWLOADDOTBLENDARRAY_H
#define __GPC_RAWLOADDOTBLENDARRAY_H
#ifndef __GPC_RAWLOADDOTBLENDARRAY_H__
#define __GPC_RAWLOADDOTBLENDARRAY_H__
void GetRawLoadingAnimation(unsigned char **data, int *dataSize);
#endif // __GPC_RAWLOADDOTBLENDARRAY_H
#endif // __GPC_RAWLOADDOTBLENDARRAY_H__

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef __GPC_RAWLOGOARRAYS_H
#define __GPC_RAWLOGOARRAYS_H
#ifndef __GPC_RAWLOGOARRAYS_H__
#define __GPC_RAWLOGOARRAYS_H__
void GetRawBlenderLogo(unsigned char **data, int *width, int *height);
void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
@ -38,5 +38,5 @@ void GetRawBlender3DLogo(unsigned char **data, int *width, int *height);
void GetRawNaNLogo(unsigned char **data, int *width, int *height);
#endif
#endif // __GPC_RAWLOGOARRAYS_H
#endif // __GPC_RAWLOGOARRAYS_H__

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef __GPC_RENDERTOOLS_H
#define __GPC_RENDERTOOLS_H
#ifndef __GPC_RENDERTOOLS_H__
#define __GPC_RENDERTOOLS_H__
#ifdef WIN32
// don't show stl-warnings
@ -106,7 +106,7 @@ public:
virtual void SetClientObject(RAS_IRasterizer *rasty, void* obj);
};
#endif // __GPC_RENDERTOOLS_H
#endif // __GPC_RENDERTOOLS_H__

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef __GPC_SYSTEM_H
#define __GPC_SYSTEM_H
#ifndef __GPC_SYSTEM_H__
#define __GPC_SYSTEM_H__
#if defined(WIN32)
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@ -59,5 +59,5 @@ public:
// NG_NetworkDeviceInterface* m_ndi;
};
#endif // __GPC_SYSTEM_H
#endif // __GPC_SYSTEM_H__

@ -29,8 +29,8 @@
* \ingroup player
*/
#ifndef _GPG_CANVAS_H_
#define _GPG_CANVAS_H_
#ifndef __GPG_CANVAS_H__
#define __GPG_CANVAS_H__
#ifdef WIN32
#pragma warning (disable : 4786)
@ -66,5 +66,5 @@ public:
void EndDraw() {};
};
#endif // _GPG_CANVAS_H_
#endif // __GPG_CANVAS_H__

@ -30,8 +30,8 @@
* \brief GHOST Blender Player keyboard device.
*/
#ifndef _GPG_KEYBOARDDEVICE_H_
#define _GPG_KEYBOARDDEVICE_H_
#ifndef __GPG_KEYBOARDDEVICE_H__
#define __GPG_KEYBOARDDEVICE_H__
#ifdef WIN32
#pragma warning (disable : 4786)
@ -53,5 +53,5 @@ public:
virtual ~GPG_KeyboardDevice(void);
};
#endif //_GPG_KEYBOARDDEVICE_H_
#endif //__GPG_KEYBOARDDEVICE_H__

@ -30,8 +30,8 @@
* \brief Blender Player system on GHOST.
*/
#ifndef _GPG_SYSTEM_H_
#define _GPG_SYSTEM_H_
#ifndef __GPG_SYSTEM_H__
#define __GPG_SYSTEM_H__
#ifdef WIN32
#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
@ -51,5 +51,5 @@ public:
virtual double GetTimeInSeconds();
};
#endif // _GPG_SYSTEM_H_
#endif // __GPG_SYSTEM_H__

@ -24,8 +24,8 @@
* \ingroup ketsji
*/
#ifndef __BL_ACTION
#define __BL_ACTION
#ifndef __BL_ACTION_H__
#define __BL_ACTION_H__
#include <vector>

@ -24,8 +24,8 @@
* \ingroup ketsji
*/
#ifndef __BL_ACTIONMANAGER
#define __BL_ACTIONMANAGER
#ifndef __BL_ACTIONMANAGER_H__
#define __BL_ACTIONMANAGER_H__
#include "BL_Action.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__

@ -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__

@ -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__

@ -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__

@ -30,8 +30,8 @@
* \brief Property sensor
*/
#ifndef __KX_ARMATURESENSOR
#define __KX_ARMATURESENSOR
#ifndef __KX_ARMATURESENSOR_H__
#define __KX_ARMATURESENSOR_H__
struct bConstraint;

@ -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>

@ -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__

@ -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__

@ -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__

@ -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__

@ -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__

@ -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__

Some files were not shown because too many files have changed in this diff Show More