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

svn-id: r26814

2 files changed, 3 insertions, 17 deletions

diff --git a/backends/fs/gp32/gp32-fs-factory.cpp b/backends/fs/gp32/gp32-fs-factory.cpp
index fc19bdf1cf..6328836c0e 100644
--- a/backends/fs/gp32/gp32-fs-factory.cpp
+++ b/backends/fs/gp32/gp32-fs-factory.cpp
@@ -1,14 +1,7 @@
 #include "backends/fs/gp32/gp32-fs-factory.h"
 #include "backends/fs/gp32/gp32-fs.cpp"
 
-GP32FilesystemFactory *GP32FilesystemFactory::_instance = 0;
-
-GP32FilesystemFactory *GP32FilesystemFactory::instance(){
-	if(_instance == 0){
-		_instance = new GP32FilesystemFactory();
-	}
-	return _instance;
-}
+DECLARE_SINGLETON(GP32FilesystemFactory);
 
 AbstractFilesystemNode *GP32FilesystemFactory::makeRootFileNode() const {
 	return new GP32FilesystemNode();
diff --git a/backends/fs/gp32/gp32-fs-factory.h b/backends/fs/gp32/gp32-fs-factory.h
index 1b34597d84..22c502d69f 100644
--- a/backends/fs/gp32/gp32-fs-factory.h
+++ b/backends/fs/gp32/gp32-fs-factory.h
@@ -8,16 +8,9 @@
  * 
  * Parts of this class are documented in the base interface class, AbstractFilesystemFactory.
  */
-class GP32FilesystemFactory : public AbstractFilesystemFactory {	
+class GP32FilesystemFactory : public AbstractFilesystemFactory, public Common::Singleton<GP32FilesystemFactory> {	
 public:
 	typedef Common::String String;
-	
-	/**
-	 * Creates an instance of GP32FilesystemFactory using the Singleton pattern.
-	 * 
-	 * @return A unique instance of GP32FilesytemFactory.
-	 */
-	static GP32FilesystemFactory *instance();
 		
 	virtual AbstractFilesystemNode *makeRootFileNode() const;
 	virtual AbstractFilesystemNode *makeCurrentDirectoryFileNode() const;
@@ -27,7 +20,7 @@ protected:
 	GP32FilesystemFactory() {};
 		
 private:
-	static GP32FilesystemFactory *_instance;
+	friend class Common::Singleton<SingletonBaseType>;
 };
 
 #endif /*GP32_FILESYSTEM_FACTORY_H*/