Initial commit of the new BaseFile implementation. It provides a common ground for file objects across platforms and divides responsibilities between the Common::File class and a base file implementation.

Also rearranged the factories into a new directory for clarity.

Note 1: The posix-file.h and cpp files are for testing only. Only the ds, ps2 and symbian architecture will use special BaseFile based objects.

Note 2: The current code does not yet make use of this new structure, since the Common::File remains intact.

svn-id: r28395

25 files changed, 2 insertions, 653 deletions

diff --git a/backends/fs/abstract-fs-factory.h b/backends/fs/abstract-fs-factory.h
deleted file mode 100644
index 41bfaaa34b..0000000000
--- a/backends/fs/abstract-fs-factory.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef ABSTRACT_FILESYSTEM_FACTORY_H
-#define ABSTRACT_FILESYSTEM_FACTORY_H
-
-#include "common/str.h"
-
-/**
- * Creates concrete FilesystemNode objects depending on the current architecture.
- */
-class AbstractFilesystemFactory {
-public:
-	typedef Common::String String;
-
-	/**
-	 * Destructor.
-	 */
-	virtual ~AbstractFilesystemFactory() {};
-	
-	/**
-	 * Returns a node representing the "current directory".
-	 * If your system does not support this concept, you can either try to
-	 * emulate it or simply return some "sensible" default directory node,
-	 * e.g. the same value as getRoot() returns.
-	 */
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const = 0;
-	
-	/**
-	 * Construct a node based on a path; the path is in the same format as it
-	 * would be for calls to fopen().
-	 *
-	 * Furthermore getNodeForPath(oldNode.path()) should create a new node
-	 * identical to oldNode. Hence, we can use the "path" value for persistent
-	 * storage e.g. in the config file.
-	 *
-	 * @param path The path string to create a FilesystemNode for.
-	 */
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const = 0;
-	
-	/**
-	 * Returns a special node representing the filesystem root.
-	 * The starting point for any file system browsing.
-	 * 
-	 * On Unix, this will be simply the node for / (the root directory).
-	 * On Windows, it will be a special node which "contains" all drives (C:, D:, E:).
-	 */
-	virtual AbstractFilesystemNode *makeRootFileNode() const = 0;
-};
-
-#endif /*ABSTRACT_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/abstract-fs.h b/backends/fs/abstract-fs.h
index 371c38a495..85fcbcdebb 100644
--- a/backends/fs/abstract-fs.h
+++ b/backends/fs/abstract-fs.h
@@ -46,7 +46,7 @@ protected:
 	friend class FilesystemNode;
 	typedef Common::String String;
 	typedef FilesystemNode::ListMode ListMode;
-
+	
 	/**
 	 * Returns the child node with the given name. If no child with this name
 	 * exists, returns 0. When called on a non-directory node, it should
@@ -77,7 +77,7 @@ public:
 	 * Destructor.
 	 */
 	virtual ~AbstractFilesystemNode() {}
-
+	
 	/*
 	 * Indicates whether the object refered by this path exists in the filesystem or not.
 	 */
diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.cpp b/backends/fs/amigaos4/amigaos4-fs-factory.cpp
deleted file mode 100644
index becbd49003..0000000000
--- a/backends/fs/amigaos4/amigaos4-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
-#include "backends/fs/amigaos4/amigaos4-fs.cpp"
-
-DECLARE_SINGLETON(AmigaOSFilesystemFactory);
-
-AbstractFilesystemNode *AmigaOSFilesystemFactory::makeRootFileNode() const {
-	return new AmigaOSFilesystemNode();
-}
-
-AbstractFilesystemNode *AmigaOSFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new AmigaOSFilesystemNode();
-}
-
-AbstractFilesystemNode *AmigaOSFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new AmigaOSFilesystemNode(path);
-}
diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.h b/backends/fs/amigaos4/amigaos4-fs-factory.h
deleted file mode 100644
index ed8af24648..0000000000
--- a/backends/fs/amigaos4/amigaos4-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef AMIGAOS_FILESYSTEM_FACTORY_H
-#define AMIGAOS_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates AmigaOSFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class AmigaOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<AmigaOSFilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	AmigaOSFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*AMIGAOS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/dc/ronincd-fs-factory.cpp b/backends/fs/dc/ronincd-fs-factory.cpp
deleted file mode 100644
index 0229a44c45..0000000000
--- a/backends/fs/dc/ronincd-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/dc/ronincd-fs-factory.h"
-#include "backends/fs/dc/dc-fs.cpp"
-
-DECLARE_SINGLETON(RoninCDFilesystemFactory);
-
-AbstractFilesystemNode *RoninCDFilesystemFactory::makeRootFileNode() const {
-	return new RoninCDFilesystemNode();
-}
-
-AbstractFilesystemNode *RoninCDFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new RoninCDFilesystemNode();
-}
-
-AbstractFilesystemNode *RoninCDFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new RoninCDFilesystemNode(path, true);
-}
diff --git a/backends/fs/dc/ronincd-fs-factory.h b/backends/fs/dc/ronincd-fs-factory.h
deleted file mode 100644
index 426ef7ef2c..0000000000
--- a/backends/fs/dc/ronincd-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef RONINCD_FILESYSTEM_FACTORY_H
-#define RONINCD_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates RoninCDFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class RoninCDFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<RoninCDFilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	RoninCDFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*RONINCD_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp
deleted file mode 100644
index 7e64b37411..0000000000
--- a/backends/fs/ds/ds-fs-factory.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "backends/fs/ds/ds-fs-factory.h"
-#include "backends/fs/ds/ds-fs.cpp"
-#include "dsmain.h" //for the isGBAMPAvailable() function
-
-DECLARE_SINGLETON(DSFilesystemFactory);
-
-AbstractFilesystemNode *DSFilesystemFactory::makeRootFileNode() const {
-	if (DS::isGBAMPAvailable()) {
-		return new DS::GBAMPFileSystemNode();
-	} else {
-		return new DS::DSFileSystemNode();
-	}
-}
-
-AbstractFilesystemNode *DSFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	if (DS::isGBAMPAvailable()) {
-		return new DS::GBAMPFileSystemNode();
-	} else {
-		return new DS::DSFileSystemNode();
-	}
-}
-
-AbstractFilesystemNode *DSFilesystemFactory::makeFileNodePath(const String &path) const {
-	if (DS::isGBAMPAvailable()) {
-		return new DS::GBAMPFileSystemNode(path);
-	} else {
-		return new DS::DSFileSystemNode(path);
-	}
-}
diff --git a/backends/fs/ds/ds-fs-factory.h b/backends/fs/ds/ds-fs-factory.h
deleted file mode 100644
index a2e96aa548..0000000000
--- a/backends/fs/ds/ds-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef DS_FILESYSTEM_FACTORY_H
-#define DS_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates DSFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class DSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<DSFilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	DSFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*DS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/fs-factory-maker.cpp b/backends/fs/fs-factory-maker.cpp
deleted file mode 100644
index bae3d1a30a..0000000000
--- a/backends/fs/fs-factory-maker.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-#include "backends/fs/abstract-fs-factory.h"
-
-/*
- * All the following includes choose, at compile time, which specific backend will be used
- * during the execution of the ScummVM.
- * 
- * It has to be done this way because not all the necessary libraries will be available in
- * all build environments. Additionally, this results in smaller binaries.
- */
-#if defined(__amigaos4__)
-	#include "backends/fs/amigaos4/amigaos4-fs-factory.cpp"
-#endif
- 
-#if defined(__DC__)
-	#include "backends/fs/dc/ronincd-fs-factory.cpp"
-#endif
-
-#if defined(__DS__)
-	#include "backends/fs/ds/ds-fs-factory.cpp"
-#endif
-
-#if defined(__GP32__)
-	#include "backends/fs/gp32/gp32-fs-factory.cpp"
-#endif
-
-#if defined(__MORPHOS__)
-	#include "backends/fs/morphos/abox-fs-factory.cpp"
-#endif
-
-#if defined(PALMOS_MODE)
-	#include "backends/fs/palmos/palmos-fs-factory.cpp"
-#endif
-
-#if defined(__PLAYSTATION2__)
-	#include "backends/fs/ps2/ps2-fs-factory.cpp"
-#endif
-
-#if defined(__PSP__)
-	#include "backends/fs/psp/psp-fs-factory.cpp"
-#endif
-
-#if defined(__SYMBIAN32__)
-	#include "backends/fs/symbian/symbian-fs-factory.cpp"
-#endif
-
-#if defined(UNIX)
-	#include "backends/fs/posix/posix-fs-factory.cpp"
-#endif
-
-#if defined(WIN32)
-	#include "backends/fs/windows/windows-fs-factory.cpp"
-#endif
-
-/**
- * Creates concrete FilesystemFactory objects depending on the current architecture.
- */
-class FilesystemFactoryMaker {
-public:
-
-	/**
-	 * Returns the correct concrete factory depending on the current build architecture.
-	 */
-	static AbstractFilesystemFactory *makeFactory();
-	
-protected:
-	FilesystemFactoryMaker() {}; // avoid instances of this class
-};
-
-AbstractFilesystemFactory *FilesystemFactoryMaker::makeFactory(){
-	#if defined(__amigaos4__)
-		return &AmigaOSFilesystemFactory::instance();
-	#endif
-	
-	#if defined(__DC__)
-		return &RoninCDFilesystemFactory::instance();
-	#endif
-	
-	#if defined(__DS__)
-		return &DSFilesystemFactory::instance();
-	#endif
-	
-	#if defined(__GP32__)
-		return &GP32FilesystemFactory::instance();
-	#endif
-	
-	#if defined(__MORPHOS__)
-		return &ABoxFilesystemFactory::instance();
-	#endif
-	
-	#if defined(PALMOS_MODE)
-		return &PalmOSFilesystemFactory::instance();
-	#endif
-	
-	#if defined(__PLAYSTATION2__)
-		return &Ps2FilesystemFactory::instance();
-	#endif
-	
-	#if defined(__PSP__)
-		return &PSPFilesystemFactory::instance();
-	#endif
-	
-	#if defined(__SYMBIAN32__)
-		return &SymbianFilesystemFactory::instance();
-	#endif
-	
-	#if defined(UNIX)
-		return &POSIXFilesystemFactory::instance();
-	#endif
-	
-	#if defined(WIN32)
-		return &WindowsFilesystemFactory::instance();
-	#endif
-}
diff --git a/backends/fs/gp32/gp32-fs-factory.cpp b/backends/fs/gp32/gp32-fs-factory.cpp
deleted file mode 100644
index 6328836c0e..0000000000
--- a/backends/fs/gp32/gp32-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/gp32/gp32-fs-factory.h"
-#include "backends/fs/gp32/gp32-fs.cpp"
-
-DECLARE_SINGLETON(GP32FilesystemFactory);
-
-AbstractFilesystemNode *GP32FilesystemFactory::makeRootFileNode() const {
-	return new GP32FilesystemNode();
-}
-
-AbstractFilesystemNode *GP32FilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new GP32FilesystemNode();
-}
-
-AbstractFilesystemNode *GP32FilesystemFactory::makeFileNodePath(const String &path) const {
-	return new GP32FilesystemNode(path);
-}
diff --git a/backends/fs/gp32/gp32-fs-factory.h b/backends/fs/gp32/gp32-fs-factory.h
deleted file mode 100644
index fc15b52bc6..0000000000
--- a/backends/fs/gp32/gp32-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef GP32_FILESYSTEM_FACTORY_H
-#define GP32_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates GP32FilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class GP32FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<GP32FilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	GP32FilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*GP32_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/morphos/abox-fs-factory.cpp b/backends/fs/morphos/abox-fs-factory.cpp
deleted file mode 100644
index 9de810c361..0000000000
--- a/backends/fs/morphos/abox-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/morphos/abox-fs-factory.h"
-#include "backends/fs/morphos/abox-fs.cpp"
-
-DECLARE_SINGLETON(ABoxFilesystemFactory);
-
-AbstractFilesystemNode *ABoxFilesystemFactory::makeRootFileNode() const {
-	return new ABoxFilesystemNode();
-}
-
-AbstractFilesystemNode *ABoxFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new ABoxFilesystemNode();
-}
-
-AbstractFilesystemNode *ABoxFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new ABoxFilesystemNode(path);
-}
diff --git a/backends/fs/morphos/abox-fs-factory.h b/backends/fs/morphos/abox-fs-factory.h
deleted file mode 100644
index 35f4472b8b..0000000000
--- a/backends/fs/morphos/abox-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef ABOX_FILESYSTEM_FACTORY_H
-#define ABOX_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates ABoxFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class ABoxFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<ABoxFilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	ABoxFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*ABOX_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/palmos/palmos-fs-factory.cpp b/backends/fs/palmos/palmos-fs-factory.cpp
deleted file mode 100644
index 1b0db0f042..0000000000
--- a/backends/fs/palmos/palmos-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/palmos/palmos-fs-factory.h"
-#include "backends/fs/palmos/palmos-fs.cpp"
-
-DECLARE_SINGLETON(PalmOSFilesystemFactory);
-
-AbstractFilesystemNode *PalmOSFilesystemFactory::makeRootFileNode() const {
-	return new PalmOSFilesystemNode();
-}
-
-AbstractFilesystemNode *PalmOSFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new PalmOSFilesystemNode();
-}
-
-AbstractFilesystemNode *PalmOSFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new PalmOSFilesystemNode(path);
-}
diff --git a/backends/fs/palmos/palmos-fs-factory.h b/backends/fs/palmos/palmos-fs-factory.h
deleted file mode 100644
index cfe246e806..0000000000
--- a/backends/fs/palmos/palmos-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef PALMOS_FILESYSTEM_FACTORY_H
-#define PALMOS_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates PalmOSFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class PalmOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PalmOSFilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	PalmOSFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*PALMOS_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/posix/posix-fs-factory.cpp b/backends/fs/posix/posix-fs-factory.cpp
deleted file mode 100644
index bed3dc5f8f..0000000000
--- a/backends/fs/posix/posix-fs-factory.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "backends/fs/posix/posix-fs-factory.h"
-#include "backends/fs/posix/posix-fs.cpp"
-
-DECLARE_SINGLETON(POSIXFilesystemFactory);
-
-AbstractFilesystemNode *POSIXFilesystemFactory::makeRootFileNode() const {
-	return new POSIXFilesystemNode();
-}
-
-AbstractFilesystemNode *POSIXFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	char buf[MAXPATHLEN];
-	getcwd(buf, MAXPATHLEN);
-	return new POSIXFilesystemNode(buf, true);
-}
-
-AbstractFilesystemNode *POSIXFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new POSIXFilesystemNode(path, true);
-}
diff --git a/backends/fs/posix/posix-fs-factory.h b/backends/fs/posix/posix-fs-factory.h
deleted file mode 100644
index 93f0ac115b..0000000000
--- a/backends/fs/posix/posix-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef POSIX_FILESYSTEM_FACTORY_H
-#define POSIX_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates POSIXFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class POSIXFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<POSIXFilesystemFactory> {
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	POSIXFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*POSIX_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/ps2/ps2-fs-factory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp
deleted file mode 100644
index 5f10974501..0000000000
--- a/backends/fs/ps2/ps2-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/ps2/ps2-fs-factory.h"
-#include "backends/fs/ps2/ps2-fs.cpp"
-
-DECLARE_SINGLETON(Ps2FilesystemFactory);
-
-AbstractFilesystemNode *Ps2FilesystemFactory::makeRootFileNode() const {
-	return new Ps2FilesystemNode();
-}
-
-AbstractFilesystemNode *Ps2FilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new Ps2FilesystemNode();
-}
-
-AbstractFilesystemNode *Ps2FilesystemFactory::makeFileNodePath(const String &path) const {
-	return new Ps2FilesystemNode(path);
-}
diff --git a/backends/fs/ps2/ps2-fs-factory.h b/backends/fs/ps2/ps2-fs-factory.h
deleted file mode 100644
index 6f0da114c5..0000000000
--- a/backends/fs/ps2/ps2-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef PS2_FILESYSTEM_FACTORY_H
-#define PS2_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates PS2FilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class Ps2FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<Ps2FilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	Ps2FilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*PS2_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/psp/psp-fs-factory.cpp b/backends/fs/psp/psp-fs-factory.cpp
deleted file mode 100644
index 6fc829baf1..0000000000
--- a/backends/fs/psp/psp-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/psp/psp-fs-factory.h"
-#include "backends/fs/psp/psp_fs.cpp"
-
-DECLARE_SINGLETON(PSPFilesystemFactory);
-
-AbstractFilesystemNode *PSPFilesystemFactory::makeRootFileNode() const {
-	return new PSPFilesystemNode();
-}
-
-AbstractFilesystemNode *PSPFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new PSPFilesystemNode();
-}
-
-AbstractFilesystemNode *PSPFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new PSPFilesystemNode(path, true);
-}
diff --git a/backends/fs/psp/psp-fs-factory.h b/backends/fs/psp/psp-fs-factory.h
deleted file mode 100644
index b1a44b90c4..0000000000
--- a/backends/fs/psp/psp-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef PSP_FILESYSTEM_FACTORY_H
-#define PSP_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates PSPFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class PSPFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	PSPFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*PSP_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/symbian/symbian-fs-factory.cpp b/backends/fs/symbian/symbian-fs-factory.cpp
deleted file mode 100644
index 87b1f0f05d..0000000000
--- a/backends/fs/symbian/symbian-fs-factory.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "backends/fs/symbian/symbian-fs-factory.h"
-#include "backends/fs/symbian/symbian-fs.cpp"
-
-DECLARE_SINGLETON(SymbianFilesystemFactory);
-
-AbstractFilesystemNode *SymbianFilesystemFactory::makeRootFileNode() const {
-	return new SymbianFilesystemNode(true);
-}
-
-AbstractFilesystemNode *SymbianFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	char path[MAXPATHLEN];
-	getcwd(path, MAXPATHLEN);
-	return new SymbianFilesystemNode(path);
-}
-
-AbstractFilesystemNode *SymbianFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new SymbianFilesystemNode(path);
-}
diff --git a/backends/fs/symbian/symbian-fs-factory.h b/backends/fs/symbian/symbian-fs-factory.h
deleted file mode 100644
index 69749cbd7e..0000000000
--- a/backends/fs/symbian/symbian-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef SYMBIAN_FILESYSTEM_FACTORY_H
-#define SYMBIAN_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates SymbianFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class SymbianFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<SymbianFilesystemFactory> {	
-public:
-	typedef Common::String String;
-		
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	SymbianFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*SYMBIAN_FILESYSTEM_FACTORY_H*/
diff --git a/backends/fs/windows/windows-fs-factory.cpp b/backends/fs/windows/windows-fs-factory.cpp
deleted file mode 100644
index 3d7a3cc672..0000000000
--- a/backends/fs/windows/windows-fs-factory.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "backends/fs/windows/windows-fs-factory.h"
-#include "backends/fs/windows/windows-fs.cpp"
-
-DECLARE_SINGLETON(WindowsFilesystemFactory);
-
-AbstractFilesystemNode *WindowsFilesystemFactory::makeRootFileNode() const {
-	return new WindowsFilesystemNode();
-}
-
-AbstractFilesystemNode *WindowsFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new WindowsFilesystemNode("", true);
-}
-
-AbstractFilesystemNode *WindowsFilesystemFactory::makeFileNodePath(const String &path) const {
-	return new WindowsFilesystemNode(path, false);
-}
diff --git a/backends/fs/windows/windows-fs-factory.h b/backends/fs/windows/windows-fs-factory.h
deleted file mode 100644
index 7d17802b52..0000000000
--- a/backends/fs/windows/windows-fs-factory.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef WINDOWS_FILESYSTEM_FACTORY_H
-#define WINDOWS_FILESYSTEM_FACTORY_H
-
-#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
-
-/**
- * Creates WindowsFilesystemNode objects.
- * 
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
- */
-class WindowsFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<WindowsFilesystemFactory> {	
-public:
-	typedef Common::String String;
-	
-	virtual AbstractFilesystemNode *makeRootFileNode() const;
-	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
-	virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const;
-	
-protected:
-	WindowsFilesystemFactory() {};
-		
-private:
-	friend class Common::Singleton<SingletonBaseType>;
-};
-
-#endif /*WINDOWS_FILESYSTEM_FACTORY_H*/