code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo...
[blender-staging.git] / source / gameengine / GameLogic / SCA_KeyboardManager.h
index c5553a74aef09799f995c17099f129c80ef13143..cd1cbf4adeebaef5bfb4079724be07da19c2521a 100644 (file)
@@ -1,8 +1,4 @@
-/**
- * Manager for keyboard events
- *
- * $Id$
- *
+/*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -17,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
  * ***** END GPL LICENSE BLOCK *****
  */
 
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __KX_KEYBOARDMANAGER
-#define __KX_KEYBOARDMANAGER
+/** \file SCA_KeyboardManager.h
+ *  \ingroup gamelogic
+ *  \brief Manager for keyboard events
+ *
+ */
+
+#ifndef __SCA_KEYBOARDMANAGER_H__
+#define __SCA_KEYBOARDMANAGER_H__
 
 
 #include "SCA_EventManager.h"
 
 
 #include "SCA_EventManager.h"
@@ -45,8 +47,6 @@ using namespace std;
 class SCA_KeyboardManager : public SCA_EventManager
 {
        class   SCA_IInputDevice*                               m_inputDevice;
 class SCA_KeyboardManager : public SCA_EventManager
 {
        class   SCA_IInputDevice*                               m_inputDevice;
-       class   SCA_LogicManager*                               m_logicmanager;
-
        
 public:
        SCA_KeyboardManager(class SCA_LogicManager* logicmgr,class SCA_IInputDevice* inputdev);
        
 public:
        SCA_KeyboardManager(class SCA_LogicManager* logicmgr,class SCA_IInputDevice* inputdev);
@@ -54,16 +54,13 @@ public:
 
        bool                    IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode);
        
 
        bool                    IsPressed(SCA_IInputDevice::KX_EnumInputs inputcode);
        
-       virtual void    NextFrame();    
+       virtual void    NextFrame();
        SCA_IInputDevice* GetInputDevice();
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
        SCA_IInputDevice* GetInputDevice();
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-public:
-       void *operator new( unsigned int 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
 };
 
-#endif //__KX_KEYBOARDMANAGER
-
+#endif  /* __SCA_KEYBOARDMANAGER_H__ */