[Scummvm-cvs-logs] SF.net SVN: scummvm:[34101] scummvm/trunk/backends

[fingolfin at users.sourceforge.net]

Revision: 34101
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34101&view=rev
Author:   fingolfin
Date:     2008-08-22 11:49:34 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
Turned SymbianFilesystemFactory from a singleton into a normal class; adapted symbian backend accordingly

Modified Paths:
--------------
    scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp
    scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.h

Modified: scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp	2008-08-22 11:45:29 UTC (rev 34100)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs-factory.cpp	2008-08-22 11:49:34 UTC (rev 34101)
@@ -26,8 +26,6 @@
 #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);
 }
@@ -38,7 +36,7 @@
 	return new SymbianFilesystemNode(path);
 }
 
-AbstractFilesystemNode *SymbianFilesystemFactory::makeFileNodePath(const String &path) const {
+AbstractFilesystemNode *SymbianFilesystemFactory::makeFileNodePath(const Common::String &path) const {
 	return new SymbianFilesystemNode(path);
 }
 #endif

Modified: scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h	2008-08-22 11:45:29 UTC (rev 34100)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h	2008-08-22 11:49:34 UTC (rev 34101)
@@ -25,7 +25,6 @@
 #ifndef SYMBIAN_FILESYSTEM_FACTORY_H
 #define SYMBIAN_FILESYSTEM_FACTORY_H
 
-#include "common/singleton.h"
 #include "backends/fs/fs-factory.h"
 
 /**
@@ -33,19 +32,11 @@
  *
  * Parts of this class are documented in the base interface class, FilesystemFactory.
  */
-class SymbianFilesystemFactory : public FilesystemFactory, public Common::Singleton<SymbianFilesystemFactory> {
+class SymbianFilesystemFactory : public FilesystemFactory {
 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>;
+	virtual AbstractFilesystemNode *makeFileNodePath(const Common::String &path) const;
 };
 
 #endif /*SYMBIAN_FILESYSTEM_FACTORY_H*/

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-08-22 11:45:29 UTC (rev 34100)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-08-22 11:49:34 UTC (rev 34101)
@@ -268,6 +268,7 @@
 }
 
 FilesystemFactory *OSystem_SDL::getFilesystemFactory() {
+	assert(_fsFactory);
 	return _fsFactory;
 }
 

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-08-22 11:45:29 UTC (rev 34100)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-08-22 11:49:34 UTC (rev 34101)
@@ -123,10 +123,6 @@
 	}
 }
 
-FilesystemFactory *OSystem_SDL_Symbian::getFilesystemFactory() {
-	return &SymbianFilesystemFactory::instance();
-}
-
 static Common::String getDefaultConfigFileName() {
 	char configFile[MAXPATHLEN];
 	strcpy(configFile, Symbian::GetExecutablePath());
@@ -164,6 +160,8 @@
 	actions->initInstanceMain(this);
 	actions->loadMapping();
 	initZones();
+	
+	_fsFactory = new SymbianFilesystemFactory();
 }
 
 OSystem_SDL_Symbian::~OSystem_SDL_Symbian() {

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.h	2008-08-22 11:45:29 UTC (rev 34100)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.h	2008-08-22 11:49:34 UTC (rev 34101)
@@ -71,7 +71,6 @@
 	//
 	static void symbianMixCallback(void *s, byte *samples, int len);
 
-	virtual FilesystemFactory *getFilesystemFactory();
 public:
 	// vibration support
 #ifdef USE_VIBRA_SE_PXXX


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.