Fix Lint broken by b662a4577d692329b9ca83525e6039f2ddcd1ac1

[oweals/minetest.git] / src / guiKeyChangeMenu.h

diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index 833514c1d98d2e8478d86afb6d614294bec4d49d..1aa4006324b0e1e1dbc87eef4d3de37848dea045 100644 (file)
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -30,20 +30,20 @@
 #include <string>
 #include <vector>
 
-typedef struct {
+struct key_setting
+{
        int id;
-       wchar_t *button_name;
+       const wchar_t *button_name;
        KeyPress key;
        std::string setting_name;
        gui::IGUIButton *button;
-} key_setting;
-
+};
 
-class GUIKeyChangeMenu: public GUIModalMenu
+class GUIKeyChangeMenu : public GUIModalMenu
 {
 public:
-       GUIKeyChangeMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent,
-                       s32 id, IMenuManager *menumgr);
+       GUIKeyChangeMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id,
+                       IMenuManager *menumgr);
        ~GUIKeyChangeMenu();
 
        void removeChildren();
@@ -56,24 +56,22 @@ public:
 
        bool acceptInput();
 
-       bool OnEvent(const SEvent& event);
+       bool OnEvent(const SEvent &event);
 
 private:
-
        void init_keys();
 
        bool resetMenu();
 
-       void add_key(int id, wchar_t* button_name, std::string setting_name);
+       void add_key(int id, const wchar_t *button_name, const std::string &setting_name);
 
        bool shift_down;
-       
+
        s32 activeKey;
-       
+
        std::vector<KeyPress> key_used;
        gui::IGUIStaticText *key_used_text;
        std::vector<key_setting *> key_settings;
 };
 
 #endif
-