From a77ab4be6d35ac035540e94fddb3aac1ba63187d Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Mon, 9 Jul 2012 00:50:25 +0200
Subject: WINTERMUTE: Rename FuncName/VarName -> funcName/varName in SXString

---
 engines/wintermute/Base/scriptables/SXString.cpp | 34 ++++++++++++------------
 engines/wintermute/Base/scriptables/SXString.h   |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/engines/wintermute/Base/scriptables/SXString.cpp b/engines/wintermute/Base/scriptables/SXString.cpp
index f5981bb73d..60a58d3cfd 100644
--- a/engines/wintermute/Base/scriptables/SXString.cpp
+++ b/engines/wintermute/Base/scriptables/SXString.cpp
@@ -49,16 +49,16 @@ CSXString::CSXString(CBGame *inGame, CScStack *stack): CBScriptable(inGame) {
 	_capacity = 0;
 
 	stack->correctParams(1);
-	CScValue *Val = stack->pop();
+	CScValue *val = stack->pop();
 
-	if (Val->isInt()) {
-		_capacity = MAX(0, Val->getInt());
+	if (val->isInt()) {
+		_capacity = MAX(0, val->getInt());
 		if (_capacity > 0) {
 			_string = new char[_capacity];
 			memset(_string, 0, _capacity);
 		}
 	} else {
-		setStringVal(Val->getString());
+		setStringVal(val->getString());
 	}
 
 	if (_capacity == 0) setStringVal("");
@@ -245,12 +245,12 @@ HRESULT CSXString::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 	//////////////////////////////////////////////////////////////////////////
 	else if (strcmp(name, "Split") == 0) {
 		stack->correctParams(1);
-		CScValue *Val = stack->pop();
-		char Separators[MAX_PATH] = ",";
-		if (!Val->isNULL()) strcpy(Separators, Val->getString());
+		CScValue *val = stack->pop();
+		char separators[MAX_PATH] = ",";
+		if (!val->isNULL()) strcpy(separators, val->getString());
 
-		CSXArray *Array = new CSXArray(Game);
-		if (!Array) {
+		CSXArray *array = new CSXArray(Game);
+		if (!array) {
 			stack->pushNULL();
 			return S_OK;
 		}
@@ -264,9 +264,9 @@ HRESULT CSXString::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 
 		WideString delims;
 		if (Game->_textEncoding == TEXT_UTF8)
-			delims = StringUtil::utf8ToWide(Separators);
+			delims = StringUtil::utf8ToWide(separators);
 		else
-			delims = StringUtil::ansiToWide(Separators);
+			delims = StringUtil::ansiToWide(separators);
 
 		Common::Array<WideString> parts;
 
@@ -299,16 +299,16 @@ HRESULT CSXString::scCallMethod(CScScript *script, CScStack *stack, CScStack *th
 			WideString &part = (*it);
 
 			if (Game->_textEncoding == TEXT_UTF8)
-				Val = new CScValue(Game, StringUtil::wideToUtf8(part).c_str());
+				val = new CScValue(Game, StringUtil::wideToUtf8(part).c_str());
 			else
-				Val = new CScValue(Game, StringUtil::wideToAnsi(part).c_str());
+				val = new CScValue(Game, StringUtil::wideToAnsi(part).c_str());
 
-			Array->push(Val);
-			delete Val;
-			Val = NULL;
+			array->push(val);
+			delete val;
+			val = NULL;
 		}
 
-		stack->pushNative(Array, false);
+		stack->pushNative(array, false);
 		return S_OK;
 	}
 
diff --git a/engines/wintermute/Base/scriptables/SXString.h b/engines/wintermute/Base/scriptables/SXString.h
index 73969f8fdc..d7279d17cf 100644
--- a/engines/wintermute/Base/scriptables/SXString.h
+++ b/engines/wintermute/Base/scriptables/SXString.h
@@ -41,9 +41,9 @@ public:
 	CScValue *scGetProperty(const char *name);
 	HRESULT scSetProperty(const char *name, CScValue *value);
 	HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);
-	void scSetString(const char *Val);
+	void scSetString(const char *val);
 	const char *scToString();
-	void setStringVal(const char *Val);
+	void setStringVal(const char *val);
 
 	CSXString(CBGame *inGame, CScStack *Stack);
 	virtual ~CSXString();
-- 
cgit v1.2.3