WINTERMUTE: WinterMute -> Wintermute

13 files changed, 30 insertions, 30 deletions

diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index 93533b4057..2f7450a999 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -37,7 +37,7 @@
 #include "common/tokenizer.h"

 #include "common/config-manager.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 void correctSlashes(char *fileName) {

 	for (size_t i = 0; i < strlen(fileName); i++) {

@@ -196,4 +196,4 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 	return NULL;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/base/file/base_disk_file.h b/engines/wintermute/base/file/base_disk_file.h
index 99a9e8b9a3..8be06199de 100644
--- a/engines/wintermute/base/file/base_disk_file.h
+++ b/engines/wintermute/base/file/base_disk_file.h
@@ -31,11 +31,11 @@
 

 #include "common/stream.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 Common::SeekableReadStream *openDiskFile(const Common::String &filename);

 bool diskFileExists(const Common::String &filename);

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/base/file/base_file.cpp b/engines/wintermute/base/file/base_file.cpp
index 185a21ad57..f2a347ee0f 100644
--- a/engines/wintermute/base/file/base_file.cpp
+++ b/engines/wintermute/base/file/base_file.cpp
@@ -29,7 +29,7 @@
 #include "engines/wintermute/base/file/base_file.h"

 #include "common/memstream.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 //////////////////////////////////////////////////////////////////////

 // Construction/Destruction

@@ -65,4 +65,4 @@ Common::SeekableReadStream *BaseFile::getMemStream() {
 }

 

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/base/file/base_file.h b/engines/wintermute/base/file/base_file.h
index 0c1ab2a045..f9947fe64f 100644
--- a/engines/wintermute/base/file/base_file.h
+++ b/engines/wintermute/base/file/base_file.h
@@ -38,7 +38,7 @@ namespace Common {
 class SeekableReadStream;

 }

 

-namespace WinterMute {

+namespace Wintermute {

 

 class BaseFile {

 protected:

@@ -62,6 +62,6 @@ public:
 	virtual Common::SeekableReadStream *getMemStream();

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/base/file/base_file_entry.cpp b/engines/wintermute/base/file/base_file_entry.cpp
index a08d55db43..82ddf7c90e 100644
--- a/engines/wintermute/base/file/base_file_entry.cpp
+++ b/engines/wintermute/base/file/base_file_entry.cpp
@@ -32,7 +32,7 @@
 #include "common/substream.h"

 #include "common/zlib.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 Common::SeekableReadStream *BaseFileEntry::createReadStream() const {

 	Common::SeekableReadStream *file = _package->getFilePointer();

@@ -70,4 +70,4 @@ BaseFileEntry::~BaseFileEntry() {
 	_package = NULL; // ref only

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/base/file/base_file_entry.h b/engines/wintermute/base/file/base_file_entry.h
index b94a6cd9fc..7e71a486ef 100644
--- a/engines/wintermute/base/file/base_file_entry.h
+++ b/engines/wintermute/base/file/base_file_entry.h
@@ -33,7 +33,7 @@
 #include "common/str.h"

 #include "common/stream.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class BasePackage;

 

@@ -55,6 +55,6 @@ public:
 

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index ab74810d1d..a9fb7f9a68 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -34,7 +34,7 @@
 #include "common/stream.h"

 #include "common/debug.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 BasePackage::BasePackage() {

 	_name = "";

@@ -123,13 +123,13 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 	TPackageHeader hdr;

 	hdr.readFromStream(stream);

 	if (hdr._magic1 != PACKAGE_MAGIC_1 || hdr._magic2 != PACKAGE_MAGIC_2 || hdr._packageVersion > PACKAGE_VERSION) {

-		debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "  Invalid header in package file '%s'. Ignoring.", filename.c_str());

+		debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "  Invalid header in package file '%s'. Ignoring.", filename.c_str());

 		delete stream;

 		return;

 	}

 

 	if (hdr._packageVersion != PACKAGE_VERSION) {

-		debugC(kWinterMuteDebugFileAccess | kWinterMuteDebugLog, "  Warning: package file '%s' is outdated.", filename.c_str());

+		debugC(kWintermuteDebugFileAccess | kWintermuteDebugLog, "  Warning: package file '%s' is outdated.", filename.c_str());

 	}

 	_priority = hdr._priority;

 	// new in v2

@@ -181,7 +181,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 					((byte *)name)[k] ^= 'D';

 				}

 			}

-			debugC(kWinterMuteDebugFileAccess, "Package contains %s", name);

+			debugC(kWintermuteDebugFileAccess, "Package contains %s", name);

 

 			Common::String upcName = name;

 			upcName.toUppercase();

@@ -222,7 +222,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 			}

 		}

 	}

-	debugC(kWinterMuteDebugFileAccess, "  Registered %d files in %d package(s)", _files.size(), _packages.size());

+	debugC(kWintermuteDebugFileAccess, "  Registered %d files in %d package(s)", _files.size(), _packages.size());

 

 	delete stream;

 }

@@ -273,4 +273,4 @@ Common::SeekableReadStream *PackageSet::createReadStreamForMember(const Common::
 	return NULL;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/base/file/base_package.h b/engines/wintermute/base/file/base_package.h
index a562229f65..676675b041 100644
--- a/engines/wintermute/base/file/base_package.h
+++ b/engines/wintermute/base/file/base_package.h
@@ -33,7 +33,7 @@
 #include "common/stream.h"

 #include "common/fs.h"

 

-namespace WinterMute {

+namespace Wintermute {

 class BasePackage {

 public:

 	Common::SeekableReadStream *getFilePointer();

@@ -85,6 +85,6 @@ private:
 	Common::HashMap<Common::String, Common::ArchiveMemberPtr>::iterator _filesIter;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/base/file/base_resources.cpp b/engines/wintermute/base/file/base_resources.cpp
index aac5436071..a8bda164dc 100644
--- a/engines/wintermute/base/file/base_resources.cpp
+++ b/engines/wintermute/base/file/base_resources.cpp
@@ -30,7 +30,7 @@
 #include "common/str.h"

 #include "common/memstream.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 unsigned char invalid[] = {

 	0x42, 0x4d, 0x36, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x04, 0x00, 0x00, 0x28, 0x00,

@@ -2827,4 +2827,4 @@ bool BaseResources::hasFile(const Common::String &filename) {
 	return false;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/base/file/base_resources.h b/engines/wintermute/base/file/base_resources.h
index 2ccab6996f..596ac64dd7 100644
--- a/engines/wintermute/base/file/base_resources.h
+++ b/engines/wintermute/base/file/base_resources.h
@@ -32,7 +32,7 @@
 #include "common/stream.h"

 #include "common/str.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 class BaseResources {

 public:

@@ -40,6 +40,6 @@ public:
 	static bool hasFile(const Common::String &filename);

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/base/file/base_save_thumb_file.cpp b/engines/wintermute/base/file/base_save_thumb_file.cpp
index 1f7288a6ff..515d8870d7 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.cpp
+++ b/engines/wintermute/base/file/base_save_thumb_file.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/base/file/base_save_thumb_file.h"

 #include "engines/wintermute/platform_osystem.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 //////////////////////////////////////////////////////////////////////

 // Construction/Destruction

@@ -151,4 +151,4 @@ bool BaseSaveThumbFile::seek(uint32 pos, int whence) {
 	return STATUS_OK;

 }

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

diff --git a/engines/wintermute/base/file/base_save_thumb_file.h b/engines/wintermute/base/file/base_save_thumb_file.h
index d95958d95f..e68dc06904 100644
--- a/engines/wintermute/base/file/base_save_thumb_file.h
+++ b/engines/wintermute/base/file/base_save_thumb_file.h
@@ -32,7 +32,7 @@
 

 #include "engines/wintermute/base/file/base_file.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 //TODO: Get rid of this

 class BaseSaveThumbFile : public BaseFile {

@@ -47,6 +47,6 @@ private:
 	byte *_data;

 };

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif

diff --git a/engines/wintermute/base/file/dcpackage.h b/engines/wintermute/base/file/dcpackage.h
index ccebc5909c..42c0b75e55 100644
--- a/engines/wintermute/base/file/dcpackage.h
+++ b/engines/wintermute/base/file/dcpackage.h
@@ -37,7 +37,7 @@
 

 #include "common/stream.h"

 

-namespace WinterMute {

+namespace Wintermute {

 

 struct TPackageHeader {

 	uint32 _magic1;

@@ -75,6 +75,6 @@ v2:    uint32 TimeDate1
 

 */

 

-} // end of namespace WinterMute

+} // end of namespace Wintermute

 

 #endif // _DCPACKAGE_H_