fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / control / joystickkeyboardcontroller.hpp

diff --git a/src/control/joystickkeyboardcontroller.hpp b/src/control/joystickkeyboardcontroller.hpp
index 90930ea..7d88932 100644 (file)
--- a/src/control/joystickkeyboardcontroller.hpp
+++ b/src/control/joystickkeyboardcontroller.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,11 +12,10 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __JOYSTICKKEYBOARDCONTROLLER_H__
 #define __JOYSTICKKEYBOARDCONTROLLER_H__
@@ -51,12 +50,12 @@ private:
   void process_key_event(const SDL_Event& event);
   void process_console_key_event(const SDL_Event& event);
   void process_menu_key_event(const SDL_Event& event);
-  
+
   typedef std::map<SDLKey, Control> KeyMap;
   KeyMap keymap;
 
   std::vector<SDL_Joystick*> joysticks;
-    
+
   typedef std::map<int, Control> ButtonMap;
   ButtonMap joy_button_map;
   std::string name;
@@ -96,7 +95,7 @@ private:
 
   class KeyboardMenu;
   class JoystickMenu;
-  
+
   KeyboardMenu* key_options_menu;
   JoystickMenu* joystick_options_menu;
   friend class KeyboardMenu;
@@ -104,4 +103,3 @@ private:
 };
 
 #endif
-