Use common/singleton.h in the concrete fs factories.

svn-id: r26814

2 files changed, 3 insertions, 17 deletions

diff --git a/backends/fs/ps2/ps2-fs-factory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp
index 726eb87c6f..5f10974501 100644
--- a/backends/fs/ps2/ps2-fs-factory.cpp
+++ b/backends/fs/ps2/ps2-fs-factory.cpp
@@ -1,14 +1,7 @@
 #include "backends/fs/ps2/ps2-fs-factory.h"
 #include "backends/fs/ps2/ps2-fs.cpp"
 
-Ps2FilesystemFactory *Ps2FilesystemFactory::_instance = 0;
-
-Ps2FilesystemFactory *Ps2FilesystemFactory::instance(){
-	if(_instance == 0){
-		_instance = new Ps2FilesystemFactory();
-	}
-	return _instance;
-}
+DECLARE_SINGLETON(Ps2FilesystemFactory);
 
 AbstractFilesystemNode *Ps2FilesystemFactory::makeRootFileNode() const {
 	return new Ps2FilesystemNode();
diff --git a/backends/fs/ps2/ps2-fs-factory.h b/backends/fs/ps2/ps2-fs-factory.h
index de7ada6ba3..2dceb5a6dc 100644
--- a/backends/fs/ps2/ps2-fs-factory.h
+++ b/backends/fs/ps2/ps2-fs-factory.h
@@ -8,16 +8,9 @@
  * 
  * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
  */
-class Ps2FilesystemFactory : public AbstractFilesystemFactory {	
+class Ps2FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<Ps2FilesystemFactory> {	
 public:
 	typedef Common::String String;
-	
-	/**
-	 * Creates an instance of Ps2FilesystemFactory using the Singleton pattern.
-	 * 
-	 * @return A unique instance of Ps2FilesytemFactory.
-	 */
-	static Ps2FilesystemFactory *instance();
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -27,7 +20,7 @@ protected:
 	Ps2FilesystemFactory() {};
 		
 private:
-	static Ps2FilesystemFactory *_instance;
+	friend class Common::Singleton<SingletonBaseType>;
 };
 
 #endif /*PS2_FILESYSTEM_FACTORY_H*/