General code cleanups

* Removed some unused includes
* Removed unused ListBox::mFont
* Removed wrong cast to SDL_Scancode
* Removed superfluous .c_str()
* Removed superfluous explicit std::string construction
* Removed unused variable
* Use more emplace_back
* Turned FindBeingFunctor into a lambda
* Avoid needless pointer references for ambient layers and use a vector

1 files changed, 5 insertions, 5 deletions

diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 01194c0b..c6e52ee7 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -162,21 +162,21 @@ void WindowMenu::valueChanged(const gcn::SelectionEvent &event)
     }
 }
 
-static std::string createShortcutCaption(const std::string& text,
-                                       KeyboardConfig::KeyAction key)
+static std::string createShortcutCaption(const std::string &text,
+                                         KeyboardConfig::KeyAction key)
 {
     std::string caption = gettext(text.c_str());
     if (key != KeyboardConfig::KEY_NO_VALUE)
     {
         caption += " (";
-        caption += SDL_GetKeyName((SDL_Scancode) keyboard.getKeyValue(key));
+        caption += SDL_GetKeyName(keyboard.getKeyValue(key));
         caption += ")";
     }
     return caption;
 }
 
-void WindowMenu::addButton(const std::string& text, int &x, int &h,
-                           const std::string& iconPath,
+void WindowMenu::addButton(const std::string &text, int &x, int &h,
+                           const std::string &iconPath,
                            KeyboardConfig::KeyAction key)
 {
     auto *btn = new Button("", text, this);