Skip to content
Permalink
Browse files

Fixing warning pointed by @sfan5 and clang and cleanup guiFileSelectMenu

* Also pass clang-format on guiFileSelectMenu.h and remove it from whitelist
  • Loading branch information...
nerzhul committed Apr 21, 2017
1 parent 4f4e2e3 commit 3e71c8f482131da59642b0175160eb2bc714d439
Showing with 13 additions and 27 deletions.
  1. +0 −1 src/guiFileSelectMenu.cpp
  2. +7 −19 src/guiFileSelectMenu.h
  3. +1 −1 src/guiFormSpecMenu.h
  4. +5 −5 src/modalMenu.h
  5. +0 −1 util/travis/clang-format-whitelist.txt
@@ -25,7 +25,6 @@ GUIFileSelectMenu::GUIFileSelectMenu(gui::IGUIEnvironment* env,
GUIModalMenu(env, parent, id, menumgr),
m_title(utf8_to_wide(title)),
m_accepted(false),
m_parent(parent),
m_text_dst(NULL),
m_formname(formname)
{
@@ -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 @@ class GUIFileSelectMenu: public GUIModalMenu

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_ */
@@ -57,7 +57,7 @@ struct TextDest
{
virtual ~TextDest() {}
// This is deprecated I guess? -celeron55
virtual void gotText(std::wstring text){}
virtual void gotText(const std::wstring &text) {}
virtual void gotText(const StringMap &fields) = 0;

std::string m_formname;
@@ -43,14 +43,13 @@ class IMenuManager
class GUIModalMenu : public gui::IGUIElement
{
public:
GUIModalMenu(gui::IGUIEnvironment* env,
gui::IGUIElement* parent, s32 id,
GUIModalMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id,
IMenuManager *menumgr):
IGUIElement(gui::EGUIET_ELEMENT, env, parent, id,
core::rect<s32>(0,0,100,100))
{
//m_force_regenerate_gui = false;

m_menumgr = menumgr;
m_allow_focus_removal = false;
m_screensize_old = v2u32(0,0);
@@ -59,6 +58,7 @@ class GUIModalMenu : public gui::IGUIElement
Environment->setFocus(this);
m_menumgr->createdMenu(this);
}

virtual ~GUIModalMenu()
{
m_menumgr->deletingMenu(this);
@@ -78,7 +78,7 @@ class GUIModalMenu : public gui::IGUIElement
{
if(!IsVisible)
return;

video::IVideoDriver* driver = Environment->getVideoDriver();
v2u32 screensize = driver->getScreenSize();
if(screensize != m_screensize_old /*|| m_force_regenerate_gui*/)
@@ -90,7 +90,7 @@ class GUIModalMenu : public gui::IGUIElement

drawMenu();
}

/*
This should be called when the menu wants to quit.
@@ -94,7 +94,6 @@ src/guiChatConsole.h
src/guiEngine.cpp
src/guiEngine.h
src/guiFileSelectMenu.cpp
src/guiFileSelectMenu.h
src/guiFormSpecMenu.cpp
src/guiFormSpecMenu.h
src/guiKeyChangeMenu.cpp

0 comments on commit 3e71c8f

Please sign in to comment.
You can’t perform that action at this time.