diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-22 00:51:13 +0200 |
---|---|---|
committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-04-22 00:51:56 +0200 |
commit | 3e71c8f482131da59642b0175160eb2bc714d439 (patch) | |
tree | fa80424f0f98ca093d3bc82304f266dd5cb01b9c /src/guiFileSelectMenu.h | |
parent | 4f4e2e3e838fc640e45714d4666bc5d6b0aa8a25 (diff) | |
download | minetest-3e71c8f482131da59642b0175160eb2bc714d439.tar.gz minetest-3e71c8f482131da59642b0175160eb2bc714d439.tar.bz2 minetest-3e71c8f482131da59642b0175160eb2bc714d439.zip |
Fixing warning pointed by @sfan5 and clang and cleanup guiFileSelectMenu
* Also pass clang-format on guiFileSelectMenu.h and remove it from whitelist
Diffstat (limited to 'src/guiFileSelectMenu.h')
-rw-r--r-- | src/guiFileSelectMenu.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/guiFileSelectMenu.h b/src/guiFileSelectMenu.h index a266cb399..034823740 100644 --- a/src/guiFileSelectMenu.h +++ b/src/guiFileSelectMenu.h @@ -26,13 +26,12 @@ #include "IGUIFileOpenDialog.h" #include "guiFormSpecMenu.h" //required because of TextDest only !!! - -class GUIFileSelectMenu: public GUIModalMenu +class GUIFileSelectMenu : public GUIModalMenu { public: - GUIFileSelectMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, - s32 id, IMenuManager *menumgr, - const std::string &title, const std::string &formid); + GUIFileSelectMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id, + IMenuManager *menumgr, const std::string &title, + const std::string &formid); ~GUIFileSelectMenu(); void removeChildren(); @@ -44,32 +43,21 @@ public: void drawMenu(); - bool OnEvent(const SEvent& event); - - bool isRunning() const { return m_running; } + bool OnEvent(const SEvent &event); - void setTextDest(TextDest * dest) { - m_text_dst = dest; - } + void setTextDest(TextDest *dest) { m_text_dst = dest; } private: void acceptInput(); std::wstring m_title; bool m_accepted; - gui::IGUIElement* m_parent; - - std::string m_selectedPath; - gui::IGUIFileOpenDialog* m_fileOpenDialog; - - bool m_running; + gui::IGUIFileOpenDialog *m_fileOpenDialog; TextDest *m_text_dst; std::string m_formname; }; - - #endif /* GUIFILESELECTMENU_H_ */ |