Changeset 3423 in orxonox.OLD for orxonox/trunk/src/gui/orxonox_gui_keys.h

Timestamp:

Feb 27, 2005, 7:11:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:

• orxonox/trunk/src/gui/orxonox_gui_keys.h (modified) (3 diffs)

orxonox/trunk/src/gui/orxonox_gui_keys.h

@@ -15 +15 @@
    \brief defines the Possible Player Keys
 */
-enum KEYS { UP, DOWN, LEFT, RIGHT, SHOOT };
+enum KEYS {UP, DOWN, LEFT, RIGHT, SHOOT};
 
 class Player;
@@ -29 +29 @@
 
  public:
-  OrxonoxGuiKeys ();
-  ~OrxonoxGuiKeys ();
+  OrxonoxGuiKeys(void);
+  ~OrxonoxGuiKeys(void);
   
-  Widget* getWidget ();
+  Widget* getWidget(void);
 };
 
@@ -64 +64 @@
   Player(char* player);
 
-  Widget* addKey (KEYS key, char* name);
+  Widget* addKey(KEYS key, char* name);
 
-  Button* getOpenButton();
+  Button* getOpenButton(void);
 
 #ifdef HAVE_GTK2