Turned SymbianFilesystemFactory from a singleton into a normal class; adapted symbian backend accordingly

svn-id: r34101

3 files changed, 3 insertions, 5 deletions

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 44ed5e45ff..fa0ea35cb5 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -268,6 +268,7 @@ Common::SaveFileManager *OSystem_SDL::getSavefileManager() {
 }
 
 FilesystemFactory *OSystem_SDL::getFilesystemFactory() {
+	assert(_fsFactory);
 	return _fsFactory;
 }
 
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 33d18d9037..90bd99fa7d 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -123,10 +123,6 @@ void OSystem_SDL_Symbian::setFeatureState(Feature f, bool enable) {
 	}
 }
 
-FilesystemFactory *OSystem_SDL_Symbian::getFilesystemFactory() {
-	return &SymbianFilesystemFactory::instance();
-}
-
 static Common::String getDefaultConfigFileName() {
 	char configFile[MAXPATHLEN];
 	strcpy(configFile, Symbian::GetExecutablePath());
@@ -164,6 +160,8 @@ void OSystem_SDL_Symbian::initBackend() {
 	actions->initInstanceMain(this);
 	actions->loadMapping();
 	initZones();
+	
+	_fsFactory = new SymbianFilesystemFactory();
 }
 
 OSystem_SDL_Symbian::~OSystem_SDL_Symbian() {
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index cabfa51486..80329d984e 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -71,7 +71,6 @@ protected:
 	//
 	static void symbianMixCallback(void *s, byte *samples, int len);
 
-	virtual FilesystemFactory *getFilesystemFactory();
 public:
 	// vibration support
 #ifdef USE_VIBRA_SE_PXXX