diff options
| author | Eugene Sandulenko | 2010-08-06 13:13:25 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:35:55 +0000 |
| commit | 47904bc7b2992189bb554833f00a79ff0fea9fb8 (patch) | |
| tree | 1cec51758c6741b970bd064fafee77607b9f884f /engines/sword25/kernel/callbackregistry.h | |
| parent | ca17def625154e5f758b797e4fc48c76b0566320 (diff) | |
| download | scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.gz scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.tar.bz2 scummvm-rg350-47904bc7b2992189bb554833f00a79ff0fea9fb8.zip | |
SWORD25: Mass-astyle.
svn-id: r53222
Diffstat (limited to 'engines/sword25/kernel/callbackregistry.h')
| -rw-r--r-- | engines/sword25/kernel/callbackregistry.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/engines/sword25/kernel/callbackregistry.h b/engines/sword25/kernel/callbackregistry.h index 72b8135e47..a4ebd03dba 100644 --- a/engines/sword25/kernel/callbackregistry.h +++ b/engines/sword25/kernel/callbackregistry.h @@ -23,7 +23,7 @@ * */ -/* +/* * This code is based on Broken Sword 2.5 engine * * Copyright (c) Malte Thiesen, Daniel Queteschiner and Michael Elsdoerfer @@ -52,28 +52,30 @@ namespace Sword25 { // Klassendeklaration // ----------------------------------------------------------------------------- -typedef void (*CallbackPtr)(int Command); +typedef void (*CallbackPtr)(int Command); class BS_CallbackRegistry { public: - static BS_CallbackRegistry & GetInstance() { + static BS_CallbackRegistry &GetInstance() { static BS_CallbackRegistry Instance; return Instance; } - bool RegisterCallbackFunction(const Common::String &Name, CallbackPtr Ptr); - CallbackPtr ResolveCallbackFunction(const Common::String &Name) const; - Common::String ResolveCallbackPointer(CallbackPtr Ptr) const; + bool RegisterCallbackFunction(const Common::String &Name, CallbackPtr Ptr); + CallbackPtr ResolveCallbackFunction(const Common::String &Name) const; + Common::String ResolveCallbackPointer(CallbackPtr Ptr) const; private: typedef Common::HashMap<Common::String, CallbackPtr, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> NameToPtrMap; NameToPtrMap m_NameToPtrMap; struct CallbackPtr_EqualTo { - bool operator()(CallbackPtr x, CallbackPtr y) const { return x == y; } + bool operator()(CallbackPtr x, CallbackPtr y) const { + return x == y; + } }; struct CallbackPtr_Hash { - uint operator()(CallbackPtr x) const { + uint operator()(CallbackPtr x) const { return static_cast<uint>((int64)x % ((int64)1 << sizeof(uint))); } }; @@ -81,9 +83,9 @@ private: typedef Common::HashMap<CallbackPtr, Common::String, CallbackPtr_Hash, CallbackPtr_EqualTo> PtrToNameMap; PtrToNameMap m_PtrToNameMap; - CallbackPtr FindPtrByName(const Common::String &Name) const; - Common::String FindNameByPtr(CallbackPtr Ptr) const; - void StoreCallbackFunction(const Common::String &Name, CallbackPtr Ptr); + CallbackPtr FindPtrByName(const Common::String &Name) const; + Common::String FindNameByPtr(CallbackPtr Ptr) const; + void StoreCallbackFunction(const Common::String &Name, CallbackPtr Ptr); }; } // End of namespace Sword25 |