Changed the FilesystemNode implementation to make it easier to use (client code doesn't have to worry about the memory managment anymore, it's all 'automatic' now). May have introduced a mem leak or two, please check :-)

svn-id: r15848

1 files changed, 6 insertions, 9 deletions

diff --git a/gui/browser.h b/gui/browser.h
index 10940fd94c..fcbf8be12d 100644
--- a/gui/browser.h
+++ b/gui/browser.h
@@ -23,14 +23,12 @@
 
 #include "gui/dialog.h"
 #include "common/str.h"
+#include "backends/fs/fs.h"
 
 #ifdef MACOSX
 #include <Carbon/Carbon.h>
 #endif
 
-class FilesystemNode;
-class FSList;
-
 namespace GUI {
 
 class ListWidget;
@@ -41,17 +39,16 @@ class BrowserDialog : public Dialog {
 	typedef Common::StringList StringList;
 public:
 	BrowserDialog(const char *title);
-	virtual ~BrowserDialog();
 
 #ifdef MACOSX
+	~BrowserDialog();
 	virtual int runModal();
 #else
 	virtual void open();
-	virtual void close();
 	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
 #endif
 
-	FilesystemNode	*getResult() { return _choice; };
+	const FilesystemNode	&getResult() { return _choice; };
 
 
 protected:
@@ -60,10 +57,10 @@ protected:
 #else
 	ListWidget		*_fileList;
 	StaticTextWidget*_currentPath;
-	FilesystemNode	*_node;
-	FSList			*_nodeContent;
+	FilesystemNode	_node;
+	FSList			_nodeContent;
 #endif
-	FilesystemNode	*_choice;
+	FilesystemNode	_choice;
 
 #ifndef MACOSX
 	void updateListing();