diff options
| author | Max Horn | 2008-08-22 11:49:34 +0000 |
|---|---|---|
| committer | Max Horn | 2008-08-22 11:49:34 +0000 |
| commit | 16e02f051d88c04c4a3eb7fbe319bb6b338d79ae (patch) | |
| tree | a426233615e9b2a741d443f6ad466fa06a5087fe /backends/fs | |
| parent | 79751b07aef33512e2ded0867bbca0c50723f314 (diff) | |
| download | scummvm-rg350-16e02f051d88c04c4a3eb7fbe319bb6b338d79ae.tar.gz scummvm-rg350-16e02f051d88c04c4a3eb7fbe319bb6b338d79ae.tar.bz2 scummvm-rg350-16e02f051d88c04c4a3eb7fbe319bb6b338d79ae.zip | |
Turned SymbianFilesystemFactory from a singleton into a normal class; adapted symbian backend accordingly
svn-id: r34101
Diffstat (limited to 'backends/fs')
| -rw-r--r-- | backends/fs/symbian/symbian-fs-factory.cpp | 4 | ||||
| -rw-r--r-- | backends/fs/symbian/symbian-fs-factory.h | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/backends/fs/symbian/symbian-fs-factory.cpp b/backends/fs/symbian/symbian-fs-factory.cpp index 0a1bd62134..c31dfb594a 100644 --- a/backends/fs/symbian/symbian-fs-factory.cpp +++ b/backends/fs/symbian/symbian-fs-factory.cpp @@ -26,8 +26,6 @@ #include "backends/fs/symbian/symbian-fs-factory.h" #include "backends/fs/symbian/symbian-fs.cpp" -DECLARE_SINGLETON(SymbianFilesystemFactory); - AbstractFilesystemNode *SymbianFilesystemFactory::makeRootFileNode() const { return new SymbianFilesystemNode(true); } @@ -38,7 +36,7 @@ AbstractFilesystemNode *SymbianFilesystemFactory::makeCurrentDirectoryFileNode() return new SymbianFilesystemNode(path); } -AbstractFilesystemNode *SymbianFilesystemFactory::makeFileNodePath(const String &path) const { +AbstractFilesystemNode *SymbianFilesystemFactory::makeFileNodePath(const Common::String &path) const { return new SymbianFilesystemNode(path); } #endif diff --git a/backends/fs/symbian/symbian-fs-factory.h b/backends/fs/symbian/symbian-fs-factory.h index 502fba2930..ef5a231e72 100644 --- a/backends/fs/symbian/symbian-fs-factory.h +++ b/backends/fs/symbian/symbian-fs-factory.h @@ -25,7 +25,6 @@ #ifndef SYMBIAN_FILESYSTEM_FACTORY_H #define SYMBIAN_FILESYSTEM_FACTORY_H -#include "common/singleton.h" #include "backends/fs/fs-factory.h" /** @@ -33,19 +32,11 @@ * * Parts of this class are documented in the base interface class, FilesystemFactory. */ -class SymbianFilesystemFactory : public FilesystemFactory, public Common::Singleton<SymbianFilesystemFactory> { +class SymbianFilesystemFactory : public FilesystemFactory { public: - typedef Common::String String; - virtual AbstractFilesystemNode *makeRootFileNode() const; virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const; - virtual AbstractFilesystemNode *makeFileNodePath(const String &path) const; - -protected: - SymbianFilesystemFactory() {}; - -private: - friend class Common::Singleton<SingletonBaseType>; + virtual AbstractFilesystemNode *makeFileNodePath(const Common::String &path) const; }; #endif /*SYMBIAN_FILESYSTEM_FACTORY_H*/ |