aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/kernel/callbackregistry.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-10-19 21:03:33 +0000
committerEugene Sandulenko2010-10-19 21:03:33 +0000
commit6629efc676ca48e958dcfa0ee4e66e6aba1c6597 (patch)
tree3e76022f90ca9590c1ec376fc436461eaeee11ef /engines/sword25/kernel/callbackregistry.cpp
parentae78107e2a8732977313e208f1d08e65d50ec8e8 (diff)
downloadscummvm-rg350-6629efc676ca48e958dcfa0ee4e66e6aba1c6597.tar.gz
scummvm-rg350-6629efc676ca48e958dcfa0ee4e66e6aba1c6597.tar.bz2
scummvm-rg350-6629efc676ca48e958dcfa0ee4e66e6aba1c6597.zip
SWORD25: Enforced code formatting rules in rest of the engine
svn-id: r53626
Diffstat (limited to 'engines/sword25/kernel/callbackregistry.cpp')
-rw-r--r--engines/sword25/kernel/callbackregistry.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/engines/sword25/kernel/callbackregistry.cpp b/engines/sword25/kernel/callbackregistry.cpp
index 32b2597334..673da0679c 100644
--- a/engines/sword25/kernel/callbackregistry.cpp
+++ b/engines/sword25/kernel/callbackregistry.cpp
@@ -44,22 +44,12 @@
// Pointer gespeichert war, stürtzt das Programm beim Äufrufen dieser Callbackfunktion ab. Durch das Auflösungverfahren wird beim Laden der
// Callbackbezeichner in den neuen Funktionspointer umgewandelt und der Aufruf kann erfolgen.
-// -----------------------------------------------------------------------------
-// Logging
-// -----------------------------------------------------------------------------
-
#define BS_LOG_PREFIX "CALLBACKREGISTRY"
-// -----------------------------------------------------------------------------
-// Includes
-// -----------------------------------------------------------------------------
-
#include "sword25/kernel/callbackregistry.h"
namespace Sword25 {
-// -----------------------------------------------------------------------------
-
bool CallbackRegistry::registerCallbackFunction(const Common::String &name, CallbackPtr ptr) {
if (name == "") {
BS_LOG_ERRORLN("The empty string is not allowed as a callback function name.");
@@ -80,8 +70,6 @@ bool CallbackRegistry::registerCallbackFunction(const Common::String &name, Call
return true;
}
-// -----------------------------------------------------------------------------
-
CallbackPtr CallbackRegistry::resolveCallbackFunction(const Common::String &name) const {
CallbackPtr result = findPtrByName(name);
@@ -92,8 +80,6 @@ CallbackPtr CallbackRegistry::resolveCallbackFunction(const Common::String &name
return result;
}
-// -----------------------------------------------------------------------------
-
Common::String CallbackRegistry::resolveCallbackPointer(CallbackPtr ptr) const {
const Common::String &result = findNameByPtr(ptr);
@@ -104,24 +90,18 @@ Common::String CallbackRegistry::resolveCallbackPointer(CallbackPtr ptr) const {
return result;
}
-// -----------------------------------------------------------------------------
-
CallbackPtr CallbackRegistry::findPtrByName(const Common::String &name) const {
// Eintrag in der Map finden und den Pointer zurückgeben.
NameToPtrMap::const_iterator it = _nameToPtrMap.find(name);
return it == _nameToPtrMap.end() ? 0 : it->_value;
}
-// -----------------------------------------------------------------------------
-
Common::String CallbackRegistry::findNameByPtr(CallbackPtr ptr) const {
// Eintrag in der Map finden und den Namen zurückgeben.
PtrToNameMap::const_iterator it = _ptrToNameMap.find(ptr);
return it == _ptrToNameMap.end() ? "" : it->_value;
}
-// -----------------------------------------------------------------------------
-
void CallbackRegistry::storeCallbackFunction(const Common::String &name, CallbackPtr ptr) {
// Callback-Funktion in beide Maps eintragen.
_nameToPtrMap[name] = ptr;