Merge 0.4.16 into stable-0.4

1 files changed, 7 insertions, 22 deletions

diff --git a/src/guiFileSelectMenu.h b/src/guiFileSelectMenu.h
index e37d3d8df..034823740 100644
--- a/src/guiFileSelectMenu.h
+++ b/src/guiFileSelectMenu.h
@@ -26,14 +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,
-			std::string title,
-			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();
@@ -45,34 +43,21 @@ public:
 
 	void drawMenu();
 
-	bool OnEvent(const SEvent& event);
-
-	bool isRunning() {
-		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_ */