diff options
author | Einar Johan Trøan Sømåen | 2012-08-13 03:42:30 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-08-13 03:42:30 +0200 |
commit | fed19cb66ae5b56dd7dc81b90edd5a0d15986678 (patch) | |
tree | d1c3a237aa6b421aedea2cb3bab88b8689dea4a1 /engines/wintermute/utils | |
parent | ddfa227b939d922f738f932997b70110453068cf (diff) | |
download | scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.gz scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.bz2 scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.zip |
WINTERMUTE: WinterMute -> Wintermute
Diffstat (limited to 'engines/wintermute/utils')
-rw-r--r-- | engines/wintermute/utils/crc.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/utils/crc.h | 4 | ||||
-rw-r--r-- | engines/wintermute/utils/path_util.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/utils/path_util.h | 4 | ||||
-rw-r--r-- | engines/wintermute/utils/string_util.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/utils/string_util.h | 4 | ||||
-rw-r--r-- | engines/wintermute/utils/utils.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/utils/utils.h | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/engines/wintermute/utils/crc.cpp b/engines/wintermute/utils/crc.cpp index c127d08417..8f608600f3 100644 --- a/engines/wintermute/utils/crc.cpp +++ b/engines/wintermute/utils/crc.cpp @@ -17,7 +17,7 @@ #include "engines/wintermute/utils/crc.h"
-namespace WinterMute {
+namespace Wintermute {
/*
* Derive parameters from the standard-specific parameters in crc.h.
@@ -234,4 +234,4 @@ crc crc_finalize(crc remainder) { return (REFLECT_REMAINDER(remainder) ^ FINAL_XOR_VALUE);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/crc.h b/engines/wintermute/utils/crc.h index 363340531d..9b9446ce57 100644 --- a/engines/wintermute/utils/crc.h +++ b/engines/wintermute/utils/crc.h @@ -18,7 +18,7 @@ #include "common/system.h" // For types.
-namespace WinterMute {
+namespace Wintermute {
#ifndef TRUE
#define FALSE 0
@@ -80,6 +80,6 @@ extern "C" crc crc_initialize(void); extern "C" crc crc_process_byte(unsigned char byteVal, crc remainder);
extern "C" crc crc_finalize(crc remainder);
-} // End of namespace WinterMute
+} // End of namespace Wintermute
#endif /* _crc_h */
diff --git a/engines/wintermute/utils/path_util.cpp b/engines/wintermute/utils/path_util.cpp index dcf35be776..55bf776848 100644 --- a/engines/wintermute/utils/path_util.cpp +++ b/engines/wintermute/utils/path_util.cpp @@ -29,7 +29,7 @@ #include "common/file.h"
#include "engines/wintermute/utils/path_util.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
AnsiString PathUtil::unifySeparators(const AnsiString &path) {
@@ -98,4 +98,4 @@ AnsiString PathUtil::getExtension(const AnsiString &path) { return Common::lastPathComponent(path, '.');
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/path_util.h b/engines/wintermute/utils/path_util.h index f63c15dcd1..ed8f3e91e8 100644 --- a/engines/wintermute/utils/path_util.h +++ b/engines/wintermute/utils/path_util.h @@ -31,7 +31,7 @@ #include "engines/wintermute/dctypes.h"
-namespace WinterMute {
+namespace Wintermute {
class PathUtil {
public:
@@ -44,6 +44,6 @@ public: static AnsiString getExtension(const AnsiString &path);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_PATHUTILS_H
diff --git a/engines/wintermute/utils/string_util.cpp b/engines/wintermute/utils/string_util.cpp index ed1d2094d2..63793f7d0b 100644 --- a/engines/wintermute/utils/string_util.cpp +++ b/engines/wintermute/utils/string_util.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/utils/string_util.h"
#include "engines/wintermute/utils/convert_utf.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////////
bool StringUtil::compareNoCase(const AnsiString &str1, const AnsiString &str2) {
@@ -229,4 +229,4 @@ AnsiString StringUtil::toString(int val) { }
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/string_util.h b/engines/wintermute/utils/string_util.h index 582007917d..581ffc2ed4 100644 --- a/engines/wintermute/utils/string_util.h +++ b/engines/wintermute/utils/string_util.h @@ -31,7 +31,7 @@ #include "engines/wintermute/dctypes.h"
-namespace WinterMute {
+namespace Wintermute {
class StringUtil {
public:
@@ -51,6 +51,6 @@ public: static AnsiString toString(int val);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif // WINTERMUTE_STRINGUTIL_H
diff --git a/engines/wintermute/utils/utils.cpp b/engines/wintermute/utils/utils.cpp index 4546750c61..f26d60b7cf 100644 --- a/engines/wintermute/utils/utils.cpp +++ b/engines/wintermute/utils/utils.cpp @@ -30,7 +30,7 @@ #include "engines/wintermute/wintermute.h"
#include "engines/wintermute/base/base_engine.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
static inline unsigned Sqr(int x) {
@@ -258,4 +258,4 @@ float BaseUtils::Hue2RGB(float v1, float v2, float vH) { return (v1);
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h index 36a7398869..af69bd4523 100644 --- a/engines/wintermute/utils/utils.h +++ b/engines/wintermute/utils/utils.h @@ -32,7 +32,7 @@ #include "engines/wintermute/wintypes.h"
#include "engines/wintermute/math/rect32.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseGame;
@@ -59,6 +59,6 @@ private: static float Hue2RGB(float v1, float v2, float vH);
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
|