aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/math/regionregistry.h
diff options
context:
space:
mode:
authorEugene Sandulenko2010-10-03 13:25:36 +0000
committerEugene Sandulenko2010-10-13 00:09:32 +0000
commit063cb5d84ca5846ac0eff9388759a9b6662e764f (patch)
tree74193513e5a4a2d8d5f415597b0267339be89de3 /engines/sword25/math/regionregistry.h
parent54ccc8f4c906cd4f84c955581c0368886a7a9c78 (diff)
downloadscummvm-rg350-063cb5d84ca5846ac0eff9388759a9b6662e764f.tar.gz
scummvm-rg350-063cb5d84ca5846ac0eff9388759a9b6662e764f.tar.bz2
scummvm-rg350-063cb5d84ca5846ac0eff9388759a9b6662e764f.zip
SWORD25: Enforced code naming conventions in math/*
svn-id: r53392
Diffstat (limited to 'engines/sword25/math/regionregistry.h')
-rw-r--r--engines/sword25/math/regionregistry.h24
1 files changed, 6 insertions, 18 deletions
diff --git a/engines/sword25/math/regionregistry.h b/engines/sword25/math/regionregistry.h
index b50b261856..bbe2fb8370 100644
--- a/engines/sword25/math/regionregistry.h
+++ b/engines/sword25/math/regionregistry.h
@@ -35,10 +35,6 @@
#ifndef SWORD25_REGIONREGISTRY_H
#define SWORD25_REGIONREGISTRY_H
-// -----------------------------------------------------------------------------
-// Includes
-// -----------------------------------------------------------------------------
-
#include "common/ptr.h"
#include "sword25/kernel/common.h"
#include "sword25/kernel/persistable.h"
@@ -46,31 +42,23 @@
namespace Sword25 {
-// -----------------------------------------------------------------------------
-// Forward Declarations
-// -----------------------------------------------------------------------------
-
class Region;
-// -----------------------------------------------------------------------------
-// Class definitions
-// -----------------------------------------------------------------------------
-
class RegionRegistry : public ObjectRegistry<Region>, public Persistable {
public:
- static RegionRegistry &GetInstance() {
- if (!m_InstancePtr.get()) m_InstancePtr = Common::SharedPtr<RegionRegistry>(new RegionRegistry());
- return *m_InstancePtr.get();
+ static RegionRegistry &getInstance() {
+ if (!_instancePtr.get()) _instancePtr = Common::SharedPtr<RegionRegistry>(new RegionRegistry());
+ return *_instancePtr.get();
}
virtual bool persist(OutputPersistenceBlock &writer);
virtual bool unpersist(InputPersistenceBlock &reader);
private:
- virtual void LogErrorLn(const char *Message) const;
- virtual void LogWarningLn(const char *Message) const;
+ virtual void logErrorLn(const char *message) const;
+ virtual void logWarningLn(const char *message) const;
- static Common::SharedPtr<RegionRegistry> m_InstancePtr;
+ static Common::SharedPtr<RegionRegistry> _instancePtr;
};
} // End of namespace Sword25