Removed trailing whitespace from all *.?pp files

[supertux.git] / src / supertux / menu / keyboard_menu.cpp

diff --git a/src/supertux/menu/keyboard_menu.cpp b/src/supertux/menu/keyboard_menu.cpp
index e75b59d..052ed3d 100644 (file)
--- a/src/supertux/menu/keyboard_menu.cpp
+++ b/src/supertux/menu/keyboard_menu.cpp
@@ -1,6 +1,6 @@
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>,
-//                2007 Ingo Ruhnke <grumbel@gmx.de>
+//                2007 Ingo Ruhnke <grumbel@gmail.com>
 //
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 #include "supertux/globals.hpp"
 #include "util/gettext.hpp"
 
-KeyboardMenu::KeyboardMenu(JoystickKeyboardController* _controller) :
+KeyboardMenu::KeyboardMenu(InputManager* _controller) :
   controller(_controller)
 {
   add_label(_("Setup Keyboard"));
@@ -43,7 +43,7 @@ KeyboardMenu::KeyboardMenu(JoystickKeyboardController* _controller) :
   add_toggle(Controller::CONTROLCOUNT, _("Jump with Up"), controller->keyboard_manager->jump_with_up_kbd);
   add_hl();
   add_back(_("Back"));
-  update();
+  refresh();
 }
 
 KeyboardMenu::~KeyboardMenu()
@@ -92,14 +92,12 @@ KeyboardMenu::menu_action(MenuItem* item)
     controller->keyboard_manager->wait_for_key = item->id;
   } else if( item->id == Controller::CONTROLCOUNT) {
     controller->keyboard_manager->jump_with_up_kbd = item->toggled;
-  } 
+  }
 }
 
 void
-KeyboardMenu::update()
+KeyboardMenu::refresh()
 {
-  // update menu
-
   auto& kbd_mgr = controller->keyboard_manager;
 
   get_item_by_id((int) Controller::UP).change_input(get_key_name(