WINTERMUTE: Rename FuncName->funcName in BParser

6 files changed, 73 insertions, 73 deletions

diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp
index 1504796378..374317993b 100644
--- a/engines/wintermute/UI/UIButton.cpp
+++ b/engines/wintermute/UI/UIButton.cpp
@@ -200,14 +200,14 @@ HRESULT CUIButton::loadBuffer(byte *buffer, bool complete) {
 	CBParser parser(Game);

 

 	if (complete) {

-		if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_BUTTON) {

+		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_BUTTON) {

 			Game->LOG(0, "'BUTTON' keyword expected.");

 			return E_FAIL;

 		}

 		buffer = params;

 	}

 

-	while (cmd > 0 && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {

+	while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

 			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

@@ -363,19 +363,19 @@ HRESULT CUIButton::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_X:

-			parser.ScanStr((char *)params, "%d", &_posX);

+			parser.scanStr((char *)params, "%d", &_posX);

 			break;

 

 		case TOKEN_Y:

-			parser.ScanStr((char *)params, "%d", &_posY);

+			parser.scanStr((char *)params, "%d", &_posY);

 			break;

 

 		case TOKEN_WIDTH:

-			parser.ScanStr((char *)params, "%d", &_width);

+			parser.scanStr((char *)params, "%d", &_width);

 			break;

 

 		case TOKEN_HEIGHT:

-			parser.ScanStr((char *)params, "%d", &_height);

+			parser.scanStr((char *)params, "%d", &_height);

 			break;

 

 		case TOKEN_CURSOR:

@@ -393,31 +393,31 @@ HRESULT CUIButton::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_PARENT_NOTIFY:

-			parser.ScanStr((char *)params, "%b", &_parentNotify);

+			parser.scanStr((char *)params, "%b", &_parentNotify);

 			break;

 

 		case TOKEN_DISABLED:

-			parser.ScanStr((char *)params, "%b", &_disable);

+			parser.scanStr((char *)params, "%b", &_disable);

 			break;

 

 		case TOKEN_VISIBLE:

-			parser.ScanStr((char *)params, "%b", &_visible);

+			parser.scanStr((char *)params, "%b", &_visible);

 			break;

 

 		case TOKEN_FOCUSABLE:

-			parser.ScanStr((char *)params, "%b", &_canFocus);

+			parser.scanStr((char *)params, "%b", &_canFocus);

 			break;

 

 		case TOKEN_CENTER_IMAGE:

-			parser.ScanStr((char *)params, "%b", &_centerImage);

+			parser.scanStr((char *)params, "%b", &_centerImage);

 			break;

 

 		case TOKEN_PRESSED:

-			parser.ScanStr((char *)params, "%b", &_stayPressed);

+			parser.scanStr((char *)params, "%b", &_stayPressed);

 			break;

 

 		case TOKEN_PIXEL_PERFECT:

-			parser.ScanStr((char *)params, "%b", &_pixelPerfect);

+			parser.scanStr((char *)params, "%b", &_pixelPerfect);

 			break;

 

 		case TOKEN_EDITOR_PROPERTY:

diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp
index 39f8e993b2..8594deb05c 100644
--- a/engines/wintermute/UI/UIEdit.cpp
+++ b/engines/wintermute/UI/UIEdit.cpp
@@ -170,14 +170,14 @@ HRESULT CUIEdit::loadBuffer(byte *buffer, bool complete) {
 	CBParser parser(Game);

 

 	if (complete) {

-		if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_EDIT) {

+		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_EDIT) {

 			Game->LOG(0, "'EDIT' keyword expected.");

 			return E_FAIL;

 		}

 		buffer = params;

 	}

 

-	while (cmd > 0 && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {

+	while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

 			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

@@ -225,23 +225,23 @@ HRESULT CUIEdit::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_X:

-			parser.ScanStr((char *)params, "%d", &_posX);

+			parser.scanStr((char *)params, "%d", &_posX);

 			break;

 

 		case TOKEN_Y:

-			parser.ScanStr((char *)params, "%d", &_posY);

+			parser.scanStr((char *)params, "%d", &_posY);

 			break;

 

 		case TOKEN_WIDTH:

-			parser.ScanStr((char *)params, "%d", &_width);

+			parser.scanStr((char *)params, "%d", &_width);

 			break;

 

 		case TOKEN_HEIGHT:

-			parser.ScanStr((char *)params, "%d", &_height);

+			parser.scanStr((char *)params, "%d", &_height);

 			break;

 

 		case TOKEN_MAX_LENGTH:

-			parser.ScanStr((char *)params, "%d", &_maxLength);

+			parser.scanStr((char *)params, "%d", &_maxLength);

 			break;

 

 		case TOKEN_CAPTION:

@@ -259,11 +259,11 @@ HRESULT CUIEdit::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_CURSOR_BLINK_RATE:

-			parser.ScanStr((char *)params, "%d", &_cursorBlinkRate);

+			parser.scanStr((char *)params, "%d", &_cursorBlinkRate);

 			break;

 

 		case TOKEN_FRAME_WIDTH:

-			parser.ScanStr((char *)params, "%d", &_frameWidth);

+			parser.scanStr((char *)params, "%d", &_frameWidth);

 			break;

 

 		case TOKEN_SCRIPT:

@@ -271,15 +271,15 @@ HRESULT CUIEdit::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_PARENT_NOTIFY:

-			parser.ScanStr((char *)params, "%b", &_parentNotify);

+			parser.scanStr((char *)params, "%b", &_parentNotify);

 			break;

 

 		case TOKEN_DISABLED:

-			parser.ScanStr((char *)params, "%b", &_disable);

+			parser.scanStr((char *)params, "%b", &_disable);

 			break;

 

 		case TOKEN_VISIBLE:

-			parser.ScanStr((char *)params, "%b", &_visible);

+			parser.scanStr((char *)params, "%b", &_visible);

 			break;

 

 		case TOKEN_EDITOR_PROPERTY:

diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp
index e9d3662471..6c63ce4897 100644
--- a/engines/wintermute/UI/UIEntity.cpp
+++ b/engines/wintermute/UI/UIEntity.cpp
@@ -108,14 +108,14 @@ HRESULT CUIEntity::loadBuffer(byte *buffer, bool complete) {
 	CBParser parser(Game);

 

 	if (complete) {

-		if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ENTITY_CONTAINER) {

+		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_ENTITY_CONTAINER) {

 			Game->LOG(0, "'ENTITY_CONTAINER' keyword expected.");

 			return E_FAIL;

 		}

 		buffer = params;

 	}

 

-	while (cmd > 0 && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {

+	while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

 			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

@@ -126,19 +126,19 @@ HRESULT CUIEntity::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_X:

-			parser.ScanStr((char *)params, "%d", &_posX);

+			parser.scanStr((char *)params, "%d", &_posX);

 			break;

 

 		case TOKEN_Y:

-			parser.ScanStr((char *)params, "%d", &_posY);

+			parser.scanStr((char *)params, "%d", &_posY);

 			break;

 

 		case TOKEN_DISABLED:

-			parser.ScanStr((char *)params, "%b", &_disable);

+			parser.scanStr((char *)params, "%b", &_disable);

 			break;

 

 		case TOKEN_VISIBLE:

-			parser.ScanStr((char *)params, "%b", &_visible);

+			parser.scanStr((char *)params, "%b", &_visible);

 			break;

 

 		case TOKEN_ENTITY:

diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp
index 5f81a228c3..f8e35c5ada 100644
--- a/engines/wintermute/UI/UIText.cpp
+++ b/engines/wintermute/UI/UIText.cpp
@@ -167,14 +167,14 @@ HRESULT CUIText::loadBuffer(byte *buffer, bool complete) {
 	CBParser parser(Game);

 

 	if (complete) {

-		if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_STATIC) {

+		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_STATIC) {

 			Game->LOG(0, "'STATIC' keyword expected.");

 			return E_FAIL;

 		}

 		buffer = params;

 	}

 

-	while (cmd > 0 && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {

+	while (cmd > 0 && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

 			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

@@ -232,19 +232,19 @@ HRESULT CUIText::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_X:

-			parser.ScanStr((char *)params, "%d", &_posX);

+			parser.scanStr((char *)params, "%d", &_posX);

 			break;

 

 		case TOKEN_Y:

-			parser.ScanStr((char *)params, "%d", &_posY);

+			parser.scanStr((char *)params, "%d", &_posY);

 			break;

 

 		case TOKEN_WIDTH:

-			parser.ScanStr((char *)params, "%d", &_width);

+			parser.scanStr((char *)params, "%d", &_width);

 			break;

 

 		case TOKEN_HEIGHT:

-			parser.ScanStr((char *)params, "%d", &_height);

+			parser.scanStr((char *)params, "%d", &_height);

 			break;

 

 		case TOKEN_CURSOR:

@@ -262,15 +262,15 @@ HRESULT CUIText::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_PARENT_NOTIFY:

-			parser.ScanStr((char *)params, "%b", &_parentNotify);

+			parser.scanStr((char *)params, "%b", &_parentNotify);

 			break;

 

 		case TOKEN_DISABLED:

-			parser.ScanStr((char *)params, "%b", &_disable);

+			parser.scanStr((char *)params, "%b", &_disable);

 			break;

 

 		case TOKEN_VISIBLE:

-			parser.ScanStr((char *)params, "%b", &_visible);

+			parser.scanStr((char *)params, "%b", &_visible);

 			break;

 

 		case TOKEN_EDITOR_PROPERTY:

diff --git a/engines/wintermute/UI/UITiledImage.cpp b/engines/wintermute/UI/UITiledImage.cpp
index a56d3af9c1..aa599f548d 100644
--- a/engines/wintermute/UI/UITiledImage.cpp
+++ b/engines/wintermute/UI/UITiledImage.cpp
@@ -185,14 +185,14 @@ HRESULT CUITiledImage::loadBuffer(byte *buffer, bool complete) {
 	int V1 = 0, V2 = 0, V3 = 0;

 

 	if (complete) {

-		if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_TILED_IMAGE) {

+		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_TILED_IMAGE) {

 			Game->LOG(0, "'TILED_IMAGE' keyword expected.");

 			return E_FAIL;

 		}

 		buffer = params;

 	}

 

-	while ((cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) > 0) {

+	while ((cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) > 0) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

 			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

@@ -209,48 +209,48 @@ HRESULT CUITiledImage::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_UP_LEFT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_upLeft.left, &_upLeft.top, &_upLeft.right, &_upLeft.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_upLeft.left, &_upLeft.top, &_upLeft.right, &_upLeft.bottom);

 			break;

 

 		case TOKEN_UP_RIGHT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_upRight.left, &_upRight.top, &_upRight.right, &_upRight.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_upRight.left, &_upRight.top, &_upRight.right, &_upRight.bottom);

 			break;

 

 		case TOKEN_UP_MIDDLE:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_upMiddle.left, &_upMiddle.top, &_upMiddle.right, &_upMiddle.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_upMiddle.left, &_upMiddle.top, &_upMiddle.right, &_upMiddle.bottom);

 			break;

 

 		case TOKEN_DOWN_LEFT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_downLeft.left, &_downLeft.top, &_downLeft.right, &_downLeft.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_downLeft.left, &_downLeft.top, &_downLeft.right, &_downLeft.bottom);

 			break;

 

 		case TOKEN_DOWN_RIGHT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_downRight.left, &_downRight.top, &_downRight.right, &_downRight.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_downRight.left, &_downRight.top, &_downRight.right, &_downRight.bottom);

 			break;

 

 		case TOKEN_DOWN_MIDDLE:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_downMiddle.left, &_downMiddle.top, &_downMiddle.right, &_downMiddle.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_downMiddle.left, &_downMiddle.top, &_downMiddle.right, &_downMiddle.bottom);

 			break;

 

 		case TOKEN_MIDDLE_LEFT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_middleLeft.left, &_middleLeft.top, &_middleLeft.right, &_middleLeft.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_middleLeft.left, &_middleLeft.top, &_middleLeft.right, &_middleLeft.bottom);

 			break;

 

 		case TOKEN_MIDDLE_RIGHT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_middleRight.left, &_middleRight.top, &_middleRight.right, &_middleRight.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_middleRight.left, &_middleRight.top, &_middleRight.right, &_middleRight.bottom);

 			break;

 

 		case TOKEN_MIDDLE_MIDDLE:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_middleMiddle.left, &_middleMiddle.top, &_middleMiddle.right, &_middleMiddle.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_middleMiddle.left, &_middleMiddle.top, &_middleMiddle.right, &_middleMiddle.bottom);

 			break;

 

 		case TOKEN_HORIZONTAL_TILES:

-			parser.ScanStr((char *)params, "%d,%d,%d", &H1, &H2, &H3);

+			parser.scanStr((char *)params, "%d,%d,%d", &H1, &H2, &H3);

 			HTiles = true;

 			break;

 

 		case TOKEN_VERTICAL_TILES:

-			parser.ScanStr((char *)params, "%d,%d,%d", &V1, &V2, &V3);

+			parser.scanStr((char *)params, "%d,%d,%d", &V1, &V2, &V3);

 			VTiles = true;

 			break;

 

diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp
index 9cda6072db..b244d13490 100644
--- a/engines/wintermute/UI/UIWindow.cpp
+++ b/engines/wintermute/UI/UIWindow.cpp
@@ -307,14 +307,14 @@ HRESULT CUIWindow::loadBuffer(byte *buffer, bool complete) {
 	int ar = 0, ag = 0, ab = 0, alpha = 0;

 

 	if (complete) {

-		if (parser.GetCommand((char **)&buffer, commands, (char **)&params) != TOKEN_WINDOW) {

+		if (parser.getCommand((char **)&buffer, commands, (char **)&params) != TOKEN_WINDOW) {

 			Game->LOG(0, "'WINDOW' keyword expected.");

 			return E_FAIL;

 		}

 		buffer = params;

 	}

 

-	while (cmd >= PARSERR_TOKENNOTFOUND && (cmd = parser.GetCommand((char **)&buffer, commands, (char **)&params)) >= PARSERR_TOKENNOTFOUND) {

+	while (cmd >= PARSERR_TOKENNOTFOUND && (cmd = parser.getCommand((char **)&buffer, commands, (char **)&params)) >= PARSERR_TOKENNOTFOUND) {

 		switch (cmd) {

 		case TOKEN_TEMPLATE:

 			if (FAILED(loadFile((char *)params))) cmd = PARSERR_GENERIC;

@@ -392,27 +392,27 @@ HRESULT CUIWindow::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_TITLE_RECT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_titleRect.left, &_titleRect.top, &_titleRect.right, &_titleRect.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_titleRect.left, &_titleRect.top, &_titleRect.right, &_titleRect.bottom);

 			break;

 

 		case TOKEN_DRAG_RECT:

-			parser.ScanStr((char *)params, "%d,%d,%d,%d", &_dragRect.left, &_dragRect.top, &_dragRect.right, &_dragRect.bottom);

+			parser.scanStr((char *)params, "%d,%d,%d,%d", &_dragRect.left, &_dragRect.top, &_dragRect.right, &_dragRect.bottom);

 			break;

 

 		case TOKEN_X:

-			parser.ScanStr((char *)params, "%d", &_posX);

+			parser.scanStr((char *)params, "%d", &_posX);

 			break;

 

 		case TOKEN_Y:

-			parser.ScanStr((char *)params, "%d", &_posY);

+			parser.scanStr((char *)params, "%d", &_posY);

 			break;

 

 		case TOKEN_WIDTH:

-			parser.ScanStr((char *)params, "%d", &_width);

+			parser.scanStr((char *)params, "%d", &_width);

 			break;

 

 		case TOKEN_HEIGHT:

-			parser.ScanStr((char *)params, "%d", &_height);

+			parser.scanStr((char *)params, "%d", &_height);

 			break;

 

 		case TOKEN_CURSOR:

@@ -479,7 +479,7 @@ HRESULT CUIWindow::loadBuffer(byte *buffer, bool complete) {
 

 

 		case TOKEN_TRANSPARENT:

-			parser.ScanStr((char *)params, "%b", &_transparent);

+			parser.scanStr((char *)params, "%b", &_transparent);

 			break;

 

 		case TOKEN_SCRIPT:

@@ -487,40 +487,40 @@ HRESULT CUIWindow::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_PARENT_NOTIFY:

-			parser.ScanStr((char *)params, "%b", &_parentNotify);

+			parser.scanStr((char *)params, "%b", &_parentNotify);

 			break;

 

 		case TOKEN_PAUSE_MUSIC:

-			parser.ScanStr((char *)params, "%b", &_pauseMusic);

+			parser.scanStr((char *)params, "%b", &_pauseMusic);

 			break;

 

 		case TOKEN_DISABLED:

-			parser.ScanStr((char *)params, "%b", &_disable);

+			parser.scanStr((char *)params, "%b", &_disable);

 			break;

 

 		case TOKEN_VISIBLE:

-			parser.ScanStr((char *)params, "%b", &_visible);

+			parser.scanStr((char *)params, "%b", &_visible);

 			break;

 

 		case TOKEN_MENU:

-			parser.ScanStr((char *)params, "%b", &_isMenu);

+			parser.scanStr((char *)params, "%b", &_isMenu);

 			break;

 

 		case TOKEN_IN_GAME:

-			parser.ScanStr((char *)params, "%b", &_inGame);

+			parser.scanStr((char *)params, "%b", &_inGame);

 			break;

 

 		case TOKEN_CLIP_CONTENTS:

-			parser.ScanStr((char *)params, "%b", &_clipContents);

+			parser.scanStr((char *)params, "%b", &_clipContents);

 			break;

 

 		case TOKEN_FADE_COLOR:

-			parser.ScanStr((char *)params, "%d,%d,%d", &FadeR, &FadeG, &FadeB);

+			parser.scanStr((char *)params, "%d,%d,%d", &FadeR, &FadeG, &FadeB);

 			_fadeBackground = true;

 			break;

 

 		case TOKEN_FADE_ALPHA:

-			parser.ScanStr((char *)params, "%d", &FadeA);

+			parser.scanStr((char *)params, "%d", &FadeA);

 			_fadeBackground = true;

 			break;

 

@@ -529,11 +529,11 @@ HRESULT CUIWindow::loadBuffer(byte *buffer, bool complete) {
 			break;

 

 		case TOKEN_ALPHA_COLOR:

-			parser.ScanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);

+			parser.scanStr((char *)params, "%d,%d,%d", &ar, &ag, &ab);

 			break;

 

 		case TOKEN_ALPHA:

-			parser.ScanStr((char *)params, "%d", &alpha);

+			parser.scanStr((char *)params, "%d", &alpha);

 			break;