aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/system
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/system')
-rw-r--r--engines/wintermute/system/sys_class.cpp4
-rw-r--r--engines/wintermute/system/sys_class.h10
-rw-r--r--engines/wintermute/system/sys_class_registry.cpp6
-rw-r--r--engines/wintermute/system/sys_class_registry.h10
-rw-r--r--engines/wintermute/system/sys_instance.cpp4
-rw-r--r--engines/wintermute/system/sys_instance.h4
6 files changed, 19 insertions, 19 deletions
diff --git a/engines/wintermute/system/sys_class.cpp b/engines/wintermute/system/sys_class.cpp
index ce06e8980e..bce9a04aec 100644
--- a/engines/wintermute/system/sys_class.cpp
+++ b/engines/wintermute/system/sys_class.cpp
@@ -33,7 +33,7 @@
#include "engines/wintermute/base/base_game.h"
#include "engines/wintermute/base/base_persistence_manager.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
SystemClass::SystemClass(const AnsiString &name, PERSISTBUILD build, PERSISTLOAD load, bool persistentClass) {
@@ -217,4 +217,4 @@ void SystemClass::instanceCallback(SYS_INSTANCE_CALLBACK lpCallback, void *lpDat
}
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/system/sys_class.h b/engines/wintermute/system/sys_class.h
index 36968e1cc2..28d718bb47 100644
--- a/engines/wintermute/system/sys_class.h
+++ b/engines/wintermute/system/sys_class.h
@@ -35,7 +35,7 @@
#include "common/func.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class SystemInstance;
class BaseGame;
class BasePersistenceManager;
@@ -52,8 +52,8 @@ template<> struct Hash<void *> : public UnaryFunction<void *, uint> {
}
};
-template<> struct Hash<WinterMute::SystemInstance *> : public UnaryFunction<WinterMute::SystemInstance *, uint> {
- uint operator()(WinterMute::SystemInstance *val) const {
+template<> struct Hash<Wintermute::SystemInstance *> : public UnaryFunction<Wintermute::SystemInstance *, uint> {
+ uint operator()(Wintermute::SystemInstance *val) const {
return (uint)((size_t)val);
}
};
@@ -61,7 +61,7 @@ template<> struct Hash<WinterMute::SystemInstance *> : public UnaryFunction<Wint
}
-namespace WinterMute {
+namespace Wintermute {
class SystemClass {
public:
@@ -125,6 +125,6 @@ private:
InstanceMap _instanceMap;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/system/sys_class_registry.cpp b/engines/wintermute/system/sys_class_registry.cpp
index b9e9bc8878..d836b32635 100644
--- a/engines/wintermute/system/sys_class_registry.cpp
+++ b/engines/wintermute/system/sys_class_registry.cpp
@@ -35,7 +35,7 @@
#include "engines/wintermute/wintermute.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
SystemClassRegistry::SystemClassRegistry() {
@@ -83,7 +83,7 @@ bool SystemClassRegistry::unregisterClass(SystemClass *classObj) {
}
if (classObj->getNumInstances() != 0) {
- debugC(WinterMute::kWinterMuteDebugSaveGame, "Memory leak@class %-20s: %d instance(s) left\n", classObj->getName().c_str(), classObj->getNumInstances());
+ debugC(Wintermute::kWintermuteDebugSaveGame, "Memory leak@class %-20s: %d instance(s) left\n", classObj->getName().c_str(), classObj->getNumInstances());
}
_classes.erase(it);
@@ -332,4 +332,4 @@ void SystemClassRegistry::dumpClasses(Common::WriteStream *stream) {
}
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/system/sys_class_registry.h b/engines/wintermute/system/sys_class_registry.h
index 65d4fe1f02..e612ab3e82 100644
--- a/engines/wintermute/system/sys_class_registry.h
+++ b/engines/wintermute/system/sys_class_registry.h
@@ -37,21 +37,21 @@
#include "common/func.h"
#include "common/stream.h"
-namespace WinterMute {
+namespace Wintermute {
class SystemClass;
}
namespace Common {
template<typename T> struct Hash;
-template<> struct Hash<WinterMute::SystemClass *> : public UnaryFunction<WinterMute::SystemClass *, uint> {
- uint operator()(WinterMute::SystemClass *val) const {
+template<> struct Hash<Wintermute::SystemClass *> : public UnaryFunction<Wintermute::SystemClass *, uint> {
+ uint operator()(Wintermute::SystemClass *val) const {
return (uint)((size_t)val);
}
};
}
-namespace WinterMute {
+namespace Wintermute {
class BaseGame;
class BasePersistenceManager;
@@ -101,6 +101,6 @@ public:
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/system/sys_instance.cpp b/engines/wintermute/system/sys_instance.cpp
index a5ef69647c..1323382152 100644
--- a/engines/wintermute/system/sys_instance.cpp
+++ b/engines/wintermute/system/sys_instance.cpp
@@ -30,7 +30,7 @@
#include "engines/wintermute/system/sys_class_registry.h"
#include "engines/wintermute/system/sys_class.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
SystemInstance::SystemInstance(void *instance, int id, SystemClass *sysClass) {
@@ -46,4 +46,4 @@ SystemInstance::SystemInstance(void *instance, int id, SystemClass *sysClass) {
SystemInstance::~SystemInstance() {
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/system/sys_instance.h b/engines/wintermute/system/sys_instance.h
index 90336742f8..78eb27c122 100644
--- a/engines/wintermute/system/sys_instance.h
+++ b/engines/wintermute/system/sys_instance.h
@@ -29,7 +29,7 @@
#ifndef WINTERMUTE_SYSINSTANCE_H
#define WINTERMUTE_SYSINSTANCE_H
-namespace WinterMute {
+namespace Wintermute {
class SystemClass;
@@ -63,6 +63,6 @@ private:
SystemClass *_class;
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif