[Scummvm-cvs-logs] SF.net SVN: scummvm: [32824] scummvm/trunk/common

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Jun 28 16:14:16 CEST 2008


Revision: 32824
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32824&view=rev
Author:   fingolfin
Date:     2008-06-28 07:14:16 -0700 (Sat, 28 Jun 2008)

Log Message:
-----------
Removed OSystem::getFilesystemFactory() default implentation, as announced

Modified Paths:
--------------
    scummvm/trunk/common/system.cpp
    scummvm/trunk/common/system.h

Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp	2008-06-28 13:53:39 UTC (rev 32823)
+++ scummvm/trunk/common/system.cpp	2008-06-28 14:14:16 UTC (rev 32824)
@@ -121,28 +121,3 @@
 	memset(screen->pixels, 0, screen->h * screen->pitch);
 	unlockScreen();
 }
-
-/*
- * Include header files needed for the getFilesystemFactory() method.
- *
- * TODO: Remove these gradually and move the getFilesystemFactory() implementations
- * to the respective backends. Then turn it into a pure virtual method of OSystem.
- */
-#if defined(PALMOS_MODE)
-	#include "backends/fs/palmos/palmos-fs-factory.h"
-#elif defined(__PLAYSTATION2__)
-	#include "backends/fs/ps2/ps2-fs-factory.h"
-#endif
-
-FilesystemFactory *OSystem::getFilesystemFactory() {
-	#if defined(__amigaos4__) || defined(__DC__) || defined(__SYMBIAN32__) || defined(UNIX) || defined(WIN32) || defined(__WII__) || defined(__PSP__) || defined(__DS__)
-		// These ports already implement this function, so it should never be called.
-		return 0;
-	#elif defined(PALMOS_MODE)
-		return &PalmOSFilesystemFactory::instance();
-	#elif defined(__PLAYSTATION2__)
-		return &Ps2FilesystemFactory::instance();
-	#else
-		#error Unknown and unsupported backend in OSystem::getFilesystemFactory
-	#endif
-}

Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h	2008-06-28 13:53:39 UTC (rev 32823)
+++ scummvm/trunk/common/system.h	2008-06-28 14:14:16 UTC (rev 32824)
@@ -911,7 +911,7 @@
 	 *
 	 * @return FilesystemFactory* The specific factory for the current architecture.
 	 */
-	virtual FilesystemFactory *getFilesystemFactory();
+	virtual FilesystemFactory *getFilesystemFactory() = 0;
 
 
 	/**


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




More information about the Scummvm-git-logs mailing list