aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2008-06-28 14:14:16 +0000
committerMax Horn2008-06-28 14:14:16 +0000
commit62713a8b1b8dc002104cb53accbb5604948366f3 (patch)
tree33f957fcbac01d2743b2b9974c9b1bba70446c6c
parentad447b6f3912d99a0d24575571203a78186ad2b9 (diff)
downloadscummvm-rg350-62713a8b1b8dc002104cb53accbb5604948366f3.tar.gz
scummvm-rg350-62713a8b1b8dc002104cb53accbb5604948366f3.tar.bz2
scummvm-rg350-62713a8b1b8dc002104cb53accbb5604948366f3.zip
Removed OSystem::getFilesystemFactory() default implentation, as announced
svn-id: r32824
-rw-r--r--common/system.cpp25
-rw-r--r--common/system.h2
2 files changed, 1 insertions, 26 deletions
diff --git a/common/system.cpp b/common/system.cpp
index 327b7246e2..8d528258f4 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -121,28 +121,3 @@ void OSystem::clearScreen() {
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
-}
diff --git a/common/system.h b/common/system.h
index 204ea9383a..4fc4c0625b 100644
--- a/common/system.h
+++ b/common/system.h
@@ -911,7 +911,7 @@ public:
*
* @return FilesystemFactory* The specific factory for the current architecture.
*/
- virtual FilesystemFactory *getFilesystemFactory();
+ virtual FilesystemFactory *getFilesystemFactory() = 0;
/**