From 97d4fb4161bc82888fc1052e53882ccaae6be1f4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 9 Oct 2012 13:36:42 +0000 Subject: code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too. --- source/gameengine/GameLogic/SCA_ANDController.h | 3 +-- source/gameengine/GameLogic/SCA_ActuatorEventManager.h | 3 +-- source/gameengine/GameLogic/SCA_ActuatorSensor.h | 4 ++-- source/gameengine/GameLogic/SCA_AlwaysEventManager.h | 3 +-- source/gameengine/GameLogic/SCA_AlwaysSensor.h | 3 +-- source/gameengine/GameLogic/SCA_BasicEventManager.h | 3 +-- source/gameengine/GameLogic/SCA_DelaySensor.h | 3 +-- source/gameengine/GameLogic/SCA_ExpressionController.h | 3 +-- source/gameengine/GameLogic/SCA_IActuator.h | 3 +-- source/gameengine/GameLogic/SCA_IController.h | 5 ++--- source/gameengine/GameLogic/SCA_IInputDevice.h | 2 +- source/gameengine/GameLogic/SCA_ILogicBrick.h | 5 ++--- source/gameengine/GameLogic/SCA_IObject.h | 3 +-- source/gameengine/GameLogic/SCA_IScene.h | 3 +-- source/gameengine/GameLogic/SCA_ISensor.h | 5 ++--- source/gameengine/GameLogic/SCA_JoystickSensor.h | 10 +++++----- source/gameengine/GameLogic/SCA_KeyboardManager.h | 3 +-- source/gameengine/GameLogic/SCA_KeyboardSensor.h | 5 +---- source/gameengine/GameLogic/SCA_LogicManager.h | 3 +-- source/gameengine/GameLogic/SCA_MouseManager.h | 3 +-- source/gameengine/GameLogic/SCA_MouseSensor.h | 3 +-- source/gameengine/GameLogic/SCA_NANDController.h | 3 +-- source/gameengine/GameLogic/SCA_NORController.h | 3 +-- source/gameengine/GameLogic/SCA_ORController.h | 3 +-- source/gameengine/GameLogic/SCA_PropertyActuator.h | 3 +-- source/gameengine/GameLogic/SCA_PropertyEventManager.h | 3 +-- source/gameengine/GameLogic/SCA_PythonController.h | 3 +-- source/gameengine/GameLogic/SCA_PythonKeyboard.h | 3 +-- source/gameengine/GameLogic/SCA_PythonMouse.h | 3 +-- source/gameengine/GameLogic/SCA_RandomActuator.h | 2 +- source/gameengine/GameLogic/SCA_RandomEventManager.h | 3 +-- source/gameengine/GameLogic/SCA_RandomSensor.h | 3 +-- source/gameengine/GameLogic/SCA_TimeEventManager.h | 3 +-- source/gameengine/GameLogic/SCA_XNORController.h | 3 +-- source/gameengine/GameLogic/SCA_XORController.h | 3 +-- 35 files changed, 43 insertions(+), 76 deletions(-) (limited to 'source/gameengine/GameLogic') diff --git a/source/gameengine/GameLogic/SCA_ANDController.h b/source/gameengine/GameLogic/SCA_ANDController.h index ccc3f9be3af..ff152d6d2fb 100644 --- a/source/gameengine/GameLogic/SCA_ANDController.h +++ b/source/gameengine/GameLogic/SCA_ANDController.h @@ -48,5 +48,4 @@ public: virtual void Trigger(SCA_LogicManager* logicmgr); }; -#endif //__SCA_ANDCONTROLLER_H__ - +#endif /* __SCA_ANDCONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h index dee9ea4e8ba..997be1145db 100644 --- a/source/gameengine/GameLogic/SCA_ActuatorEventManager.h +++ b/source/gameengine/GameLogic/SCA_ActuatorEventManager.h @@ -53,5 +53,4 @@ public: #endif }; -#endif //__SCA_ACTUATOREVENTMANAGER_H__ - +#endif /* __SCA_ACTUATOREVENTMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h index 894dc2162cf..6005bd3ac6c 100644 --- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h +++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h @@ -64,7 +64,7 @@ public: static int CheckActuator(void *self, const PyAttributeDef*); -#endif // WITH_PYTHON +#endif /* WITH_PYTHON */ }; -#endif +#endif /* __SCA_ACTUATORSENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h index cf4063fba1f..47293c75726 100644 --- a/source/gameengine/GameLogic/SCA_AlwaysEventManager.h +++ b/source/gameengine/GameLogic/SCA_AlwaysEventManager.h @@ -47,5 +47,4 @@ public: #endif }; -#endif //__SCA_ALWAYSEVENTMANAGER_H__ - +#endif /* __SCA_ALWAYSEVENTMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.h b/source/gameengine/GameLogic/SCA_AlwaysSensor.h index d0963fd0ea1..e0ab4279b1c 100644 --- a/source/gameengine/GameLogic/SCA_AlwaysSensor.h +++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.h @@ -50,5 +50,4 @@ public: virtual void Init(); }; -#endif //__SCA_ALWAYSSENSOR_H__ - +#endif /* __SCA_ALWAYSSENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_BasicEventManager.h b/source/gameengine/GameLogic/SCA_BasicEventManager.h index 24206e46a61..a015233454b 100644 --- a/source/gameengine/GameLogic/SCA_BasicEventManager.h +++ b/source/gameengine/GameLogic/SCA_BasicEventManager.h @@ -54,5 +54,4 @@ public: #endif }; -#endif //__SCA_BASICEVENTMANAGER_H__ - +#endif /* __SCA_BASICEVENTMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.h b/source/gameengine/GameLogic/SCA_DelaySensor.h index 2c408921f27..b516cd8360e 100644 --- a/source/gameengine/GameLogic/SCA_DelaySensor.h +++ b/source/gameengine/GameLogic/SCA_DelaySensor.h @@ -65,5 +65,4 @@ public: }; -#endif //__KX_ALWAYSSENSOR - +#endif /* __SCA_DELAYSENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_ExpressionController.h b/source/gameengine/GameLogic/SCA_ExpressionController.h index 06edc83ab96..c16944ccde1 100644 --- a/source/gameengine/GameLogic/SCA_ExpressionController.h +++ b/source/gameengine/GameLogic/SCA_ExpressionController.h @@ -63,5 +63,4 @@ public: #endif }; -#endif //__SCA_EXPRESSIONCONTROLLER_H__ - +#endif /* __SCA_EXPRESSIONCONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_IActuator.h b/source/gameengine/GameLogic/SCA_IActuator.h index 801483bb882..090df1e75e2 100644 --- a/source/gameengine/GameLogic/SCA_IActuator.h +++ b/source/gameengine/GameLogic/SCA_IActuator.h @@ -164,5 +164,4 @@ public: #endif }; -#endif //__SCA_IACTUATOR_H__ - +#endif /* __SCA_IACTUATOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h index 656c4299dff..1bc6b60bf1e 100644 --- a/source/gameengine/GameLogic/SCA_IController.h +++ b/source/gameengine/GameLogic/SCA_IController.h @@ -106,8 +106,7 @@ public: static PyObject* pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); -#endif // WITH_PYTHON +#endif /* WITH_PYTHON */ }; -#endif - +#endif /* __SCA_ICONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index 66a1209751d..bc4d22eaaaf 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -320,5 +320,5 @@ public: #endif }; -#endif //__SCA_IINPUTDEVICE_H__ +#endif /* __SCA_IINPUTDEVICE_H__ */ diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h index c5fa9399ab7..dc0aa4ce331 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.h +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h @@ -159,9 +159,8 @@ protected: /** Convert a a c++ value to KX_TRUE, KX_FALSE in Python. */ PyObject *BoolToPyArg(bool); -#endif // WITH_PYTHON +#endif /* WITH_PYTHON */ }; -#endif - +#endif /* __SCA_ILOGICBRICK_H__ */ diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index a850d23babf..0189af00322 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -225,5 +225,4 @@ public: }; -#endif //__SCA_IOBJECT_H__ - +#endif /* __SCA_IOBJECT_H__ */ diff --git a/source/gameengine/GameLogic/SCA_IScene.h b/source/gameengine/GameLogic/SCA_IScene.h index a399e313082..997266976ad 100644 --- a/source/gameengine/GameLogic/SCA_IScene.h +++ b/source/gameengine/GameLogic/SCA_IScene.h @@ -78,5 +78,4 @@ public: #endif }; -#endif //__SCA_ISCENE_H__ - +#endif /* __SCA_ISCENE_H__ */ diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h index 3bb29f3f0a2..091aa675741 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.h +++ b/source/gameengine/GameLogic/SCA_ISensor.h @@ -212,8 +212,7 @@ public: KX_SENSOR_JUST_DEACTIVATED }; -#endif // WITH_PYTHON +#endif /* WITH_PYTHON */ }; -#endif //__SCA_ISENSOR_H__ - +#endif /* __SCA_ISENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h index 5dc35faf244..6c6dc019a5e 100644 --- a/source/gameengine/GameLogic/SCA_JoystickSensor.h +++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h @@ -30,11 +30,11 @@ */ -#ifndef __JOYSENSOR_H_ -#define __JOYSENSOR_H +#ifndef __JOYSENSOR_H__ +#define __JOYSENSOR_H__ #include "SCA_ISensor.h" -#include "./Joystick/SCA_JoystickDefines.h" +#include "Joystick/SCA_JoystickDefines.h" class SCA_JoystickSensor :public SCA_ISensor { @@ -161,8 +161,8 @@ public: return 0; } -#endif // WITH_PYTHON +#endif /* WITH_PYTHON */ }; -#endif +#endif /* __JOYSENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_KeyboardManager.h b/source/gameengine/GameLogic/SCA_KeyboardManager.h index fd3c0706fa7..cd1cbf4adee 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardManager.h +++ b/source/gameengine/GameLogic/SCA_KeyboardManager.h @@ -63,5 +63,4 @@ public: #endif }; -#endif //__SCA_KEYBOARDMANAGER_H__ - +#endif /* __SCA_KEYBOARDMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h index caa141e48f2..c6610d0284e 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h @@ -138,7 +138,4 @@ bool IsPrintable(int keyIndex); bool IsDelete(int keyIndex); -#endif //__SCA_KEYBOARDSENSOR_H__ - - - +#endif /* __SCA_KEYBOARDSENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h index 817f3a1c22a..f3d02cccf26 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.h +++ b/source/gameengine/GameLogic/SCA_LogicManager.h @@ -151,5 +151,4 @@ public: #endif }; -#endif //__SCA_LOGICMANAGER_H__ - +#endif /* __SCA_LOGICMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_MouseManager.h b/source/gameengine/GameLogic/SCA_MouseManager.h index 02c28807566..a57e52070a7 100644 --- a/source/gameengine/GameLogic/SCA_MouseManager.h +++ b/source/gameengine/GameLogic/SCA_MouseManager.h @@ -72,5 +72,4 @@ public: #endif }; -#endif //__SCA_MOUSEMANAGER_H__ - +#endif /* __SCA_MOUSEMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h index d4eff371d4a..8d05a548681 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.h +++ b/source/gameengine/GameLogic/SCA_MouseSensor.h @@ -117,5 +117,4 @@ class SCA_MouseSensor : public SCA_ISensor #endif }; -#endif //__SCA_MOUSESENSOR_H__ - +#endif /* __SCA_MOUSESENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_NANDController.h b/source/gameengine/GameLogic/SCA_NANDController.h index 040df7f0ade..a3f02908dd2 100644 --- a/source/gameengine/GameLogic/SCA_NANDController.h +++ b/source/gameengine/GameLogic/SCA_NANDController.h @@ -49,5 +49,4 @@ public: /* --------------------------------------------------------------------- */ }; -#endif //__SCA_NANDCONTROLLER_H__ - +#endif /* __SCA_NANDCONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_NORController.h b/source/gameengine/GameLogic/SCA_NORController.h index 1630f8055ec..ec8159de8d1 100644 --- a/source/gameengine/GameLogic/SCA_NORController.h +++ b/source/gameengine/GameLogic/SCA_NORController.h @@ -45,5 +45,4 @@ public: virtual void Trigger(SCA_LogicManager* logicmgr); }; -#endif //__SCA_NORCONTROLLER_H__ - +#endif /* __SCA_NORCONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_ORController.h b/source/gameengine/GameLogic/SCA_ORController.h index 9a4e4c7398d..9499c893c72 100644 --- a/source/gameengine/GameLogic/SCA_ORController.h +++ b/source/gameengine/GameLogic/SCA_ORController.h @@ -46,5 +46,4 @@ public: virtual void Trigger(SCA_LogicManager* logicmgr); }; -#endif //__SCA_ORCONTROLLER_H__ - +#endif /* __SCA_ORCONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.h b/source/gameengine/GameLogic/SCA_PropertyActuator.h index e465098131e..83a6d05df1b 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.h +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.h @@ -86,5 +86,4 @@ public: }; -#endif //__KX_PROPERTYACTUATOR_DOC - +#endif /* __KX_PROPERTYACTUATOR_DOC */ diff --git a/source/gameengine/GameLogic/SCA_PropertyEventManager.h b/source/gameengine/GameLogic/SCA_PropertyEventManager.h index 7a4ec750484..554fe686df2 100644 --- a/source/gameengine/GameLogic/SCA_PropertyEventManager.h +++ b/source/gameengine/GameLogic/SCA_PropertyEventManager.h @@ -52,5 +52,4 @@ public: #endif }; -#endif //__SCA_PROPERTYEVENTMANAGER_H__ - +#endif /* __SCA_PROPERTYEVENTMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h index 8a72ce6bad9..f1f10d22711 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.h +++ b/source/gameengine/GameLogic/SCA_PythonController.h @@ -115,5 +115,4 @@ class SCA_PythonController : public SCA_IController #endif }; -#endif //__SCA_PYTHONCONTROLLER_H__ - +#endif /* __SCA_PYTHONCONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_PythonKeyboard.h b/source/gameengine/GameLogic/SCA_PythonKeyboard.h index aab49bcb83b..53068f38e6a 100644 --- a/source/gameengine/GameLogic/SCA_PythonKeyboard.h +++ b/source/gameengine/GameLogic/SCA_PythonKeyboard.h @@ -47,5 +47,4 @@ public: #endif }; -#endif //__SCA_PYTHONKEYBOARD_H__ - +#endif /* __SCA_PYTHONKEYBOARD_H__ */ diff --git a/source/gameengine/GameLogic/SCA_PythonMouse.h b/source/gameengine/GameLogic/SCA_PythonMouse.h index f770a54d6e6..bc6e65f07a8 100644 --- a/source/gameengine/GameLogic/SCA_PythonMouse.h +++ b/source/gameengine/GameLogic/SCA_PythonMouse.h @@ -56,5 +56,4 @@ public: #endif }; -#endif //__SCA_PYTHONMOUSE_H__ - +#endif /* __SCA_PYTHONMOUSE_H__ */ diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h index f61de24c0cc..32b29fc4f43 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.h +++ b/source/gameengine/GameLogic/SCA_RandomActuator.h @@ -112,7 +112,7 @@ class SCA_RandomActuator : public SCA_IActuator KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNormal); KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNegativeExponential); -#endif // WITH_PYTHON +#endif /* WITH_PYTHON */ }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */ diff --git a/source/gameengine/GameLogic/SCA_RandomEventManager.h b/source/gameengine/GameLogic/SCA_RandomEventManager.h index b46899b1355..2d83c5fcdca 100644 --- a/source/gameengine/GameLogic/SCA_RandomEventManager.h +++ b/source/gameengine/GameLogic/SCA_RandomEventManager.h @@ -51,5 +51,4 @@ public: #endif }; -#endif //__SCA_RANDOMEVENTMANAGER_H__ - +#endif /* __SCA_RANDOMEVENTMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h index 008445ef878..628562b77e6 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.h +++ b/source/gameengine/GameLogic/SCA_RandomSensor.h @@ -68,5 +68,4 @@ public: #endif }; -#endif //__SCA_RANDOMSENSOR_H__ - +#endif /* __SCA_RANDOMSENSOR_H__ */ diff --git a/source/gameengine/GameLogic/SCA_TimeEventManager.h b/source/gameengine/GameLogic/SCA_TimeEventManager.h index 092cf016370..4c929dca23c 100644 --- a/source/gameengine/GameLogic/SCA_TimeEventManager.h +++ b/source/gameengine/GameLogic/SCA_TimeEventManager.h @@ -59,5 +59,4 @@ public: #endif }; -#endif //__SCA_TIMEEVENTMANAGER_H__ - +#endif /* __SCA_TIMEEVENTMANAGER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_XNORController.h b/source/gameengine/GameLogic/SCA_XNORController.h index 5ef4dc67cf2..c257b71273e 100644 --- a/source/gameengine/GameLogic/SCA_XNORController.h +++ b/source/gameengine/GameLogic/SCA_XNORController.h @@ -50,5 +50,4 @@ public: }; -#endif //__SCA_XNORCONTROLLER_H__ - +#endif /* __SCA_XNORCONTROLLER_H__ */ diff --git a/source/gameengine/GameLogic/SCA_XORController.h b/source/gameengine/GameLogic/SCA_XORController.h index 56cd2440863..c64a3380ede 100644 --- a/source/gameengine/GameLogic/SCA_XORController.h +++ b/source/gameengine/GameLogic/SCA_XORController.h @@ -45,5 +45,4 @@ public: virtual void Trigger(SCA_LogicManager* logicmgr); }; -#endif //__SCA_XORCONTROLLER_H__ - +#endif /* __SCA_XORCONTROLLER_H__ */ -- cgit v1.2.3