From a2bf9c78f8e28bcfd3659035f3b72e1855dd162f Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Wed, 4 Jul 2012 22:02:42 +0200
Subject: WINTERMUTE: Rename VarName->varName in the File-classes.

---
 engines/wintermute/Base/file/BDiskFile.cpp    | 22 +++++++++++-----------
 engines/wintermute/Base/file/BDiskFile.h      |  2 +-
 engines/wintermute/Base/file/BPkgFile.cpp     |  4 ++--
 engines/wintermute/Base/file/BPkgFile.h       |  2 +-
 engines/wintermute/Base/file/BSaveThumbFile.h |  6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'engines/wintermute')

diff --git a/engines/wintermute/Base/file/BDiskFile.cpp b/engines/wintermute/Base/file/BDiskFile.cpp
index c26b3f02c6..f2706bbfb5 100644
--- a/engines/wintermute/Base/file/BDiskFile.cpp
+++ b/engines/wintermute/Base/file/BDiskFile.cpp
@@ -45,16 +45,16 @@ void correctSlashes(char *fileName) {
 	}
 }
 
-Common::SeekableReadStream *openDiskFile(const Common::String &Filename, CBFileManager *fileManager) {
-	char FullPath[MAX_PATH];
+Common::SeekableReadStream *openDiskFile(const Common::String &filename, CBFileManager *fileManager) {
+	char fullPath[MAX_PATH];
 	uint32 prefixSize = 0;
 	Common::SeekableReadStream *file = NULL;
 
 	for (int i = 0; i < fileManager->_singlePaths.GetSize(); i++) {
-		sprintf(FullPath, "%s%s", fileManager->_singlePaths[i], Filename.c_str());
-		correctSlashes(FullPath);
+		sprintf(fullPath, "%s%s", fileManager->_singlePaths[i], filename.c_str());
+		correctSlashes(fullPath);
 		Common::File *tempFile = new Common::File();
-		if (tempFile->open(FullPath)) {
+		if (tempFile->open(fullPath)) {
 			file = tempFile;
 		} else {
 			delete tempFile;
@@ -63,11 +63,11 @@ Common::SeekableReadStream *openDiskFile(const Common::String &Filename, CBFileM
 
 	// if we didn't find it in search paths, try to open directly
 	if (!file) {
-		strcpy(FullPath, Filename.c_str());
-		correctSlashes(FullPath);
+		strcpy(fullPath, filename.c_str());
+		correctSlashes(fullPath);
 
 		Common::File *tempFile = new Common::File();
-		if (tempFile->open(FullPath)) {
+		if (tempFile->open(fullPath)) {
 			file = tempFile;
 		} else {
 			delete tempFile;
@@ -90,14 +90,14 @@ Common::SeekableReadStream *openDiskFile(const Common::String &Filename, CBFileM
 
 			byte *CompBuffer = new byte[CompSize];
 			if (!CompBuffer) {
-				error("Error allocating memory for compressed file '%s'", Filename.c_str());
+				error("Error allocating memory for compressed file '%s'", filename.c_str());
 				delete file;
 				return NULL;
 			}
 
 			byte *data = new byte[UncompSize];
 			if (!data) {
-				error("Error allocating buffer for file '%s'", Filename.c_str());
+				error("Error allocating buffer for file '%s'", filename.c_str());
 				delete [] CompBuffer;
 				delete file;
 				return NULL;
@@ -106,7 +106,7 @@ Common::SeekableReadStream *openDiskFile(const Common::String &Filename, CBFileM
 			file->read(CompBuffer, CompSize);
 
 			if (Common::uncompress(data, (unsigned long *)&UncompSize, CompBuffer, CompSize) != true) {
-				error("Error uncompressing file '%s'", Filename.c_str());
+				error("Error uncompressing file '%s'", filename.c_str());
 				delete [] CompBuffer;
 				delete file;
 				return NULL;
diff --git a/engines/wintermute/Base/file/BDiskFile.h b/engines/wintermute/Base/file/BDiskFile.h
index ebe1400128..23e1a0a315 100644
--- a/engines/wintermute/Base/file/BDiskFile.h
+++ b/engines/wintermute/Base/file/BDiskFile.h
@@ -35,7 +35,7 @@ class SeekableReadStream;
 
 namespace WinterMute {
 
-Common::SeekableReadStream *openDiskFile(const Common::String &Filename, CBFileManager *fileManager);
+Common::SeekableReadStream *openDiskFile(const Common::String &filename, CBFileManager *fileManager);
 
 } // end of namespace WinterMute
 
diff --git a/engines/wintermute/Base/file/BPkgFile.cpp b/engines/wintermute/Base/file/BPkgFile.cpp
index a7f634be25..2ca74c1ac7 100644
--- a/engines/wintermute/Base/file/BPkgFile.cpp
+++ b/engines/wintermute/Base/file/BPkgFile.cpp
@@ -65,11 +65,11 @@ public:
 	}
 };
 
-Common::SeekableReadStream *openPkgFile(const Common::String &Filename, CBFileManager *fileManager) {
+Common::SeekableReadStream *openPkgFile(const Common::String &filename, CBFileManager *fileManager) {
 	CBFileEntry *fileEntry;
 	Common::SeekableReadStream *file = NULL;
 	char fileName[MAX_PATH];
-	strcpy(fileName, Filename.c_str());
+	strcpy(fileName, filename.c_str());
 
 	// correct slashes
 	for (uint32 i = 0; i < strlen(fileName); i++) {
diff --git a/engines/wintermute/Base/file/BPkgFile.h b/engines/wintermute/Base/file/BPkgFile.h
index e2d90e2b50..0d1916594a 100644
--- a/engines/wintermute/Base/file/BPkgFile.h
+++ b/engines/wintermute/Base/file/BPkgFile.h
@@ -39,7 +39,7 @@ class File;
 namespace WinterMute {
 
 class CBFileManager;
-Common::SeekableReadStream *openPkgFile(const Common::String &Filename, CBFileManager *fileManager);
+Common::SeekableReadStream *openPkgFile(const Common::String &filename, CBFileManager *fileManager);
 
 } // end of namespace WinterMute
 
diff --git a/engines/wintermute/Base/file/BSaveThumbFile.h b/engines/wintermute/Base/file/BSaveThumbFile.h
index 280a5a1447..8be98c1cc8 100644
--- a/engines/wintermute/Base/file/BSaveThumbFile.h
+++ b/engines/wintermute/Base/file/BSaveThumbFile.h
@@ -39,10 +39,10 @@ class CBSaveThumbFile : public CBFile {
 public:
 	CBSaveThumbFile(CBGame *Game);
 	virtual ~CBSaveThumbFile();
-	virtual HRESULT seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN);
-	virtual HRESULT read(void *Buffer, uint32 Size);
+	virtual HRESULT seek(uint32 pos, TSeek origin = SEEK_TO_BEGIN);
+	virtual HRESULT read(void *buffer, uint32 size);
 	virtual HRESULT close();
-	virtual HRESULT open(const Common::String &Filename);
+	virtual HRESULT open(const Common::String &filename);
 private:
 	byte *_data;
 };
-- 
cgit v1.2.3