From dc0e9097d3144a3dda81039f666ee43ba29cbc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Fri, 21 Apr 2017 23:40:48 +0200 Subject: Fix various performance issues reported by cppcheck + code style (CI) (#5635) * Make CI happy with code style on master * guiFileSelectMenu: remove useless includes * some performance fixes pointed by cppcheck * remove some useless casts * TextDest: remove unused setFormSpec function --- src/guiFileSelectMenu.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/guiFileSelectMenu.h') diff --git a/src/guiFileSelectMenu.h b/src/guiFileSelectMenu.h index e37d3d8df..a266cb399 100644 --- a/src/guiFileSelectMenu.h +++ b/src/guiFileSelectMenu.h @@ -32,8 +32,7 @@ class GUIFileSelectMenu: public GUIModalMenu public: GUIFileSelectMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id, IMenuManager *menumgr, - std::string title, - std::string formid); + const std::string &title, const std::string &formid); ~GUIFileSelectMenu(); void removeChildren(); @@ -47,9 +46,7 @@ public: bool OnEvent(const SEvent& event); - bool isRunning() { - return m_running; - } + bool isRunning() const { return m_running; } void setTextDest(TextDest * dest) { m_text_dst = dest; -- cgit v1.2.3 From 3e71c8f482131da59642b0175160eb2bc714d439 Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 22 Apr 2017 00:51:13 +0200 Subject: Fixing warning pointed by @sfan5 and clang and cleanup guiFileSelectMenu * Also pass clang-format on guiFileSelectMenu.h and remove it from whitelist --- src/guiFileSelectMenu.h | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'src/guiFileSelectMenu.h') 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_ */ -- cgit v1.2.3