code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo...
[blender-staging.git] / source / gameengine / GameLogic / SCA_KeyboardManager.h
index 55dd189d9d10cc1ad932513c2712b0da08c56bf8..cd1cbf4adeebaef5bfb4079724be07da19c2521a 100644 (file)
@@ -31,8 +31,8 @@
  *
  */
 
-#ifndef __KX_KEYBOARDMANAGER
-#define __KX_KEYBOARDMANAGER
+#ifndef __SCA_KEYBOARDMANAGER_H__
+#define __SCA_KEYBOARDMANAGER_H__
 
 
 #include "SCA_EventManager.h"
@@ -54,16 +54,13 @@ public:
 
        bool                    IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode);
        
-       virtual void    NextFrame();    
+       virtual void    NextFrame();
        SCA_IInputDevice* GetInputDevice();
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-       void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
-       void operator delete( void *mem ) { MEM_freeN(mem); }
+       MEM_CXX_CLASS_ALLOC_FUNCS("GE:SCA_KeyboardManager")
 #endif
 };
 
-#endif //__KX_KEYBOARDMANAGER
-
+#endif  /* __SCA_KEYBOARDMANAGER_H__ */