diff options
author | Max Horn | 2010-10-13 15:41:34 +0000 |
---|---|---|
committer | Max Horn | 2010-10-13 15:41:34 +0000 |
commit | 9b4d41d2d2a165a95b3b9223f53196fe51c0b14f (patch) | |
tree | 155156c08186657d76bdd9235b60fdafc3633960 /engines/sword25/gfx/renderobjectregistry.h | |
parent | 8f4f0d16fc4e5cd4803203f2aaeb0ddc99e57204 (diff) | |
download | scummvm-rg350-9b4d41d2d2a165a95b3b9223f53196fe51c0b14f.tar.gz scummvm-rg350-9b4d41d2d2a165a95b3b9223f53196fe51c0b14f.tar.bz2 scummvm-rg350-9b4d41d2d2a165a95b3b9223f53196fe51c0b14f.zip |
SWORD25: Convert object registries to singletons
svn-id: r53431
Diffstat (limited to 'engines/sword25/gfx/renderobjectregistry.h')
-rw-r--r-- | engines/sword25/gfx/renderobjectregistry.h | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/engines/sword25/gfx/renderobjectregistry.h b/engines/sword25/gfx/renderobjectregistry.h index 416da27f08..ff5d8997ec 100644 --- a/engines/sword25/gfx/renderobjectregistry.h +++ b/engines/sword25/gfx/renderobjectregistry.h @@ -42,7 +42,7 @@ #include "sword25/kernel/common.h" #include "sword25/kernel/objectregistry.h" -#include "common/ptr.h" +#include "common/singleton.h" namespace Sword25 { @@ -56,21 +56,12 @@ class RenderObject; // Klassendeklaration // ----------------------------------------------------------------------------- -class RenderObjectRegistry : public ObjectRegistry<RenderObject> { -public: - static RenderObjectRegistry &instance() { - if (!_instancePtr.get()) - _instancePtr.reset(new RenderObjectRegistry); - return *_instancePtr.get(); - } - - virtual ~RenderObjectRegistry() {} - +class RenderObjectRegistry : + public ObjectRegistry<RenderObject>, + public Common::Singleton<RenderObjectRegistry> { private: virtual void logErrorLn(const char *message) const; virtual void logWarningLn(const char *message) const; - - static Common::ScopedPtr<RenderObjectRegistry> _instancePtr; }; } // End of namespace Sword25 |