diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-23 09:52:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-23 09:52:40 +0200 |
| commit | 91a9382c25328075d1a27593b22b0a75863951e1 (patch) | |
| tree | c0806621a7af000f31360a78d486d8e25f3bf52f /src/guiKeyChangeMenu.h | |
| parent | 0c34fe20a101f3e9297b3ffab4e8b736a55a558f (diff) | |
| download | minetest-91a9382c25328075d1a27593b22b0a75863951e1.tar.gz minetest-91a9382c25328075d1a27593b22b0a75863951e1.tar.bz2 minetest-91a9382c25328075d1a27593b22b0a75863951e1.zip | |
Pass clang-format on various cpp/header files (#5559)
Diffstat (limited to 'src/guiKeyChangeMenu.h')
| -rw-r--r-- | src/guiKeyChangeMenu.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h index 19a07620d..1aa400632 100644 --- a/src/guiKeyChangeMenu.h +++ b/src/guiKeyChangeMenu.h @@ -30,7 +30,8 @@ #include <string> #include <vector> -struct key_setting { +struct key_setting +{ int id; const wchar_t *button_name; KeyPress key; @@ -38,12 +39,11 @@ struct key_setting { gui::IGUIButton *button; }; - -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,10 +56,9 @@ public: bool acceptInput(); - bool OnEvent(const SEvent& event); + bool OnEvent(const SEvent &event); private: - void init_keys(); bool resetMenu(); @@ -67,13 +66,12 @@ private: 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 - |