[Scummvm-cvs-logs] SF.net SVN: scummvm: [30935] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Feb 23 20:01:13 CET 2008
Revision: 30935
http://scummvm.svn.sourceforge.net/scummvm/?rev=30935&view=rev
Author: fingolfin
Date: 2008-02-23 11:01:12 -0800 (Sat, 23 Feb 2008)
Log Message:
-----------
Renamed AbstractFilesystemFactory to FilesystemFactory
Modified Paths:
--------------
scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h
scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h
scummvm/trunk/backends/fs/ds/ds-fs-factory.h
scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h
scummvm/trunk/backends/fs/morphos/abox-fs-factory.h
scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h
scummvm/trunk/backends/fs/posix/posix-fs-factory.h
scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h
scummvm/trunk/backends/fs/psp/psp-fs-factory.h
scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h
scummvm/trunk/backends/fs/windows/windows-fs-factory.h
scummvm/trunk/backends/module.mk
scummvm/trunk/common/fs.cpp
Added Paths:
-----------
scummvm/trunk/backends/fs/fs-factory.cpp
scummvm/trunk/backends/fs/fs-factory.h
Removed Paths:
-------------
scummvm/trunk/backends/fs/abstract-fs-factory.cpp
scummvm/trunk/backends/fs/abstract-fs-factory.h
Deleted: scummvm/trunk/backends/fs/abstract-fs-factory.cpp
===================================================================
--- scummvm/trunk/backends/fs/abstract-fs-factory.cpp 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/abstract-fs-factory.cpp 2008-02-23 19:01:12 UTC (rev 30935)
@@ -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/abstract-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 AbstractFilesystemFactory* The specific factory for the current architecture.
- */
-AbstractFilesystemFactory *AbstractFilesystemFactory::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
-}
Deleted: scummvm/trunk/backends/fs/abstract-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/abstract-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/abstract-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -1,80 +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$
- */
-
-#ifndef ABSTRACT_FILESYSTEM_FACTORY_H
-#define ABSTRACT_FILESYSTEM_FACTORY_H
-
-#include "common/str.h"
-#include "backends/fs/abstract-fs.h"
-
-/**
- * Creates concrete FilesystemNode objects depending on the current architecture.
- */
-class AbstractFilesystemFactory {
-public:
- typedef Common::String String;
-
- /**
- * Destructor.
- */
- virtual ~AbstractFilesystemFactory() {}
-
- /**
- * Returns a node representing the "current directory".
- * If your system does not support this concept, you can either try to
- * emulate it or simply return some "sensible" default directory node,
- * e.g. the same value as getRoot() returns.
- */
- virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const = 0;
-
- /**
- * Construct a node based on a path; the path is in the same format as it
- * would be for calls to fopen().
- *
- * Furthermore getNodeForPath(oldNode.path()) should create a new node
- * identical to oldNode. Hence, we can use the "path" value for persistent
- * storage e.g. in the config file.
- *
- * @param path The path string to create a FilesystemNode for.
- */
- virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const = 0;
-
- /**
- * Returns a special node representing the filesystem root.
- * The starting point for any file system browsing.
- *
- * On Unix, this will be simply the node for / (the root directory).
- * 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 AbstractFilesystemFactory
- * instance depending on the current architecture.
- */
- static AbstractFilesystemFactory *makeFSFactory();
-};
-
-#endif /*ABSTRACT_FILESYSTEM_FACTORY_H*/
Modified: scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/amigaos4/amigaos4-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define AMIGAOS_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates AmigaOSFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class AmigaOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<AmigaOSFilesystemFactory> {
+class AmigaOSFilesystemFactory : public FilesystemFactory, public Common::Singleton<AmigaOSFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/dc/ronincd-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define RONINCD_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates RoninCDFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class RoninCDFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<RoninCDFilesystemFactory> {
+class RoninCDFilesystemFactory : public FilesystemFactory, public Common::Singleton<RoninCDFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/ds/ds-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/ds/ds-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define DS_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates DSFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class DSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<DSFilesystemFactory> {
+class DSFilesystemFactory : public FilesystemFactory, public Common::Singleton<DSFilesystemFactory> {
public:
typedef Common::String String;
Copied: scummvm/trunk/backends/fs/fs-factory.cpp (from rev 30930, scummvm/trunk/backends/fs/abstract-fs-factory.cpp)
===================================================================
--- scummvm/trunk/backends/fs/fs-factory.cpp (rev 0)
+++ scummvm/trunk/backends/fs/fs-factory.cpp 2008-02-23 19:01:12 UTC (rev 30935)
@@ -0,0 +1,87 @@
+/* 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
+}
Copied: scummvm/trunk/backends/fs/fs-factory.h (from rev 30930, scummvm/trunk/backends/fs/abstract-fs-factory.h)
===================================================================
--- scummvm/trunk/backends/fs/fs-factory.h (rev 0)
+++ scummvm/trunk/backends/fs/fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -0,0 +1,78 @@
+/* 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$
+ */
+
+#ifndef FILESYSTEM_FACTORY_H
+#define FILESYSTEM_FACTORY_H
+
+#include "common/str.h"
+#include "backends/fs/abstract-fs.h"
+
+/**
+ * Creates concrete FilesystemNode objects depending on the current architecture.
+ */
+class FilesystemFactory {
+public:
+ /**
+ * Destructor.
+ */
+ virtual ~FilesystemFactory() {}
+
+ /**
+ * Returns a node representing the "current directory".
+ * If your system does not support this concept, you can either try to
+ * emulate it or simply return some "sensible" default directory node,
+ * e.g. the same value as getRoot() returns.
+ */
+ virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const = 0;
+
+ /**
+ * Construct a node based on a path; the path is in the same format as it
+ * would be for calls to fopen().
+ *
+ * Furthermore getNodeForPath(oldNode.path()) should create a new node
+ * identical to oldNode. Hence, we can use the "path" value for persistent
+ * storage e.g. in the config file.
+ *
+ * @param path The path string to create a FilesystemNode for.
+ */
+ virtual AbstractFilesystemNode *makeFileNodePath(const Common::String &path) const = 0;
+
+ /**
+ * Returns a special node representing the filesystem root.
+ * The starting point for any file system browsing.
+ *
+ * On Unix, this will be simply the node for / (the root directory).
+ * 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*/
Modified: scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/gp32/gp32-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define GP32_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates GP32FilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class GP32FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<GP32FilesystemFactory> {
+class GP32FilesystemFactory : public FilesystemFactory, public Common::Singleton<GP32FilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/morphos/abox-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/morphos/abox-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/morphos/abox-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define ABOX_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates ABoxFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class ABoxFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<ABoxFilesystemFactory> {
+class ABoxFilesystemFactory : public FilesystemFactory, public Common::Singleton<ABoxFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/palmos/palmos-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define PALMOS_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates PalmOSFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class PalmOSFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PalmOSFilesystemFactory> {
+class PalmOSFilesystemFactory : public FilesystemFactory, public Common::Singleton<PalmOSFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/posix/posix-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/posix/posix-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/posix/posix-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define POSIX_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates POSIXFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class POSIXFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<POSIXFilesystemFactory> {
+class POSIXFilesystemFactory : public FilesystemFactory, public Common::Singleton<POSIXFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/ps2/ps2-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define PS2_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates PS2FilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class Ps2FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<Ps2FilesystemFactory> {
+class Ps2FilesystemFactory : public FilesystemFactory, public Common::Singleton<Ps2FilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/psp/psp-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/psp/psp-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define PSP_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates PSPFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class PSPFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {
+class PSPFilesystemFactory : public FilesystemFactory, public Common::Singleton<PSPFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define SYMBIAN_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates SymbianFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class SymbianFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<SymbianFilesystemFactory> {
+class SymbianFilesystemFactory : public FilesystemFactory, public Common::Singleton<SymbianFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/fs/windows/windows-fs-factory.h
===================================================================
--- scummvm/trunk/backends/fs/windows/windows-fs-factory.h 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/fs/windows/windows-fs-factory.h 2008-02-23 19:01:12 UTC (rev 30935)
@@ -26,14 +26,14 @@
#define WINDOWS_FILESYSTEM_FACTORY_H
#include "common/singleton.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
/**
* Creates WindowsFilesystemNode objects.
*
- * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
+ * Parts of this class are documented in the base interface class, FilesystemFactory.
*/
-class WindowsFilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<WindowsFilesystemFactory> {
+class WindowsFilesystemFactory : public FilesystemFactory, public Common::Singleton<WindowsFilesystemFactory> {
public:
typedef Common::String String;
Modified: scummvm/trunk/backends/module.mk
===================================================================
--- scummvm/trunk/backends/module.mk 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/backends/module.mk 2008-02-23 19:01:12 UTC (rev 30935)
@@ -2,7 +2,7 @@
MODULE_OBJS := \
events/default/default-events.o \
- fs/abstract-fs-factory.o \
+ fs/fs-factory.o \
midi/alsa.o \
midi/camd.o \
midi/coreaudio.o \
Modified: scummvm/trunk/common/fs.cpp
===================================================================
--- scummvm/trunk/common/fs.cpp 2008-02-23 18:57:49 UTC (rev 30934)
+++ scummvm/trunk/common/fs.cpp 2008-02-23 19:01:12 UTC (rev 30935)
@@ -24,7 +24,7 @@
#include "common/util.h"
#include "backends/fs/abstract-fs.h"
-#include "backends/fs/abstract-fs-factory.h"
+#include "backends/fs/fs-factory.h"
FilesystemNode::FilesystemNode() {
_realNode = 0;
@@ -44,7 +44,7 @@
}
FilesystemNode::FilesystemNode(const Common::String &p) {
- AbstractFilesystemFactory *factory = AbstractFilesystemFactory::makeFSFactory();
+ FilesystemFactory *factory = FilesystemFactory::makeFSFactory();
if (p.empty() || p == ".")
_realNode = factory->makeCurrentDirectoryFileNode();
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