From e421a2363944ba7567311a2c2e2720151f6840b2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 23 Feb 2008 23:03:08 +0000
Subject: Replaced FilesystemFactory::makeFSFactory with a new method
 OSystem::getFilesystemFactory()

svn-id: r30947
---
 backends/fs/fs-factory.cpp | 87 ----------------------------------------------
 backends/fs/fs-factory.h   |  7 ----
 backends/module.mk         |  1 -
 3 files changed, 95 deletions(-)
 delete mode 100644 backends/fs/fs-factory.cpp

(limited to 'backends')

diff --git a/backends/fs/fs-factory.cpp b/backends/fs/fs-factory.cpp
deleted file mode 100644
index 035e4bf2f8..0000000000
--- a/backends/fs/fs-factory.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- */
-
-#include "backends/fs/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"
-#elif defined(__DC__)
-	#include "backends/fs/dc/ronincd-fs-factory.cpp"
-#elif defined(__DS__)
-	#include "backends/fs/ds/ds-fs-factory.cpp"
-#elif defined(__GP32__)
-	#include "backends/fs/gp32/gp32-fs-factory.cpp"
-#elif defined(__MORPHOS__)
-	#include "backends/fs/morphos/abox-fs-factory.cpp"
-#elif defined(PALMOS_MODE)
-	#include "backends/fs/palmos/palmos-fs-factory.cpp"
-#elif defined(__PLAYSTATION2__)
-	#include "backends/fs/ps2/ps2-fs-factory.cpp"
-#elif defined(__PSP__)
-	#include "backends/fs/psp/psp-fs-factory.cpp"
-#elif defined(__SYMBIAN32__)
-	#include "backends/fs/symbian/symbian-fs-factory.cpp"
-#elif defined(UNIX)
-	#include "backends/fs/posix/posix-fs-factory.cpp"
-#elif defined(WIN32)
-	#include "backends/fs/windows/windows-fs-factory.cpp"
-#endif
-
-/**
- * Creates concrete FilesystemFactory objects depending on the current architecture.
- *
- * @return FilesystemFactory* The specific factory for the current architecture.
- */
-FilesystemFactory *FilesystemFactory::makeFSFactory() {
-	#if defined(__amigaos4__)
-		return &AmigaOSFilesystemFactory::instance();
-	#elif defined(__DC__)
-		return &RoninCDFilesystemFactory::instance();
-	#elif defined(__DS__)
-		return &DSFilesystemFactory::instance();
-	#elif defined(__GP32__)
-		return &GP32FilesystemFactory::instance();
-	#elif defined(__MORPHOS__)
-		return &ABoxFilesystemFactory::instance();
-	#elif defined(PALMOS_MODE)
-		return &PalmOSFilesystemFactory::instance();
-	#elif defined(__PLAYSTATION2__)
-		return &Ps2FilesystemFactory::instance();
-	#elif defined(__PSP__)
-		return &PSPFilesystemFactory::instance();
-	#elif defined(__SYMBIAN32__)
-		return &SymbianFilesystemFactory::instance();
-	#elif defined(UNIX)
-		return &POSIXFilesystemFactory::instance();
-	#elif defined(WIN32)
-		return &WindowsFilesystemFactory::instance();
-	#endif
-}
diff --git a/backends/fs/fs-factory.h b/backends/fs/fs-factory.h
index bd208a7beb..f0c82a0ca4 100644
--- a/backends/fs/fs-factory.h
+++ b/backends/fs/fs-factory.h
@@ -66,13 +66,6 @@ public:
 	 * On Windows, it will be a special node which "contains" all drives (C:, D:, E:).
 	 */
 	virtual AbstractFilesystemNode *makeRootFileNode() const = 0;
-
-
-	/**
-	 * Meta-factory method which returns a concrete FilesystemFactory
-	 * instance depending on the current architecture.
-	 */
-	static FilesystemFactory *makeFSFactory();
 };
 
 #endif /*FILESYSTEM_FACTORY_H*/
diff --git a/backends/module.mk b/backends/module.mk
index 0f9baacea1..1a43cf5f7a 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -2,7 +2,6 @@ MODULE := backends
 
 MODULE_OBJS := \
 	events/default/default-events.o \
-	fs/fs-factory.o \
 	midi/alsa.o \
 	midi/camd.o \
 	midi/coreaudio.o \
-- 
cgit v1.2.3