diff options
-rw-r--r-- | backends/fs/amigaos4/amigaos4-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/dc/ronincd-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/ds/ds-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/fs-factory.cpp (renamed from backends/fs/abstract-fs-factory.cpp) | 6 | ||||
-rw-r--r-- | backends/fs/fs-factory.h (renamed from backends/fs/abstract-fs-factory.h) | 18 | ||||
-rw-r--r-- | backends/fs/gp32/gp32-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/morphos/abox-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/palmos/palmos-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/posix/posix-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/ps2/ps2-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/psp/psp-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/symbian/symbian-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/fs/windows/windows-fs-factory.h | 6 | ||||
-rw-r--r-- | backends/module.mk | 2 | ||||
-rw-r--r-- | common/fs.cpp | 4 |
15 files changed, 47 insertions, 49 deletions
diff --git a/backends/fs/amigaos4/amigaos4-fs-factory.h b/backends/fs/amigaos4/amigaos4-fs-factory.h index 262b3ed233..58a7dcd372 100644 --- a/backends/fs/amigaos4/amigaos4-fs-factory.h +++ b/backends/fs/amigaos4/amigaos4-fs-factory.h @@ -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; diff --git a/backends/fs/dc/ronincd-fs-factory.h b/backends/fs/dc/ronincd-fs-factory.h index e49c2c04fa..532a6d3333 100644 --- a/backends/fs/dc/ronincd-fs-factory.h +++ b/backends/fs/dc/ronincd-fs-factory.h @@ -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; diff --git a/backends/fs/ds/ds-fs-factory.h b/backends/fs/ds/ds-fs-factory.h index 292a2baa69..bff21a309d 100644 --- a/backends/fs/ds/ds-fs-factory.h +++ b/backends/fs/ds/ds-fs-factory.h @@ -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; diff --git a/backends/fs/abstract-fs-factory.cpp b/backends/fs/fs-factory.cpp index 8cf936f5bc..035e4bf2f8 100644 --- a/backends/fs/abstract-fs-factory.cpp +++ b/backends/fs/fs-factory.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "backends/fs/abstract-fs-factory.h" +#include "backends/fs/fs-factory.h" /* * All the following includes choose, at compile time, which specific backend will be used @@ -58,9 +58,9 @@ /** * Creates concrete FilesystemFactory objects depending on the current architecture. * - * @return AbstractFilesystemFactory* The specific factory for the current architecture. + * @return FilesystemFactory* The specific factory for the current architecture. */ -AbstractFilesystemFactory *AbstractFilesystemFactory::makeFSFactory() { +FilesystemFactory *FilesystemFactory::makeFSFactory() { #if defined(__amigaos4__) return &AmigaOSFilesystemFactory::instance(); #elif defined(__DC__) diff --git a/backends/fs/abstract-fs-factory.h b/backends/fs/fs-factory.h index c4ce277505..bd208a7beb 100644 --- a/backends/fs/abstract-fs-factory.h +++ b/backends/fs/fs-factory.h @@ -22,8 +22,8 @@ * $Id$ */ -#ifndef ABSTRACT_FILESYSTEM_FACTORY_H -#define ABSTRACT_FILESYSTEM_FACTORY_H +#ifndef FILESYSTEM_FACTORY_H +#define FILESYSTEM_FACTORY_H #include "common/str.h" #include "backends/fs/abstract-fs.h" @@ -31,14 +31,12 @@ /** * Creates concrete FilesystemNode objects depending on the current architecture. */ -class AbstractFilesystemFactory { +class FilesystemFactory { public: - typedef Common::String String; - /** * Destructor. */ - virtual ~AbstractFilesystemFactory() {} + virtual ~FilesystemFactory() {} /** * Returns a node representing the "current directory". @@ -58,7 +56,7 @@ public: * * @param path The path string to create a FilesystemNode for. */ - virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const = 0; + virtual AbstractFilesystemNode *makeFileNodePath(const Common::String &path) const = 0; /** * Returns a special node representing the filesystem root. @@ -71,10 +69,10 @@ public: /** - * Meta-factory method which returns a concrete AbstractFilesystemFactory + * Meta-factory method which returns a concrete FilesystemFactory * instance depending on the current architecture. */ - static AbstractFilesystemFactory *makeFSFactory(); + static FilesystemFactory *makeFSFactory(); }; -#endif /*ABSTRACT_FILESYSTEM_FACTORY_H*/ +#endif /*FILESYSTEM_FACTORY_H*/ diff --git a/backends/fs/gp32/gp32-fs-factory.h b/backends/fs/gp32/gp32-fs-factory.h index 90c6bd9500..7e6cb595ca 100644 --- a/backends/fs/gp32/gp32-fs-factory.h +++ b/backends/fs/gp32/gp32-fs-factory.h @@ -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; diff --git a/backends/fs/morphos/abox-fs-factory.h b/backends/fs/morphos/abox-fs-factory.h index 1adbd1475a..0a53822447 100644 --- a/backends/fs/morphos/abox-fs-factory.h +++ b/backends/fs/morphos/abox-fs-factory.h @@ -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; diff --git a/backends/fs/palmos/palmos-fs-factory.h b/backends/fs/palmos/palmos-fs-factory.h index 9d873eeb12..3ea8b5fe47 100644 --- a/backends/fs/palmos/palmos-fs-factory.h +++ b/backends/fs/palmos/palmos-fs-factory.h @@ -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; diff --git a/backends/fs/posix/posix-fs-factory.h b/backends/fs/posix/posix-fs-factory.h index cf1204c0a3..d8eecda6ef 100644 --- a/backends/fs/posix/posix-fs-factory.h +++ b/backends/fs/posix/posix-fs-factory.h @@ -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; diff --git a/backends/fs/ps2/ps2-fs-factory.h b/backends/fs/ps2/ps2-fs-factory.h index a7a52fdca3..1b74ae25d1 100644 --- a/backends/fs/ps2/ps2-fs-factory.h +++ b/backends/fs/ps2/ps2-fs-factory.h @@ -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; diff --git a/backends/fs/psp/psp-fs-factory.h b/backends/fs/psp/psp-fs-factory.h index 143b2ce684..ffa934755f 100644 --- a/backends/fs/psp/psp-fs-factory.h +++ b/backends/fs/psp/psp-fs-factory.h @@ -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; diff --git a/backends/fs/symbian/symbian-fs-factory.h b/backends/fs/symbian/symbian-fs-factory.h index 4b663fd6b9..502fba2930 100644 --- a/backends/fs/symbian/symbian-fs-factory.h +++ b/backends/fs/symbian/symbian-fs-factory.h @@ -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; diff --git a/backends/fs/windows/windows-fs-factory.h b/backends/fs/windows/windows-fs-factory.h index 5989cbb17d..0745b286a8 100644 --- a/backends/fs/windows/windows-fs-factory.h +++ b/backends/fs/windows/windows-fs-factory.h @@ -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; diff --git a/backends/module.mk b/backends/module.mk index db5b3c2c4b..0f9baacea1 100644 --- a/backends/module.mk +++ b/backends/module.mk @@ -2,7 +2,7 @@ MODULE := backends 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 \ diff --git a/common/fs.cpp b/common/fs.cpp index 94351c7720..7d9c374b4b 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -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 FilesystemNode &node) { } FilesystemNode::FilesystemNode(const Common::String &p) { - AbstractFilesystemFactory *factory = AbstractFilesystemFactory::makeFSFactory(); + FilesystemFactory *factory = FilesystemFactory::makeFSFactory(); if (p.empty() || p == ".") _realNode = factory->makeCurrentDirectoryFileNode(); |